New upstream version 2020.12.07

[deb_pkgs/scowl.git] / src / add-other-forms

diff --git a/src/add-other-forms b/src/add-other-forms
index 921033910350ccd68f290e0010c728615a21a08d..86388317940f6267e08ae0c41df14611d59dacbf 100755 (executable)
--- a/src/add-other-forms
+++ b/src/add-other-forms
@@ -5,14 +5,14 @@ open F, "r/alt12dicts/2of12id.txt" or die;
 while (<F>) {
   s/\r?\n$// or die;
   # (uncommon flag, base word, part of speach, inflected forms)
-  ($d,$w,$p,$a) = /^([-@\+]?)(\w+) (.).*: ?(.*?)$/ or die;
+  ($d,$w,$p,$a) = /^([-@\+!]*)(\w+) (.).*: ?(.*?)$/ or die;
   $d =~ tr/+//d;
   next if $d; #
   @a0 = split /  /, $a;
   splice @a0, -1, 0, "'" if $p eq 'V' && @a0 >= 3; # insert placeholder
   @a = ();
   foreach (@a0) {
-    s/ {.+?}//g; s/ \(.+?\)//g; 
+    s/ \{.+?\}//g; s/ \(.+?\)//g; 
     s/ \| / /g; s/ \/ / /g;
     push @a, (split / /, $_);
   }