Merge pull request #413 from smucclaw/PAP-lexicon

Lexicon for use case
smucclaw · Aug 8, 2023 · cb78317 · cb78317
2 parents 65fbb8d + 20ef769
commit cb78317
Show file tree

Hide file tree

Showing 23 changed files with 2,303 additions and 347 deletions.
diff --git a/lib/haskell/natural4/grammars/CustomSyntax.gf b/lib/haskell/natural4/grammars/CustomSyntax.gf
@@ -1,30 +1,34 @@
 abstract CustomSyntax =
     Numeral
   , Grammar [
-          N, N2, CN, UseN, NP, Det, DetCN, MassNP
-        , V,  VV, V2, VS, VP
-        , A, A2, AP, AdjCN, PositA
+          N, N2, CN, PN, NP, UseN, ComplN2, UsePN, Num, NumSg, NumPl, Det, DetCN, MassNP
+        , V,  VV, V2, VS, VP, UseV
+        , A, A2, AP, AdjCN, PositA, ComplA2
         , Comp, Adv, VP, UseComp, CompNP, CompAP, CompAdv -- is a public agency
         , Prep, PrepNP, AdvVP
-        , AdA, AdAdv
+        , AdA, AdAdv, Card, CAdv, AdN, AdNum, AdnCAdv
+        , Dig, Digits, NumDigits, IDig, IIDig, D_0, D_1, D_2, D_3, D_4, D_5, D_6, D_7, D_8, D_9
         , ListAdv, BaseAdv, ConsAdv, ConjAdv
         , ListAP, BaseAP, ConsAP, ConjAP
         , ListNP, BaseNP, ConsNP, ConjNP
         , ListS, BaseS, ConsS, ConjS
-        , S, QS, Conj
+        , S, QS, Conj, Subj, SubjS
+        , RS, RP, IdRP, RelCN
         ]
   , Structural [
         Prep, to_Prep, for_Prep, from_Prep, on_Prep, before_Prep, after_Prep, possess_Prep
         , VV, must_VV
+        , AdN, CAdv, less_CAdv, more_CAdv, at_least_AdN, at_most_AdN
+        , Subj, because_Subj
         ]
   , Extend [
         VPS, MkVPS, ListVPS, BaseVPS, ConsVPS, ConjVPS
         , VPI, MkVPI --, [VPI], BaseVPI, ConsVPI, ConjVPI
         , VP, Tense, Ant, Temp, Pol, Conj -- for VPS
     --      , GenRP -- nice to have in the future?
-        , ByVP
-        , S, PredVPS
-        , NP, GerundNP
+        , ByVP, N, CompoundN
+        , S, PredVPS, RelVPS
+        , NP, GerundNP, Num, GenModNP
         ]  ** {
 
 -----------------------------------------------------------------------------
@@ -55,7 +59,9 @@ abstract CustomSyntax =
     MayHave : VP -> VPS ; -- getting "may have occurred" with pure RGL is a pain
 
     ReferenceNP : NP -> S ; -- it is NP — reference to a previous NP
+    WhileDoing : VP -> Adv ; -- while travelling in a public transport
 --      ExpletiveVP : VP -> S ; -- it is raining — dummy subject it (TODO: restrict usage of this and above from HS)
+    CNwhereS : CN -> NP -> VPS -> CN ; -- premise where school activities take place
 
     presAnt,   -- has occurred
     presSimul, -- occurs
@@ -68,6 +74,7 @@ abstract CustomSyntax =
     theSg : Det ;
     thePl : Det ;
     aSg : Det ;
+    aPl : Det ;
     your : Det ;
 
     about_Prep : Prep ;

diff --git a/lib/haskell/natural4/grammars/CustomSyntaxChi.gf b/lib/haskell/natural4/grammars/CustomSyntaxChi.gf
@@ -1,27 +1,31 @@
 concrete CustomSyntaxChi of CustomSyntax =
     NumeralChi
   , GrammarChi [
-        N, N2, CN, UseN, NP, Det, DetCN, MassNP
-      , V, VV, V2, VS, VP, AdvVP
+        N, N2, CN, PN, NP, UseN, ComplN2, UsePN, Num, NumSg, NumPl, Det, DetCN, MassNP
+      , V, VV, V2, VS, VP, UseV, AdvVP
       , A, A2, AP, PositA
       , Comp, Adv, VP, UseComp, CompAP, CompAdv -- is a public agency
-      , AdA, AdAdv -- only (within the organisation)
+      , AdA, AdAdv, Card, CAdv, AdN, AdNum, AdnCAdv
+        , Dig, Digits, NumDigits, IDig, IIDig, D_0, D_1, D_2, D_3, D_4, D_5, D_6, D_7, D_8, D_9 -- only (within the organisation)
       , ListAdv, BaseAdv, ConsAdv, ConjAdv
       , ListAP, BaseAP, ConsAP, ConjAP
       , ListNP, BaseNP, ConsNP, ConjNP
       , ListS, BaseS, ConsS, ConjS
-      , S, QS, Conj
+      , S, QS, Conj, Subj, SubjS
+        , RS, RP, IdRP, RelCN
       ]
   , StructuralChi [
       VV, must_VV
+        , AdN, CAdv, less_CAdv, more_CAdv, at_least_AdN, at_most_AdN
+        , Subj, because_Subj
     ]
   , ExtendChi [
         VPS, MkVPS, mkVPS, ListVPS, BaseVPS, ConsVPS, ConjVPS, baseVPS
       , VPI, MkVPI, mkVPI --, [VPI], BaseVPI, ConsVPI, ConjVPI
       , VP, Tense, Ant, Temp, Pol, Conj -- for VPS
-      , ByVP
-      , S, PredVPS
-      , NP, GerundNP -- by performing NDB qualification
+      , ByVP, N, CompoundN
+      , S, PredVPS, RelVPS
+      , NP, GerundNP, Num, GenModNP -- by performing NDB qualification
       ]
   ** open
       SyntaxChi

diff --git a/lib/haskell/natural4/grammars/CustomSyntaxEng.gf b/lib/haskell/natural4/grammars/CustomSyntaxEng.gf
@@ -1,29 +1,33 @@
 concrete CustomSyntaxEng of CustomSyntax =
     NumeralEng
   , GrammarEng [
-        N, N2, CN, UseN, NP, Det, DetCN, MassNP
-      , V,  VV, V2, VS, VP
-      , A, A2, AP, AdjCN, PositA
+        N, N2, CN, PN, NP, UseN, ComplN2, UsePN, Num, NumSg, NumPl, Det, DetCN, MassNP
+      , V,  VV, V2, VS, VP, UseV
+      , A, A2, AP, AdjCN, PositA, ComplA2
       , Comp, Adv, VP, UseComp, CompAP, CompNP, CompAdv -- is a public agency
       , Prep, PrepNP, AdvVP
-      , AdA, AdAdv -- only (within the organisation)
+      , AdA, AdAdv, Card, CAdv, AdN, AdNum, AdnCAdv
+        , Dig, Digits, NumDigits, IDig, IIDig, D_0, D_1, D_2, D_3, D_4, D_5, D_6, D_7, D_8, D_9 -- only (within the organisation)
       , ListAdv, BaseAdv, ConsAdv, ConjAdv
       , ListAP, BaseAP, ConsAP, ConjAP
       , ListNP, BaseNP, ConsNP, ConjNP
       , ListS, BaseS, ConsS, ConjS
-      , S, QS, Conj
+      , S, QS, Conj, Subj, SubjS
+        , RS, RP, IdRP, RelCN
       ]
   , StructuralEng [
       Prep, to_Prep, for_Prep, from_Prep, on_Prep, before_Prep, after_Prep, possess_Prep
     , VV, must_VV
+        , AdN, CAdv, less_CAdv, more_CAdv, at_least_AdN, at_most_AdN
+        , Subj, because_Subj
     ]
   , ExtendEng [
         VPS, MkVPS, mkVPS, ListVPS, BaseVPS, ConsVPS, ConjVPS, baseVPS
       , VPI, MkVPI, mkVPI --, [VPI], BaseVPI, ConsVPI, ConjVPI
       , VP, Tense, Ant, Temp, Pol, Conj -- for VPS
-      , ByVP
-      , S, PredVPS
-      , NP, GerundNP -- by performing NDB qualification
+      , ByVP, N, CompoundN
+      , S, PredVPS, RelVPS
+      , NP, GerundNP, Num, GenModNP -- by performing NDB qualification
       ]
   ** open
       SyntaxEng
@@ -94,6 +98,8 @@ concrete CustomSyntaxEng of CustomSyntax =
         in vps ** {s = \\_,_ => may_have_occurred} ;
     -- : NP -> S ; -- it is NP — reference to a previous NP
     ReferenceNP np = mkS (mkCl it_NP <lin NP np : NP>) ;
+    WhileDoing vp = cc2 (ss "while") (GerundAdv vp) ;
+    CNwhereS cn np vps = SentCN cn (cc2 (ss "where") (PredVPS np vps)) ;
 
     presSimul = mkTemp presentTense simultaneousAnt ;
     presAnt = mkTemp presentTense anteriorAnt ;
@@ -104,6 +110,7 @@ concrete CustomSyntaxEng of CustomSyntax =
     theSg = theSg_Det ;
     thePl = thePl_Det ;
     aSg = aSg_Det ;
+    aPl = aPl_Det ;
     your = mkDet youSg_Pron ;
 
     about_Prep = ParadigmsEng.mkPrep "about" ;

diff --git a/lib/haskell/natural4/grammars/CustomSyntaxMay.gf b/lib/haskell/natural4/grammars/CustomSyntaxMay.gf
@@ -1,30 +1,34 @@
 concrete CustomSyntaxMay of CustomSyntax =
     NumeralMay
   , GrammarMay [
-        N, N2, CN, UseN, NP, Det, DetCN, MassNP
-      , V, VV, V2, VS, VP
-      , A, A2, AP, AdjCN, PositA
+        N, N2, CN, PN, NP, UseN, ComplN2, UsePN, Num, NumSg, NumPl, Det, DetCN, MassNP
+      , V, VV, V2, VS, VP, UseV
+      , A, A2, AP, AdjCN, PositA, ComplA2
   --      , ProgrVP -- becoming aware
       , Comp, Adv, VP, UseComp, CompAP, CompNP, CompAdv -- is a public agency
       , Prep, PrepNP, AdvVP
-      , AdA, AdAdv -- only (within the organisation)
+      , AdA, AdAdv, Card, CAdv, AdN, AdNum, AdnCAdv
+        , Dig, Digits, NumDigits, IDig, IIDig, D_0, D_1, D_2, D_3, D_4, D_5, D_6, D_7, D_8, D_9 -- only (within the organisation)
       , ListAdv, BaseAdv, ConsAdv, ConjAdv
       , ListAP, BaseAP, ConsAP, ConjAP
       , ListNP, BaseNP, ConsNP, ConjNP
       , ListS, BaseS, ConsS, ConjS
-      , S, QS, Conj
+      , S, QS, Conj, Subj, SubjS
+        , RS, RP, IdRP, RelCN
       ]
   , StructuralMay [
       Prep, for_Prep, from_Prep, on_Prep, after_Prep, possess_Prep
     , VV, must_VV
+        , AdN, CAdv, less_CAdv, more_CAdv, at_least_AdN, at_most_AdN
+        , Subj, because_Subj
     ]
   , ExtendMay [
         VPS, MkVPS, mkVPS, ListVPS, BaseVPS, ConsVPS, ConjVPS, baseVPS
       , VPI, MkVPI, mkVPI --, [VPI], BaseVPI, ConsVPI, ConjVPI
       , VP, Tense, Ant, Temp, Pol, Conj -- for VPS
-      , ByVP
-      , S, PredVPS
-      , NP, GerundNP -- by performing NDB qualification
+      , ByVP, N, CompoundN
+      , S, PredVPS, RelVPS
+      , NP, GerundNP, Num, GenModNP -- by performing NDB qualification
       ]
   ** open
       SyntaxMay