[svn-upgrade] new version scowl (7.1)

[deb_pkgs/scowl.git] / current / src / add-other-spellings

diff --git a/current/src/add-other-spellings b/current/src/add-other-spellings
index 5bdc04259d1e17324461da1ea778637ada9a207b..9d7fdb07ba2efba3d83897d635aaba9178acb962 100755 (executable)
--- a/current/src/add-other-spellings
+++ b/current/src/add-other-spellings
@@ -9,13 +9,18 @@ while(<STDIN>) {
 sub valid_entry ( $ ){local $_ = $_[0]; /^[A-Za-z\']+$/ && exists $words{$_}}
 
 foreach my $f (qw(working/variant_0.lst working/variant_1.lst 
-                 working/variant_2.lst r/varcon/abbc.tab))
+                  working/variant_2.lst
+                  working/british_variant_0.lst working/british_variant_1.lst
+                  working/canadian_variant_0.lst working/canadian_variant_1.lst
+                  working/american.lst
+                  working/british.lst working/british_z.lst
+                  working/canadian.lst))
 {
-  open F, $f or die "Unable to open $f\n";
-  while (<F>) {
-    my (@words) = split /[\t\n]+/;
-    $know_about{$_} = 1 foreach @words;
-  }
+    open F, $f or die "Unable to open $f\n";
+    while (<F>) {
+        chop;
+        $know_about{$_} = 1;
+    }
 }
 
 open F, "r/varcon/voc.tab" or die;
@@ -25,6 +30,7 @@ while (<F>) {
     my ($word) = grep {valid_entry $_} (split /[,\t\n]/);
     next unless defined $word;
     y/,\t -/\n/;
+    s/(^|\n)\n/\n/g;
     $words{$word} .= $_;
 }