[LON-CAPA-cvs] cvs: loncom /auth lonacc.pm /xml lontexconvert.pm

[albertel]

albertel		Tue Sep  5 13:33:12 2006 EDT

  Modified files:              
    /loncom/auth	lonacc.pm 
    /loncom/xml	lontexconvert.pm 
  Log:
  - BUG#5005, need to shift to maintianing the jsmath processing status to a stack since we can create subpages when creating the main page thus need to track the need for each sub page independently
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.95 loncom/auth/lonacc.pm:1.96
--- loncom/auth/lonacc.pm:1.95	Wed Aug 30 17:48:51 2006
+++ loncom/auth/lonacc.pm	Tue Sep  5 13:33:06 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.95 2006/08/30 21:48:51 albertel Exp $
+# $Id: lonacc.pm,v 1.96 2006/09/05 17:33:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,7 @@
     my ($r)=@_;
     if (! $r->is_initial_req()) { return DECLINED; }
     &Apache::lonnet::save_cache();
+    &Apache::lontexconvert::jsMath_reset();
     return OK;
 }
 
Index: loncom/xml/lontexconvert.pm
diff -u loncom/xml/lontexconvert.pm:1.75 loncom/xml/lontexconvert.pm:1.76
--- loncom/xml/lontexconvert.pm:1.75	Tue May 30 08:47:53 2006
+++ loncom/xml/lontexconvert.pm	Tue Sep  5 13:33:11 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.75 2006/05/30 12:47:53 www Exp $
+# $Id: lontexconvert.pm,v 1.76 2006/09/05 17:33:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,13 +176,16 @@
 }
 
 {
-    my $jsMath_sent_header;
+    my @jsMath_sent_header;
     sub jsMath_reset {
-	$jsMath_sent_header=0;
+	undef(@jsMath_sent_header);
+    }
+    sub jsMath_push {
+	push(@jsMath_sent_header,0);
     }
     sub jsMath_header {
-	return '' if $jsMath_sent_header;
-	$jsMath_sent_header=1;
+	return '' if $jsMath_sent_header[-1];
+	$jsMath_sent_header[-1]=1;
 	return
             '<script type="text/javascript">
                      function NoFontMessage () {}
@@ -190,14 +193,15 @@
 	    '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
     }
     sub jsMath_process {
-	return '' if !$jsMath_sent_header;
+	my $state = pop(@jsMath_sent_header);
+	return '' if !$state;
 	return '<script type="text/javascript">jsMath.Process()</script>';
     }
 }
 
 sub init_math_support {
     &init_tth();
-    &Apache::lontexconvert::jsMath_reset();
+    &Apache::lontexconvert::jsMath_push();
     if ($env{'environment.texengine'} eq 'jsMath' ||
 	$env{'form.texengine'}        eq 'jsMath' ) {
 	return &Apache::lontexconvert::jsMath_header();