--- loncom/publisher/lonpublisher.pm	2003/07/25 02:04:51	1.127
+++ loncom/publisher/lonpublisher.pm	2003/09/16 21:30:28	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.127 2003/07/25 02:04:51 bowersj2 Exp $
+# $Id: lonpublisher.pm,v 1.132 2003/09/16 21:30:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -718,8 +718,9 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm') {
-		    $outstring.=&get_all_text_unbalanced('/m',\@parser);
+		if ($lctag eq 'm' || $lctag eq 'script' 
+                    || $lctag eq 'display' || $lctag eq 'tex') {
+		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
@@ -1491,6 +1492,8 @@ sub phasetwo {
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
+    #publication pollutes %ENV with form.* values
+    my %oldENV=%ENV;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
@@ -1526,6 +1529,7 @@ sub batchpublish {
 	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
 	$r->print('</p>');
     }
+    %ENV=%oldENV;
     return '';
 }
 
@@ -1744,17 +1748,25 @@ unless ($ENV{'form.phase'} eq 'two') {
   if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
       &publishdirectory($r,$fn,$thisdisfn);
+      $r->print('<hr><font size="+2">Done</font><br><a href="/priv/'
+		.$cuname.'/'.$thisdisfn
+		.'">Return to Directory</a>');
+
 
   } else {
 # ---------------------- Evaluate individual file, and then output information.
       $thisfn=~/\.(\w+)$/;
       my $thistype=$1;
       my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
-
       $r->print('<h2>Publishing '.
-        &Apache::loncommon::filedescription($thistype).' <tt>'.
-        '<a href="/~'.$cuname.'/'.$thisdisfn.'" target="cat">'.$thisdisfn.
-        '</a></tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
+		&Apache::loncommon::filedescription($thistype).' <tt>');
+
+      $r->print(<<ENDCAPTION);
+<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+$thisdisfn</a>
+ENDCAPTION
+      $r->print(
+        '</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
    
       if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
           $r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom.
@@ -1762,9 +1774,10 @@ unless ($ENV{'form.phase'} eq 'two') {
       }
 
       if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
-          $r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'.
-                    $thisdisfn.
-  	  '&versiontwo=priv" target="cat">Diffs with Current Version</a><br />');
+          $r->print(<<ENDDIFF);
+<br />
+<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>Diffs with Current Version</a><br />
+ENDDIFF
       }
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.