fix numbering of variants to be 1 and 2 (closes: #867586)

[deb_pkgs/scowl.git] / src / make-proper-names.lst

diff --git a/src/make-proper-names.lst b/src/make-proper-names.lst
index 9deccf1165ad5b8a982a75b17ce795a23972625d..313a11f23cc60e96184e4839e42b658aa660635b 100755 (executable)
--- a/src/make-proper-names.lst
+++ b/src/make-proper-names.lst
@@ -1,20 +1,22 @@
 #!/bin/sh
 
+filter() {
+  sort -u                                     \
+  | comm -23 - working/known-upper.lst        \
+  | comm -23 - r/special/not-upper
+}
+
 cat working/all.lst | grep "^[A-Z]"           \
   | comm -23 - working/abbreviations.lst.pre  \
   | cat - l/proper-names/*                    \
+  | filter                                    \
   | src/add-other-spellings                   \
   | src/find-ss working/all.lst               \
   | sed "s/^\(.*\)'s\$/\1/"                   \
   | src/filter                                \
-  | sort | uniq                               \
-  | comm -23 - working/known-upper.lst        \
+  | filter                                    \
   | sed "s/^\(.*\)/\1 \1's/"                  \
   | tr ' ' '\n'                               \
-  | sort | uniq                               \
+  | sort -u                                   \
   > working/proper-names.lst
 
-
-
-
-