--- loncom/interface/lonspeller.pm	2004/07/23 19:47:57	1.5
+++ loncom/interface/lonspeller.pm	2004/07/27 23:35:34	1.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Interface routines for Aspell
 #
-# $Id: lonspeller.pm,v 1.5 2004/07/23 19:47:57 www Exp $
+# $Id: lonspeller.pm,v 1.6 2004/07/27 23:35:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use HTML::LCParser;
 use strict;
 
 my $speller;
+my $insidelink;
 
 sub spellcheck_language {
     if ($ENV{'form.lang'}) { return $ENV{'form.lang'}; }
@@ -55,21 +56,20 @@ sub textsection {
     my $input=shift;
     my $output='';
     &set_language();
-    foreach my $word (split(/\W+/,$input)) {
-	if ($speller->check($word)) {
-	    $output.=$word.' ';
+    foreach my $word (split(/\b/,$input)) {
+	if (($word=~/\W/) || ($word=~/^(lt|gt|nbsp|amp)$/i)
+	    || ($speller->check($word))) {
+	    $output.=$word;
 	} else {
 	    my $suggestions=join(' ',$speller->suggest($word));
-	    &Apache::lonnet::logthis($suggestions);
 	    $suggestions=~s/\'/\\\'/gs;
-	    if ($suggestions) {
+	    if (($suggestions) && (!$insidelink)) {
 		$output.='<a href="javascript:alert('."'".
 		    $suggestions."');".
 		    '">';
 	    }
 	    $output.='<font color="red">'.$word.'</font>';
-	    if ($suggestions) { $output.='</a>'; }
-	    $output.=' ';
+	    if (($suggestions) && (!$insidelink)) { $output.='</a>'; }
 	}
     }
     return $output;
@@ -80,19 +80,29 @@ sub markeduptext {
     my $input=shift;
     my $output='';
     my $parser=HTML::LCParser->new(\$input);
+    $insidelink=0;
     my $token;
     while ($token=$parser->get_token) {
 	if ($token->[0] eq 'T') {
 	    $output.=&textsection($token->[1]);
 	} elsif ($token->[0] eq 'S') {
 	    $output.=$token->[4];
-	    if ($token->[1] eq 'm') {
-		$output.=$parser->get_text('/m');
+	    foreach my $tag ('m','script') {
+		if ($token->[1] eq $tag) {
+		    $output.=$parser->get_text('/'.$tag);
+		}
+	    }
+	    if ($token->[1] eq 'a') {
+		$insidelink=1;
 	    }
 	} elsif ($token->[0] eq 'E') {
 	    $output.=$token->[2];
+	    if ($token->[1] eq 'a') {
+		$insidelink=0;
+	    }
 	}
     }
+    $insidelink=0;
     return $output;
 }
 
@@ -100,8 +110,8 @@ sub initspeller {
     unless (defined($speller)) {
 	$speller = Text::Aspell->new;
 	$speller->set_option('lang','en_US');
-	$speller->set_option('sug-mode','fast');
     }
+    $insidelink=0;
 }
 
 sub handler {