Merge pull request #762 from linas/cy

Some minor phantom-that fixes
opencog · Apr 26, 2018 · d8b8ce6 · d8b8ce6
2 parents 25fe817 + 29acc46
commit d8b8ce6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 17 deletions.
diff --git a/data/en/4.0.dict b/data/en/4.0.dict
@@ -2158,13 +2158,14 @@ and_a_half:
     (Dmcn+ or (<noun-sub-p> & <noun-main-p>))))));
 
 quarter.i:
-NS- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
+  NS- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
 thirds.m fourths.m quarters.m fifths.m sixths.m sevenths.m eighths.m
 ninths.m tenths.m:
-NW- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
+  NW- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
 
-first.a: L- or Pa- or E+ or MVa- or ({Xc+ & {Xd-}} & CO+) or A+ or [Jp-] or
-TT+ or ((DD- or [[NSa-]]) & <noun-sub-x> & {<ton-verb>} & <noun-main-x>);
+first.a:
+  L- or Pa- or E+ or MVa- or ({Xc+ & {Xd-}} & CO+) or A+ or [Jp-] or
+  TT+ or ((DD- or [[NSa-]]) & <noun-sub-x> & {<ton-verb>} & <noun-main-x>);
 
 last.a dead_last dead_fucking_last DFL:
   L-
@@ -2177,8 +2178,9 @@ last.a dead_last dead_fucking_last DFL:
   or A+
   or [Jp-];
 
-second.a: L- or Pa- or MVa- or ({Xc+ & {Xd-}} & CO+) or
-(DD- & <noun-sub-x> & {<ton-verb>} & <noun-main-x>) or NR+ or A+;
+second.a:
+  L- or Pa- or MVa- or ({Xc+ & {Xd-}} & CO+) or
+  (DD- & <noun-sub-x> & {<ton-verb>} & <noun-main-x>) or NR+ or A+;
 
 % This uses the L link for superlatives, but leads to strange parses:
 % "We celebrated their eleventh anniversary" parses differently
@@ -10665,8 +10667,15 @@ clear.a unclear.a relevant.a irrelevant.a obvious.a immaterial.a:
   or <adj-stuff>
   or <adj-phone>;
 
-clear.i: {EA- or EF+} & Vm- & TH+;
-sure.i certain.i: {EA- or EF+} & Vm- & (TH+ or <to-verb> or (OF+ & {@MV+}));
+% Implement a zero-that; viz.
+%   "We have to make sure [that] everyone is here."
+<phantom-that>: Cet+ & CV+;
+
+clear.i:
+  {EA- or EF+} & Vm- & (TH+ or <phantom-that>);
+
+sure.i certain.i:
+  {EA- or EF+} & Vm- & (TH+ or <phantom-that> or <to-verb> or (OF+ & {@MV+}));
 
 % (AJrc- & {@MV+}): "It is lighter and less costly"
 % Exactly the same as below, but consonant.

diff --git a/data/en/4.0.dict.m4 b/data/en/4.0.dict.m4
@@ -2167,13 +2167,14 @@ and_a_half:
     (Dmcn+ or (<noun-sub-p> & <noun-main-p>))))));
 
 quarter.i:
-NS- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
+  NS- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
 thirds.m fourths.m quarters.m fifths.m sixths.m sevenths.m eighths.m
 ninths.m tenths.m:
-NW- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
+  NW- & {EN-} & (NF+ or (<noun-sub-x> & <noun-main-x>));
 
-first.a: L- or Pa- or E+ or MVa- or ({Xc+ & {Xd-}} & CO+) or A+ or [Jp-] or
-TT+ or ((DD- or [[NSa-]]) & <noun-sub-x> & {<ton-verb>} & <noun-main-x>);
+first.a:
+  L- or Pa- or E+ or MVa- or ({Xc+ & {Xd-}} & CO+) or A+ or [Jp-] or
+  TT+ or ((DD- or [[NSa-]]) & <noun-sub-x> & {<ton-verb>} & <noun-main-x>);
 
 last.a dead_last dead_fucking_last DFL:
   L-
@@ -2186,8 +2187,9 @@ last.a dead_last dead_fucking_last DFL:
   or A+
   or [Jp-];
 
-second.a: L- or Pa- or MVa- or ({Xc+ & {Xd-}} & CO+) or
-(DD- & <noun-sub-x> & {<ton-verb>} & <noun-main-x>) or NR+ or A+;
+second.a:
+  L- or Pa- or MVa- or ({Xc+ & {Xd-}} & CO+) or
+  (DD- & <noun-sub-x> & {<ton-verb>} & <noun-main-x>) or NR+ or A+;
 
 % This uses the L link for superlatives, but leads to strange parses:
 % "We celebrated their eleventh anniversary" parses differently
@@ -8596,8 +8598,15 @@ clear.a unclear.a relevant.a irrelevant.a obvious.a immaterial.a:
   or <adj-stuff>
   or <adj-phone>;
 
-clear.i: {EA- or EF+} & Vm- & TH+;
-sure.i certain.i: {EA- or EF+} & Vm- & (TH+ or <to-verb> or (OF+ & {@MV+}));
+% Implement a zero-that; viz.
+%   "We have to make sure [that] everyone is here."
+<phantom-that>: Cet+ & CV+;
+
+clear.i:
+  {EA- or EF+} & Vm- & (TH+ or <phantom-that>);
+
+sure.i certain.i:
+  {EA- or EF+} & Vm- & (TH+ or <phantom-that> or <to-verb> or (OF+ & {@MV+}));
 
 % (AJrc- & {@MV+}): "It is lighter and less costly"
 % Exactly the same as below, but consonant.

diff --git a/data/en/corpus-fixes.batch b/data/en/corpus-fixes.batch
@@ -3820,14 +3820,18 @@ Now that you mention it, what happened?
 While we're on the topic, was it good?
 Kenny sure is a bastard.
 
-% elided "that" (phantom that)
+% elided "that" (phantom that, zero-that)
 Just thought you'd like to know.
 It was previously thought they were wrong.
 It's a good bet he did it.
 It's a good bet that he did it.
 It's a good thing he did it.
 It's a good thing that he did it.
 
+We have to make sure that everyone is here.
+We have to make sure everyone is here.
+You should make clear that it's possible.
+You should make clear it's possible.
 
 % elided "to be" (phantom to be)
 % Handled by Pa**j, O*n  (predicative adjective, object)