From 12c7437b2a4a5f7107f4c18811441e1a3292ebdf Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linasvepstas@gmail.com>
Date: Fri, 20 Mar 2015 16:58:19 -0500
Subject: [PATCH] More paraphrase fixes.

---
 data/en/4.0.dict    | 21 ++++++++++++++-------
 data/en/4.0.dict.m4 | 21 ++++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/data/en/4.0.dict b/data/en/4.0.dict
index 177c74129e..cc720cdb2b 100644
--- a/data/en/4.0.dict
+++ b/data/en/4.0.dict
@@ -7972,17 +7972,17 @@ ending_up: (<vc-end-up> & <verb-pg,ge>) or <verb-ge-d>;
 <paraph-null>: [()];
 
 <vc-paraph>:
-  {@MV+} & (((Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (((Xd- or Xq-) & (Xp+ or <paraph-null>)
       & (COq+ or (CP- & {CC+}) or Eq+ or <verb-wall>)) or
     [(Xc+ or Xe+) & <embed-verb>]);
 
 <vc-paraph-inv>:
-  {@MV+} & (((Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (((Xd- or Xq-) & (Xp+ or <paraph-null>)
       & (COq+ or (CPx- & {CC+}) or Eq+ or <verb-wall>))
     or [(Xc+ or Xe+) & <embed-verb>]);
 
 <vc-it-paraph>:
-  {@MV+} & (Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (Xd- or Xq-) & (Xp+ or <paraph-null>)
     & (COqi+ or (CPi- & {CC+}) or Eqi+ or <verb-wall>);
 
 % paraphrasing verbs like "say", "reply"
@@ -8015,10 +8015,17 @@ seems.q appears.q: [[{@E-} & SFs- & <vc-it-paraph>]];
 seemed.q-d appeared.q-d: {@E-} & (SF- or PPf-) & <vc-it-paraph>;
 seeming.q appearing.q: [[{@E-} & Pgf- & <vc-it-paraph>]];
 
-say.q hiss.q: {@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>));
-says.q hisses.q: {@E-} & ((Ss- & <vc-paraph>) or (SIsj+ & <vc-paraph-inv>));
-said.q-d hissed.q-d: {@E-} & (((S- or PP-) & <vc-paraph>) or (SI*j+ & <vc-paraph-inv>));
-saying.q hissing.q: {@E-} & Pg- & <vc-paraph>;
+say.q hiss.q:
+  {@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>));
+
+says.q hisses.q:
+  {@E-} & ((Ss- & <vc-paraph>) or (SIsj+ & <vc-paraph-inv>));
+
+said.q-d hissed.q-d:
+  {@E-} & (((S- or PP-) & <vc-paraph>) or (SI*j+ & <vc-paraph-inv>));
+
+saying.q hissing.q:
+  {@E-} & Pg- & <vc-paraph>;
 
 avow.q:
  [[{@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>))]];
diff --git a/data/en/4.0.dict.m4 b/data/en/4.0.dict.m4
index 3420e92ac7..b946e29711 100644
--- a/data/en/4.0.dict.m4
+++ b/data/en/4.0.dict.m4
@@ -5956,17 +5956,17 @@ ending_up: (<vc-end-up> & <verb-pg,ge>) or <verb-ge-d>;
 <paraph-null>: [()];
 
 <vc-paraph>:
-  {@MV+} & (((Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (((Xd- or Xq-) & (Xp+ or <paraph-null>)
       & (COq+ or (CP- & {CC+}) or Eq+ or <verb-wall>)) or
     [(Xc+ or Xe+) & <embed-verb>]);
 
 <vc-paraph-inv>:
-  {@MV+} & (((Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (((Xd- or Xq-) & (Xp+ or <paraph-null>)
       & (COq+ or (CPx- & {CC+}) or Eq+ or <verb-wall>))
     or [(Xc+ or Xe+) & <embed-verb>]);
 
 <vc-it-paraph>:
-  {@MV+} & (Xd- or Xq-) & (Xc+ or <paraph-null>)
+  {@MV+} & (Xd- or Xq-) & (Xp+ or <paraph-null>)
     & (COqi+ or (CPi- & {CC+}) or Eqi+ or <verb-wall>);
 
 % paraphrasing verbs like "say", "reply"
@@ -5999,10 +5999,17 @@ seems.q appears.q: [[{@E-} & SFs- & <vc-it-paraph>]];
 seemed.q-d appeared.q-d: {@E-} & (SF- or PPf-) & <vc-it-paraph>;
 seeming.q appearing.q: [[{@E-} & Pgf- & <vc-it-paraph>]];
 
-say.q hiss.q: {@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>));
-says.q hisses.q: {@E-} & ((Ss- & <vc-paraph>) or (SIsj+ & <vc-paraph-inv>));
-said.q-d hissed.q-d: {@E-} & (((S- or PP-) & <vc-paraph>) or (SI*j+ & <vc-paraph-inv>));
-saying.q hissing.q: {@E-} & Pg- & <vc-paraph>;
+say.q hiss.q:
+  {@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>));
+
+says.q hisses.q:
+  {@E-} & ((Ss- & <vc-paraph>) or (SIsj+ & <vc-paraph-inv>));
+
+said.q-d hissed.q-d:
+  {@E-} & (((S- or PP-) & <vc-paraph>) or (SI*j+ & <vc-paraph-inv>));
+
+saying.q hissing.q:
+  {@E-} & Pg- & <vc-paraph>;
 
 avow.q:
  [[{@E-} & (((Sp- or I-) & <vc-paraph>) or (SIpj+ & <vc-paraph-inv>))]];