--- trunk2/all2all.pl	2004/10/26 20:53:03	549
+++ trunk2/all2all.pl	2004/10/26 21:44:57	550
@@ -53,6 +53,7 @@
 	my $string = shift || return;
 	$string = unac_string($code_page,$string);
 	$string =~ tr/ðÐ/dD/;
+	$string = unac_entities($string);
 	return $string;
 }
 sub unac_2 {
@@ -63,13 +64,21 @@
 		$string =~ tr/ðÐ/dD/;
 		$string = $pr . $string;
 	}
-	$string =~ s/&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);/$1/gi;
-	$string =~ s/ð/d/g;
-	$string =~ s/&E[tT][hH];/D/g;
-	$string =~ s/&(\w\w)lig;/$1/gi;
+	$string = unac_entities($string);
 	return lc($string);
 }
 
+sub unac_entities {
+	my $ent = shift || return;
+
+	$ent =~ s/&(\w)(acute|cedil|circ|grave|ring|slash|tilde|uml);/$1/gi;
+	$ent =~ s/ð/d/g;
+	$ent =~ s/&E[tT][hH];/D/g;
+	$ent =~ s/&(\w\w)lig;/$1/gi;
+
+	return $ent;
+}
+
 # create WebPAC object
 #
 my $webpac = new WebPAC(