23 lines
896 B
Diff
23 lines
896 B
Diff
--- a/scowl/src/add-affixes 2017-09-25 11:58:46.898706402 +0100
|
|
+++ b/scowl/src/add-affixes 2017-09-25 11:59:46.952904766 +0100
|
|
@@ -72,7 +72,7 @@
|
|
next unless $q eq '' || $use_all >= 2;
|
|
my @a = split /, | \| /, $a;
|
|
@a = grep {my ($word,$tags,$level)
|
|
- = /^([A-Za-z\']+)([~<!?]*)(| [\d.]+)(| {\S+})$/ or die $_;
|
|
+ = /^([A-Za-z\']+)([~<!?]*)(| [\d.]+)(| \{\S+\})$/ or die $_;
|
|
$_ = $word;
|
|
$tags !~ /~|\?|!</ && $level <= $inc_level} @a;
|
|
@a = grep {not $remove{"$w:$p:$_"}} @a;
|
|
--- a/scowl/src/add-other-forms 2017-09-25 12:04:44.139040499 +0100
|
|
+++ b/scowl/src/add-other-forms 2017-09-25 12:04:55.521509492 +0100
|
|
@@ -11,7 +11,7 @@
|
|
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 / /, $_);
|
|
}
|