Merge pull request #1331 from linas/affix-fix

Add assorted affixes to the English language dict

data/en/4.0.affix

@@ -8,7 +8,7 @@
 % Punctuation appearing on the right-side of words.
 ")" "}" "]" ">" """ » 〉 ） 〕 》 】 ］ 』 」 "’’" "’" ” '' ' `
 "%" "," ... "." 。 ‧ ":" ";" "?" "!" ‽ ؟ ？ ！
-_ ‐ ‑ ‒ – — ― … ━ – ー ‐ 、=
+_ ‐ ‑ ‒ – — ― … ━ – ー ‐ 、 =
 ～ ¢ ₵ ™ ℠
   : RPUNC+;
 

data/en/4.0.dict

@@ -10061,7 +10061,7 @@ later earlier:
     (Wt- & {Xc+}) or
     [({Xc+ & {Xd-}} & dCO+)] or
     (Xd- & Xc+ & (MX*x- or MVx-)) or
-    ({[[@Ec-]]} & {Xc+} & A+) or
+    ({[[@Ec-]]} & {{Xdp-} & Xc+} & A+) or
     dAJrc- or dAJlc+)) or
   (Yt- & (<advcl-verb> or Qe+));
 
@@ -11446,11 +11446,11 @@ just_not: <COMP-OPENER>;
 
 % PH-: connect, phonetically, to a/an if it is there.
 <adj-consn>: 
-  ({EA- or ({(<wantPHc>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {Xc+} & A+);
+  ({EA- or ({(<wantPHc>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+);
 <adj-vowel>: 
-  ({EA- or ({(<wantPHv>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {Xc+} & A+);
+  ({EA- or ({(<wantPHv>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+);
 <adj-phone>: 
-  ({EA- or ({(<wantPH>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {Xc+} & A+);
+  ({EA- or ({(<wantPH>)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+);
 
 /en/words/words.adj.1-vowel :
   <marker-common-entity> or
@@ -11488,7 +11488,7 @@ frank.a:
 % [A-]0.2: "a big green apple" want "big" to modify "apple", not "green"
 <color-adj>:
   ({EA- or EF+} & {(AN- or [A-]0.2) & {Ds-}} &
-    (({[[@Ec-]]} & {Xc+} & A+)
+    (({[[@Ec-]]} & {{Xdp-} & Xc+} & A+)
     or ((Pa- or AF+ or Ma- or dMJra-) & {@MV+} & {<tot-verb>})
     or ({@MV+} & dMJla+)
     or AA+
@@ -11636,7 +11636,7 @@ unusual.a useful.a impossible.a annoying.a unfair.a unuseful.a:
 
 a_bitch :
   <adj-good>
-  or ({EA- or EF+} & {[[@Ec-]]} & {Xc+} & A+);
+  or ({EA- or EF+} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+);
 
 % Surely this is incomplete...
 one_and_only in_situ:
@@ -12366,7 +12366,7 @@ next.a:
   or ({Xc+} & {[[@Ec-]]} & L-)
   or (DD- & <noun-rel-x> & {<ton-verb>} & <noun-main-x>);
 
-past.a previous.a: ({[[@Ec-]]} & {Xc+} & A+) or L- or (Pa- & {@MV+});
+past.a previous.a: ({[[@Ec-]]} & {{Xdp-} & Xc+} & A+) or L- or (Pa- & {@MV+});
 
 following.a remaining.a top.i: L-;
 
@@ -13241,7 +13241,13 @@ so_on the_like vice_versa v.v.:
 % XXX that is, change <WALL> to just WV+.
 %
 <sent-start>:
-  (<wo-wall> or <wi-wall>) & {hCPx+ or hCPi+ or hCPu+} & {([Xx+]0.06 or Xp+ or Xs+) & {hWV+}} & {RW+ or Xp+};
+  (<wo-wall> or <wi-wall>)
+    & {hCPx+ or hCPi+ or hCPu+}
+    & {([Xx+]0.06 or Xo- or Xp+ or Xs+) & {hWV+}}
+    & {RW+ or Xp+};
+
+% Espagnol sentence starters
+¿ ¡: Xo- & <sent-start>;
 
 % <sent-start>: "So, don't do it!"
 %    The cost on sent-start is to force preference for CV over WV,
@@ -13258,6 +13264,7 @@ so.ij:
 % hWl+ is here, not elsewhere, to avoid use together with Xx+
 LEFT-WALL:
   <sent-start>
+  or Xo+
   or (QUd+ & <sent-start> & (Xc+ or [()]) & QUc+)
   or (hWl+ & {Xj+} & (RW+ or Xp+))
   or (QUd+ & hWl+ & {Xj+} & (Xc+ or [()]) & QUc+)
@@ -13282,17 +13289,19 @@ RIGHT-WALL: RW- or ({@Xca-} & [[Xc-]]);
 <post-quote>:
   QUc- & {<wo-wall> or <wi-wall> or CP+};
 
-« 《 【 『 „ “:
+% underbar used like a quote-mark, e.g. for _bold text_
+« 《 【 『 「 „ “ ''.x ’’.x :
   QUd-;
-» 》 】 』 ”:
+» 》 】 』 」 ” ''.y ’’.y :
   <post-quote>;
 
 % For now, using ".x and ".y in the above definitions multiplies the number
 % of linkages by 2^(number of "). So it is separated below.
 
 % [[ZZZ-]]: link to "random" quotation marks that show up "for no reason".
 % Cannot use a blanket W+ here to pick up all W connectors, because ... ??
-""": QUd- or <post-quote> or [[ZZZ-]];
+% Underbar is for _bold text_.
+""" "_": QUd- or <post-quote> or [[ZZZ-]];
 
 % Using backtic.x and backtic.y in the above definitions multiplies the
 % number of linkages by 2^(number of backtics). So it is treated as a
@@ -13308,8 +13317,8 @@ RIGHT-WALL: RW- or ({@Xca-} & [[Xc-]]);
   or Xi-
   or <sent-split>;
 
-% Optional RW: "Is this a test?" she asked.
-"!" "?" ‽ ؟ ？！:
+% Question marks: Optional RW: "Is this a test?" she asked.
+"!" "?" ‽ ؟ ？ ！ :
    (Xp- & RW+)
    or ({@Xca-} & Xc- & {[RW+]})
    or ({@Xca-} & Xq+)
@@ -13427,8 +13436,9 @@ but.ij and.ij or.ij not.ij also.ij then.ij but_not and_not and_yet:
 
 % 、 is the "enumeration-comma" used like a dash ...
 % ‧ is the "middle dot"
-% The four dashes are e28092 e28093 e28094 e28095
-‒ – — ― ━ ー --.r -.r 、 ～.r ~.r ‧.r :
+% The first two short dashes are e28090 e28091
+% The next four long dashes are e28092 e28093 e28094 e28095
+‐ ‑ ‒ – — ― ━ ー --.r -.r 、 ～.r ~.r ‧.r :
   [[<colon>]]
   or ({@Xca-} & (({EBx+} & Xd+) or Xc-))
   or (Wd- & W+)
@@ -13492,18 +13502,15 @@ but.ij and.ij or.ij not.ij also.ij then.ij but_not and_not and_yet:
 
 % See also /en/words/currency for currency names that follow a number.
 $ USD.c US$.c C$.c AUD.c AUD$.c HK.c HK$.c
-£ ₤ € ¤ ₳ ฿ ¢ ₵ ₡ ₢ ₠ ₫ ৳ ƒ ₣ ₲ ₴ ₭ ₺  ℳ  ₥ ₦ ₧ ₱ ₰ ₹ ₨ ₪ ₸ ₮ ₩ ¥ ៛ 호점
+£ ₤ € ¤ ₳ ฿ ¢ ₵ ₡ ₢ ₠ ₫ ৳ ƒ ₣ ₲ ₴ ₭ ₺  ℳ  ₥ ₦ ₧ ₱ ₰ ₹ ₨ ₪ ﷼  ₸ ₮ ₩ ¥ ៛ 호점
 † †† ‡ § ¶ © ® ℗ № "#":
   NM*x+ & (AN+ or NM*y- or [[G+]] or (NIfu+ or NItu-) or
     ({EN- or NIc- or [[A- & NSa-]]} & {@MX+} &
       (OD- or ({DD-} & {[[@M+]]} &
         (<noun-main-p> or <noun-and-p> or [[(Ss+ & <CLAUSE>) or SIs-]])))));
 
 % service mark, trademark.
-% ℠ ™ :
-
-% Espagnol stuff
-% ¿ ¡:
+℠ ™ : G- ;
 
 "&": G- & {Xd- & G-} & G+;
 
@@ -13521,9 +13528,9 @@ $ USD.c US$.c C$.c AUD.c AUD$.c HK.c HK$.c
   YS- & (({AL-} & {@L+} & (D+ or DD+)) or [[<noun-main-x>]] or DP+);
 
 % Wd-: allows "(1 + 1) = 2"
-"(" "[": {Wd-} & {EBx+} & dXdp+;
+"(" "{" "[" "<" 〈 （ 〔 ［ : {Wd-} & {EBx+} & dXdp+;
 
-")" "]": {@Xca-} & dXcp-;
+")" "}" "]" ">" 〉 ） 〕 ］: {@Xca-} & dXcp-;
 
 % foo: F+;
 

data/en/4.0.dict.m4

@@ -7637,7 +7637,7 @@ later earlier:
     (Wt- & {Xc+}) or
     [({Xc+ & {Xd-}} & dCO+)] or
     (Xd- & Xc+ & (MX*x- or MVx-)) or
-    ({[[@Ec-]]} & {Xc+} & A+) or
+    ({[[@Ec-]]} & {{Xdp-} & Xc+} & A+) or
     dAJrc- or dAJlc+)) or
   (Yt- & (<advcl-verb> or Qe+));
 
@@ -9021,7 +9021,7 @@ just_not: <COMP-OPENER>;
 % Macro, for all the common parts of an A+ connection, with
 % the phonetic attachment as a variable.
 define(`ADJ_PH',`'
-  ({EA- or ({($1)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {Xc+} & A+))
+  ({EA- or ({($1)} & {EF+ or MX*ta+})} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+))
 
 % PH-: connect, phonetically, to a/an if it is there.
 <adj-consn>: ADJ_PH(<wantPHc>);
@@ -9064,7 +9064,7 @@ frank.a:
 % [A-]0.2: "a big green apple" want "big" to modify "apple", not "green"
 <color-adj>:
   ({EA- or EF+} & {(AN- or [A-]0.2) & {Ds-}} &
-    (({[[@Ec-]]} & {Xc+} & A+)
+    (({[[@Ec-]]} & {{Xdp-} & Xc+} & A+)
     or ((Pa- or AF+ or Ma- or dMJra-) & {@MV+} & {<tot-verb>})
     or ({@MV+} & dMJla+)
     or AA+
@@ -9212,7 +9212,7 @@ unusual.a useful.a impossible.a annoying.a unfair.a unuseful.a:
 
 a_bitch :
   <adj-good>
-  or ({EA- or EF+} & {[[@Ec-]]} & {Xc+} & A+);
+  or ({EA- or EF+} & {[[@Ec-]]} & {{Xdp-} & Xc+} & A+);
 
 % Surely this is incomplete...
 one_and_only in_situ:
@@ -9942,7 +9942,7 @@ next.a:
   or ({Xc+} & {[[@Ec-]]} & L-)
   or (DD- & <noun-rel-x> & {<ton-verb>} & <noun-main-x>);
 
-past.a previous.a: ({[[@Ec-]]} & {Xc+} & A+) or L- or (Pa- & {@MV+});
+past.a previous.a: ({[[@Ec-]]} & {{Xdp-} & Xc+} & A+) or L- or (Pa- & {@MV+});
 
 following.a remaining.a top.i: L-;
 
@@ -10817,7 +10817,13 @@ so_on the_like vice_versa v.v.:
 % XXX that is, change <WALL> to just WV+.
 %
 <sent-start>:
-  (<wo-wall> or <wi-wall>) & {hCPx+ or hCPi+ or hCPu+} & {([Xx+]0.06 or Xp+ or Xs+) & {hWV+}} & {RW+ or Xp+};
+  (<wo-wall> or <wi-wall>)
+    & {hCPx+ or hCPi+ or hCPu+}
+    & {([Xx+]0.06 or Xo- or Xp+ or Xs+) & {hWV+}}
+    & {RW+ or Xp+};
+
+% Espagnol sentence starters
+¿ ¡: Xo- & <sent-start>;
 
 % <sent-start>: "So, don't do it!"
 %    The cost on sent-start is to force preference for CV over WV,
@@ -10834,6 +10840,7 @@ so.ij:
 % hWl+ is here, not elsewhere, to avoid use together with Xx+
 LEFT-WALL:
   <sent-start>
+  or Xo+
   or (QUd+ & <sent-start> & (Xc+ or [()]) & QUc+)
   or (hWl+ & {Xj+} & (RW+ or Xp+))
   or (QUd+ & hWl+ & {Xj+} & (Xc+ or [()]) & QUc+)
@@ -10858,17 +10865,18 @@ RIGHT-WALL: RW- or ({@Xca-} & [[Xc-]]);
 <post-quote>:
   QUc- & {<wo-wall> or <wi-wall> or CP+};
 
-« 《 【 『 „ “:
+« 《 【 『 「 „ “ ''.x ’’.x :
   QUd-;
-» 》 】 』 ”:
+» 》 】 』 」 ” ''.y ’’.y :
   <post-quote>;
 
 % For now, using ".x and ".y in the above definitions multiplies the number
 % of linkages by 2^(number of "). So it is separated below.
 
 % [[ZZZ-]]: link to "random" quotation marks that show up "for no reason".
 % Cannot use a blanket W+ here to pick up all W connectors, because ... ??
-""": QUd- or <post-quote> or [[ZZZ-]];
+% Underbar used like a quote-mark, e.g. for _bold text_
+""" "_": QUd- or <post-quote> or [[ZZZ-]];
 
 % Using backtic.x and backtic.y in the above definitions multiplies the
 % number of linkages by 2^(number of backtics). So it is treated as a
@@ -10886,8 +10894,8 @@ changequote dnl
   or Xi-
   or <sent-split>;
 
-% Optional RW: "Is this a test?" she asked.
-"!" "?" ‽ ؟ ？！:
+% Question marks: Optional RW: "Is this a test?" she asked.
+"!" "?" ‽ ؟ ？ ！ :
    (Xp- & RW+)
    or ({@Xca-} & Xc- & {[RW+]})
    or ({@Xca-} & Xq+)
@@ -11005,8 +11013,9 @@ but.ij and.ij or.ij not.ij also.ij then.ij but_not and_not and_yet:
 
 % 、 is the "enumeration-comma" used like a dash ...
 % ‧ is the "middle dot"
-% The four dashes are e28092 e28093 e28094 e28095
-‒ – — ― ━ ー --.r -.r 、 ～.r ~.r ‧.r :
+% The first two short dashes are e28090 e28091
+% The next four long dashes are e28092 e28093 e28094 e28095
+‐ ‑ ‒ – — ― ━ ー --.r -.r 、 ～.r ~.r ‧.r :
   [[<colon>]]
   or ({@Xca-} & (({EBx+} & Xd+) or Xc-))
   or (Wd- & W+)
@@ -11070,18 +11079,15 @@ but.ij and.ij or.ij not.ij also.ij then.ij but_not and_not and_yet:
 
 % See also /en/words/currency for currency names that follow a number.
 $ USD.c US$.c C$.c AUD.c AUD$.c HK.c HK$.c
-£ ₤ € ¤ ₳ ฿ ¢ ₵ ₡ ₢ ₠ ₫ ৳ ƒ ₣ ₲ ₴ ₭ ₺  ℳ  ₥ ₦ ₧ ₱ ₰ ₹ ₨ ₪ ₸ ₮ ₩ ¥ ៛ 호점
+£ ₤ € ¤ ₳ ฿ ¢ ₵ ₡ ₢ ₠ ₫ ৳ ƒ ₣ ₲ ₴ ₭ ₺  ℳ  ₥ ₦ ₧ ₱ ₰ ₹ ₨ ₪ ﷼  ₸ ₮ ₩ ¥ ៛ 호점
 † †† ‡ § ¶ © ® ℗ № "#":
   NM*x+ & (AN+ or NM*y- or [[G+]] or (NIfu+ or NItu-) or
     ({EN- or NIc- or [[A- & NSa-]]} & {@MX+} &
       (OD- or ({DD-} & {[[@M+]]} &
         (<noun-main-p> or <noun-and-p> or [[(Ss+ & <CLAUSE>) or SIs-]])))));
 
 % service mark, trademark.
-% ℠ ™ :
-
-% Espagnol stuff
-% ¿ ¡:
+℠ ™ : G- ;
 
 "&": G- & {Xd- & G-} & G+;
 
@@ -11099,9 +11105,9 @@ $ USD.c US$.c C$.c AUD.c AUD$.c HK.c HK$.c
   YS- & (({AL-} & {@L+} & (D+ or DD+)) or [[<noun-main-x>]] or DP+);
 
 % Wd-: allows "(1 + 1) = 2"
-"(" "[": {Wd-} & {EBx+} & dXdp+;
+"(" "{" "[" "<" 〈 （ 〔 ［ : {Wd-} & {EBx+} & dXdp+;
 
-")" "]": {@Xca-} & dXcp-;
+")" "}" "]" ">" 〉 ） 〕 ］: {@Xca-} & dXcp-;
 
 % foo: F+;
 

data/en/corpus-fixes.batch

@@ -4317,6 +4317,12 @@ I know I ought to tell her.
 % punctuation: sometimes commas are used as if they were semicolons:
 Sweat stood on his brow, fury was bright in his one good eye.
 
+% Spanish punctuation
+¿this is a question?
+¡this is an exclamation!
+
+Underbars are used for _bold text_.
+
 % Crazy UTF8 dashes
 we are dealing with androcentric—that is to say, male-dominated—concepts
 we are dealing with androcentric--that is to say, male-dominated--concepts