Commit Graph

4403 Commits

Author SHA1 Message Date
Inari Listenmaa 89217ee9cc (Est) Add [CN] and {Base,Cons,Conj}CN 2019-07-19 10:21:29 +03:00
Inari Listenmaa 08cec84079 Merge branch 'master' of https://github.com/GrammaticalFramework/gf-rgl into somali 2019-07-19 10:06:14 +03:00
Inari Listenmaa 844755b666 Merge pull request #258 from hleiss/accdatV3
(Ger) Readjusting accdatV3 in ParadigmsGer and modifying V3-examples …
2019-07-18 19:55:25 +02:00
Inari Listenmaa db4f31047e (Som) Add reflexives 2019-07-18 20:49:59 +03:00
Hans Leiss d9928919e3 (Ger) Readjusting accdatV3 in ParadigmsGer and modifying V3-examples in LexiconGer instead
ParadigmsGer had two constructions of verbs v:V3 with dat- and acc-object nps,

(1)      mkV3 : V -> V3 = \v -> mkV3 v accPrep datPrep ;
(2)  accdatV3 : V -> V3 = \v -> mkV3 v datPrep accPrep ;  -- (no prepositions)

In a previous patch, I had replaced (accdatV3 v) to (mkV3 v accPrep datPrep), as the
name suggested. (This actually was the meaning of accdatV3 in gf-3.2, which had only
a non-overloaded mkV3 : V -> Prep -> Prep -> V3.)

The reason for having two constructions for dat+acc-verbs in Ger seems to be *Eng*:
for English, ditransitive V3-verbs are defined by

(2')     mkV3 : V -> V3 = \v -> mkV3 v noPrep noPrep ;

like "to give sb sth", where the indirect argument comes first (c2=indir), the direct
second (c3=dir), corresponding to c2=datPrep, c3=accPrep in Ger; apparently, this was
meant by the comment (no prepositions) in (2). Other V3-verbs in Eng are defined by

(1')    mkV3 : V -> Prep -> V3 = \v,p -> mkV3 v noPrep p ;

like "to give sth to sb", so that (c2=dir), (c3=indir-with preposition),
corresponding to c2=acc,c3=dat in Ger, i.e. (1).

In order to get trees with equal meaning in Ger and Eng, the direct and indirect
arguments of corresponding verbs must match. Therefore, some V3-verbs in Ger have to
be defined using (1), others using (2), although they syntactically behave similar.

This patch therefore reinstalls (1) and (2), and changes the V3 in LexiconGer to:

  give_V3 = accdatV3 Irreg.geben_V ; -- c2=datPrep, c3=accPrep, to fit
             -- to Eng ditransitive: give sb(indir) sth(dir) (no preposition)

  sell_V3 = mkV3 (no_geV (regV "verkaufen")) ;    -- Eng: mkV3 v noPrep toPrep
  send_V3 = mkV3 (regV "schicken") ; -- Ger mkV3 v = Ger: mkV3 v accPrep datPrep
2019-07-08 16:09:17 +02:00
Hans Leiss 45e6bfdec5 (Ger) Correction of VP paradigm with modal verbs
The inf part of VPC is split into inf,inf2:Str to correct

    hat ... wollen lesen         => hat ... lesen wollen
    wird ... wollen haben lesen  => wird ... haben lesen wollen
                                    (for: lesen wollen|gewollt haben)

Changed useVP and mkClause of ResGer and MkVPS of ExtraGer.
(ExtraGer.DisToCl needs to be adapted, but best by unification with mkClause.)
See also tests/german/vp-paradigm.*
2019-07-06 15:29:23 +02:00
Inari Listenmaa 64e9947a61 (Ara) Fix bug in mkN instance for sg,pl,gender,species. 2019-07-05 10:44:56 +02:00
Inari Listenmaa 932c72c36b Merge pull request #255 from hleiss/pron-ordering
Pron ordering
2019-07-04 17:06:50 +02:00
Hans Leiss 2a1c22c5ca fixed the syntax error with --# notpresent in ResGer 2019-07-04 14:15:50 +02:00
Inari Listenmaa 2500c02b5f Merge pull request #254 from inariksit/somali
Somali
2019-07-02 09:55:59 +02:00
Inari Listenmaa e4394b633c (Som) VV complements + some restructuring. 2019-07-01 20:30:06 +02:00
Hans Leiss d3c6dddf2c removed comment from ResGer 2019-07-01 17:39:42 +02:00
Inari Listenmaa ca06dc4e1d (Som) More fine-grained adverbials 2019-07-01 14:13:45 +02:00
Inari Listenmaa e42cc6db61 Merge pull request #253 from inariksit/somali
Somali
2019-07-01 12:09:35 +02:00
Inari Listenmaa 8115b26947 (Som) Rename some parameters to begin with capital letter 2019-07-01 10:44:37 +02:00
Inari Listenmaa 0e52ffbb6a (Som) Make object pronoun and preposition(s) contract with negation. 2019-07-01 10:28:03 +02:00
Hans Leiss 03e404e518 Improving pronoun-switch and partial ordering of objects in Ger 2019-06-29 20:40:46 +02:00
Inari Listenmaa 916a3f0a30 Merge pull request #251 from daherb/master
(Lat) Update of the RGL and dictionary
2019-06-28 17:59:04 +02:00
Inari Listenmaa 57f814fc2e (Som) Streamline prepositions+passives.
It looks confusing, but reduces 198 concrete categories from VP and 
VPSlash.
2019-06-28 17:55:51 +02:00
Inari Listenmaa 8fe4fd7362 (Som) Add conditional 2019-06-28 17:55:04 +02:00
Herbert Lange a37b4dbe54 remove references to old lexicons 2019-06-28 16:54:26 +02:00
Herbert Lange a01c6e7a7a more cleanup 2019-06-28 16:31:49 +02:00
Herbert Lange 7c1b737d20 clean up missinglat 2019-06-28 16:29:12 +02:00
Herbert Lange 184625fb87 Merge branch 'latin' 2019-06-28 16:22:49 +02:00
Herbert Lange 41e3fa6d7e remove unused backward module 2019-06-28 16:22:23 +02:00
Herbert Lange db5600bcd2 remove unused extra function 2019-06-28 16:22:02 +02:00
Herbert Lange e2ba2023e1 change type of np and add helper function to construct string from split category 2019-06-28 16:21:30 +02:00
Herbert Lange de44443068 change type of pn 2019-06-28 16:19:22 +02:00
Inari Listenmaa 890e29f628 (Som) Add simple y/n-questions 2019-06-28 14:52:14 +02:00
Inari Listenmaa ef13412a66 (Som) Add CompCN+NP ; more rules for predicatives 2019-06-28 14:01:40 +02:00
Herbert Lange b917f0c443 Merge branch 'latin' 2019-06-27 18:35:33 +02:00
Herbert Lange dfbe4b9d93 some work on questions 2019-06-27 18:31:11 +02:00
Herbert Lange d9cded4030 some fixes in structurallat 2019-06-27 17:46:46 +02:00
Herbert Lange 91042916d3 add linref for VV 2019-06-27 17:46:29 +02:00
Inari Listenmaa 682a0adac0 (Som) Restructure nominal morphology + numerals 2019-06-27 16:19:13 +02:00
Herbert Lange b12308fc59 minimal working version of the extendlat module 2019-06-27 00:10:24 +02:00
Herbert Lange aed87223d1 revert removal of voc from common which led to problems 2019-06-27 00:09:01 +02:00
Herbert Lange 08ed0d8561 fix minor issues in SymbolicLat 2019-06-26 15:04:09 +02:00
Herbert Lange c71a79942c basic implementation of SymbolLat 2019-06-26 14:53:25 +02:00
Herbert Lange 97e44c75c7 added scripts to regenerate missinglat 2019-06-26 14:34:02 +02:00
Herbert Lange 301f985602 updated missinglat file 2019-06-26 14:32:55 +02:00
Herbert Lange 841d121193 add semicolon at end of the file 2019-06-26 14:32:26 +02:00
Herbert Lange b90e036472 kind of working implementation of cardinal numbers 2019-06-25 17:17:46 +02:00
Herbert Lange 1fee42e758 Merge branch 'latin' 2019-06-24 18:23:26 +02:00
Herbert Lange 9e5cb3f44d Merge remote-tracking branch 'upstream/master' 2019-06-24 18:22:15 +02:00
Herbert Lange a35809e130 update large dictionary 2019-06-24 18:20:48 +02:00
Herbert Lange 0f174af5b4 avoid name clases and make number feature accessible 2019-06-24 18:19:54 +02:00
Herbert Lange 4df898a038 pluralN is actually in Paradigms 2019-06-24 18:19:09 +02:00
Herbert Lange aa87a16b94 some manual work on dictionary. will probably be overwritten when the script is fixed 2019-06-23 16:55:15 +02:00
Herbert Lange 02130dc128 helper functions for various noun types 2019-06-23 16:51:38 +02:00