[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

[sakharuk]

sakharuk		Wed Feb 19 10:20:35 2003 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  Changes are
  	1. Corrected enumeration for the problems printed for selected students;
  	2. Done some additional cleanup (probably not the last time).
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.236 loncom/xml/lonxml.pm:1.237
--- loncom/xml/lonxml.pm:1.236	Wed Feb 19 09:55:27 2003
+++ loncom/xml/lonxml.pm	Wed Feb 19 10:20:35 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.236 2003/02/19 14:55:27 www Exp $
+# $Id: lonxml.pm,v 1.237 2003/02/19 15:20:35 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,7 +145,7 @@
 $Apache::lonxml::request='';
 
 # a problem number counter, and check on ether it is used
-$Apache::lonxml::counter=4;
+$Apache::lonxml::counter=1;
 $Apache::lonxml::counter_changed=0;
 
 #internal check on whether to look at style defs
@@ -458,15 +458,8 @@
 sub latex_special_symbols {
     my ($current_token,$stack,$parstack,$where)=@_;
     if ($where eq 'header') {
-      $current_token =~ s/\\/ /g;
-      $current_token =~ s/\{/\\\{/g;
-      $current_token =~ s/\}/\\\}/g;
-      $current_token =~ s/_/ /g;
-      $current_token =~ s/\^/ /g;
-      $current_token =~ s/&/\\&/g;
-      $current_token =~ s/\#/\\\#/g;
-      $current_token =~ s/%/\\%/g;
-      $current_token =~ s/\$/\\\$/g;
+      $current_token =~ s/(\\|_|^)/ /g;
+      $current_token =~ s/(\$|%|\#|&|\{|\})/\\$1/g;
     } else {
      $current_token=~s/\\ /\\char92 /g;
      $current_token=~s/\^/\\char94 /g;
@@ -475,8 +468,7 @@
      $current_token=~s/([^&])\#/$1\\#/g;
      $current_token=~s/(\$|_|{|})/\\$1/g;
      $current_token=~s/\\char92 /\\texttt{\\char92}/g;
-     $current_token=~s/>/\$>\$/g; #more
-     $current_token=~s/</\$<\$/g; #less
+     $current_token=~s/(>|<)/\$$1\$/g; #more or less
      if ($current_token=~m/\d%/) {$current_token =~ s/(\d)%/$1\\%/g;} #percent after digit
      if ($current_token=~m/\s%/) {$current_token =~ s/(\s)%/$1\\%/g;} #persent after space
     }
@@ -901,7 +893,7 @@
 sub init_counter {
     if (defined($ENV{'form.counter'})) {
 	$Apache::lonxml::counter=$ENV{'form.counter'};
-    } elsif (not defined($Apache::lonxml::counter)) {
+    } else {
 	$Apache::lonxml::counter=1;
 	&store_counter();
     }