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

[deb_pkgs/scowl.git] / src / make-abbreviations.lst.pre

diff --git a/src/make-abbreviations.lst.pre b/src/make-abbreviations.lst.pre
index ecb54451a72d7ea13f2e80e43ab93a4ac0b52073..fb7249f7a54bafd9b5431220eb1f3577b1c00669 100755 (executable)
--- a/src/make-abbreviations.lst.pre
+++ b/src/make-abbreviations.lst.pre
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cat r/special/roman-numerals | tr 'a-z' 'A-Z' \
   | cat - r/special/roman-numerals            \
@@ -15,9 +15,9 @@ cat working/all.lst                                \
   | grep -E "^[A-Z]{2,}'?s?$"                      \
   > working/acronyms.lst.tmp
 
-cat l/not-abbreviations/* working/known-upper.lst  \
+cat l/not-abbreviations/*                          \
   | src/filter                                     \
-  | src/add-affixes                                \
+  | src/add-affixes no-possessive                  \
   | sort | uniq                                    \
   > working/not-abbreviations.tmp
 
@@ -25,6 +25,7 @@ cat working/abbreviations.lst.tmp            \
   | sort | uniq                              \
   | comm -23 - working/not-abbreviations.tmp \
   | cat - working/acronyms.lst.tmp           \
+  | cat - r/special/abbreviations{,-also}    \
   | sort | uniq                              \
   | comm -23 - r/special/never-abbreviations \
   > working/abbreviations.lst.pre