1
0
forked from GitHub/gf-rgl
Commit Graph

6587 Commits

Author SHA1 Message Date
Hans Leiss
1cad178ec8 The glueing of preposition with definite article is now implemented using
NP.s : Bool => Case => Str  and   NP.w = WDefArt

np.s ! False : Case => Str is the ordinary paradigm; if the np has a
definite article, np.w = WDefArt, and np.s ! True : Case => Str is the
paradigm with definite article omitted, if np.a = Ag g Sg p.

Prepositions now have type

  Prep = {s : GenNum => Str ; s2 :Str ; c : Case ; isPrep : PrepType},

and |Prep| = |Case|*|isPrep| = 4 * 3 = 12, independent of |PCase| >= 18.

A preposition p with p.isPrep = isPrepDefArt has in p.s ! (GSg g) : Str
the preposition glued with definite article of a following np in singular.

The modified linearization categories for Prep, NP, Det, DAP, Quant,
Predet are no longer Prep', NP' etc., but Prep, NP etc. in CatGer.
They are now also used in gf-rgl/tests/german/TestLangGer.gf.
The previous auxiliary files abstract/Adjective'.gf etc. are removed.

BUT: for complexitiy reasons,
- the glueing is omitted in SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash,
- SlashVP : NP -> SlashVP -> ClSlash (in SentenceGer and TestLanGer)
  are commented out.
SlashVP causes grammar compilation to crash due to memory limits, probably
because mkClause and its modification mkClSlash are too detailed.
2022-08-23 15:32:17 +02:00
Hans Leiss
787f9d10e8 The files for GrammarGer and AllGer (but not Construction, Documentation, Markup)
are edited to allow for glued Prep+DefArt, using new categories NP',Det',Quant',
Predet',DAP'.

The previous NP.s : Case => Str*Str allows parsing

   "in dem Meer" = in_Prep ++ (np.s ! Case).p1
   "im Meer"     = in_Prep ++ (np.s ! Case).p2,

but since only one of the strings of (np.s!Case) is used, the tree
contains a metavariable like ?2 (the grammar is "erasing"). (Similarly, if we used
NP.s : Case => Str and NP.s2 : Case => Str.)

To get rid of the metavariables, we have to choose BY A PARAMETER, say

    NP.s : droppedDefArt? => Case => Str

Using np.a = Ag g n p, the preposition can select between preposition
alone or preposition with definite article (glued or not), via

    Prep = {s : GenNum => Str ; s2 :Str ; c : Case ; isPrep : PrepType }

The combination is done in appPrepNP' and appPrep'. This is
independent of the number of glued Prep+DefArt. But LangGer compiles
now in 200s using 30% memory (without SlashV2VNP). Can AppPrepNP' (and
insertObjNP') be simplified?
2022-08-11 21:07:03 +02:00
Hans Leiss
ec41af609d 1. updated types in ../abstract/*'.gf to replace NP,Det,Quant,Predep,Prep,DAP by
their primed versions
2. implemented all linearizations to use the primed categories

This allows linearization with prep+defart's, but parsing gives metavariables
in parses (DetQuant ? NumSg) and (DetQuantOrd ? NumSg ord) for prep+defart.

Todo: make Quant.s and NP. depend on PronType = isCat | isPron | isPronDefArt.

Without SlashV2VNP', compiles in 84 sec and gives 3,6M VerbGer.gfo, 2,3M SentenceGer.gfo.

Uses |Prep'|=12 instead of |Prep|=18, |NP'|=72 instead of |NP|=54
2022-07-22 11:49:19 +02:00
Hans Leiss
8eee3df739 Modifications of Prep\', Predet\', Quant\', Det\', NP\' to remove PCase and use NP.s : Agr => Str * Str instead 2022-07-19 18:27:56 +02:00
Inari Listenmaa
d3de861e86 (Est) Add a variant of VPS constructor in ExtraEst
produces more telegraphic language+different word order from PastPartAP
2022-07-08 16:40:46 +02:00
Inari Listenmaa
1b5840c89d (Est) Minor renaming/restructuring/cleanup 2022-07-01 08:35:37 +02:00
Inari Listenmaa
e4a195a777 (Est) more API-friendly overloads for mkPrep 2022-06-29 14:35:23 +02:00
Inari Listenmaa
4fec15272c Merge pull request #406 from LauretteM/master
More Zulu fixes
2022-06-14 15:13:42 +02:00
LauretteM
ad34d3f209 Merge branch 'GrammaticalFramework:master' into master 2022-06-14 15:09:31 +02:00
Laurette Marais
41de2cc021 (zul) fix for relative agreement morpheme 2022-06-14 15:08:56 +02:00
Inari Listenmaa
d43be53e18 Merge pull request #405 from rnd0101/fix-useimmat
Fix most_Predet in Finnish
2022-06-13 11:23:57 +02:00
Laurette Marais
f2c1fede4f (zul) new clause type 2022-06-10 09:24:19 +02:00
Laurette Marais
ef771d62fa (zul) fixes to lexicon 2022-06-10 09:22:35 +02:00
Roman Suzi
33ce949606 Fix most_Predet in Finnish 2022-06-09 19:53:47 +03:00
Laurette Marais
0502797cb0 (zul) paradigms for vowel-init nouns 2022-06-07 08:42:20 +02:00
Inari Listenmaa
9fe3ffce2b Merge pull request #397 from inariksit/estonian-interrogative-agreement
Estonian interrogative agreement
2022-06-03 14:49:28 +02:00
Inari Listenmaa
08dfe78f2f Merge pull request #402 from inariksit/estonian-misc-fixes
Minor fixes in Estonian
2022-06-03 14:46:55 +02:00
Inari Listenmaa
4a2a556162 (Est) Add all case forms to result of GerundCN/NP 2022-06-03 15:45:27 +03:00
Inari Listenmaa
8a87dc210c (Est) Add linref for VPS 2022-06-03 15:26:05 +03:00
Inari Listenmaa
d48cf92359 Merge pull request #401 from inariksit/estonian-PastPartAP-fix
Minor fixes + new lins in Estonian
2022-06-02 07:54:21 +02:00
Inari Listenmaa
d5e5edb02f (Est) Use correct verb form in PastPart(Agent)AP 2022-06-02 08:52:42 +03:00
Inari Listenmaa
3026b8b59a (Est) Add AdvVPSlash and VPSlashPrep 2022-06-02 08:51:44 +03:00
Inari Listenmaa
c4f39c0a74 (Est) Use Extend in AllEstAbs instead of Extra 2022-06-02 08:51:28 +03:00
Laurette Marais
ddf6d0d30d (zul) improvements to paradigms 2022-06-01 15:10:49 +02:00
Laurette Marais
4c03a40aef (zul) fixed demonstratives 2022-06-01 13:23:51 +02:00
Laurette Marais
8073d2a91b (zul) change to Quant lincat 2022-05-27 09:33:05 +02:00
Laurette Marais
6421fb7ee9 (zul) dem na in postdet 2022-05-19 14:40:41 +02:00
Laurette Marais
149407d19b (zul) MultiLex fixes 2022-05-19 12:27:48 +02:00
Laurette Marais
20275832ad (zul) NguniGrammar new imports 2022-05-19 12:21:27 +02:00
Laurette Marais
02d3752a26 (zul) NP conjunction 2022-05-19 12:19:49 +02:00
Inari Listenmaa
bec96b267d Merge pull request #400 from Meowyam/master
Malay RGL: many changes
2022-05-19 10:46:55 +02:00
Inari Listenmaa
6f3a72aa1d Merge branch 'master' into master 2022-05-19 10:46:17 +02:00
Inari Listenmaa
b7363f9219 Merge pull request #399 from LauretteM/master
(zul) changes to MultiLex adjectives
2022-05-18 10:22:31 +02:00
Meowyam
5c84ce9623 remove space for passive 2022-05-18 16:08:35 +08:00
Meowyam
edcef16eb1 fix passive for token ungluing 2022-05-18 15:59:55 +08:00
LauretteM
08ac422d9a Merge branch 'GrammaticalFramework:master' into master 2022-05-17 16:45:48 +02:00
Laurette Marais
a6e0875878 (zul) changes to MultiLex adjectives 2022-05-17 16:40:26 +02:00
Meowyam
a9c18fc48c add John and other lexicon to Malay 2022-05-13 15:46:08 +08:00
Meowyam
85960e0416 add changes for Adv functions to Malay rgl 2022-05-13 14:46:42 +08:00
Meowyam
cff79f72c5 add Malay to languages.csv 2022-05-13 14:46:42 +08:00
Meowyam
c712efc8eb add functions from BareRGMay to ExtendMay 2022-05-13 14:46:42 +08:00
Meowyam
3e79ab25e1 add VPS and VPI to ExtendMay 2022-05-13 14:46:42 +08:00
Meowyam
a1c85431be add john_PN to Malay lexicon 2022-05-13 14:46:42 +08:00
Meowyam
967a8fb8a1 add extra functions to get VPS to work 2022-05-13 14:46:42 +08:00
Inari Listenmaa
2418e8cfcf (Est) fix wrong forms given to mkN in full_A 2022-05-13 14:42:56 +08:00
Inari Listenmaa
5a8eda803d (Est) Test cases for comitative 2022-05-13 14:42:56 +08:00
Inari Listenmaa
bcd7a09864 (Est) Make N2, CN, NP & IP discontinuous
Needed for attaching case suffix in right place
2022-05-13 14:42:56 +08:00
Inari Listenmaa
7dd63173f2 (Est) Fix plural genitive forms for mis 2022-05-13 14:42:56 +08:00
Inari Listenmaa
a59ed0e0e2 (Est) Workaround for short forms of Sg pers. prons
Always use long Gen, because other cases are formed from long Gen stem
2022-05-13 14:42:56 +08:00
Inari Listenmaa
e80cd82870 (Est) misc small cleanup + better comments 2022-05-13 14:42:56 +08:00