Commit Graph

56 Commits

Author SHA1 Message Date
Hans Leiss
21db782ef5 (Ger) Some lincats changed to remove number in plural; DetQuant and DetQuantOrd reimplemented 2023-12-22 22:44:28 +01:00
Hans Leiss
e200403cf8 Add forgotten hunks of branch master to smallAgr 2023-10-01 23:46:57 +02:00
Hans Leiss
1cf6496883 (Ger) Shrink Agr = Ag Gender Number Person from 3*2*3 = 18 values to 2+3+1+3+1 = 10 by
Agr = AgSgP1 | AgSgP2 | AgSgP3 Gender | AgSgP3Gen | AgPl Person | AgPlPol ;
      with AgSgP3Gen resp. AgPlPol used for reflexive,possessive forms of "man", "Sie".

      Compiles AllGer from src in 162sec with 15M VerbGer.gfo vs. 380sec with 17M VerbGer.gfo
2023-09-30 23:28:42 +02:00
Inari Listenmaa
a6f3dc6d05 Merge pull request #433 from hleiss/prepDefArt
Prep def art
2023-08-21 11:16:29 +03:00
Krasimir Angelov
6bc965f6c2 the names API in more languages 2023-08-16 19:39:22 +02:00
Hans Leiss
b76b8af7b2 Merge master into prepDefArt 2023-08-05 18:17:08 +02:00
Hans Leiss
e2ce9de503 Conflicts with preposition and defart resolved 2023-08-05 18:01:03 +02:00
Hans Leiss
c659270fcc Synchronized remote master; then pulled and resolved conflicts 2023-08-05 15:46:12 +02:00
Hans Leiss
c8a424c023 Implementation of prep+DefArt-gluing independent of |PCase| finished 2023-08-04 20:34:02 +02:00
Hans Leiss
0d5919d511 Extended the new glueing of prepositions with article to {Construction,Markup,Extra}Ger.
Minor edits of param Weight, mkSubject and entries in LexiconGer.
2023-08-03 16:39:30 +02:00
Krasimir Angelov
22a168198b support for measurement units 2023-07-25 19:38:43 +02:00
Aarne Ranta
edfe72514b fixed irreg verbs in DictFre; reject non-verbs in ParadigmsGer (check that infinitive ends -n) 2023-04-04 15:51:09 +02:00
Krasimir Angelov
828bf9c677 extend the names API 2023-02-07 08:47:34 +01:00
Krasimir Angelov
7d9d2a2b5c support plural PNs 2022-10-21 21:48:51 +02:00
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
Hans Leiss
1379ba6c77 (Ger) reflexive RNP in ExtraGer completed ;
improved Slash-rules in tests/german/TestLangGer
2022-07-16 12:18:13 +02:00
Hans Leiss
7778e6138c (Ger) reimplementation of infinitives to improve compilation
- removed Control and treat control verbs with VPSlash.objCtrl:Bool

- combined VP.inf and VP.infExt to VP.inf with inplace/extracted parts
  depending on Agr, to subj/obj-control reflexives in infinitival complements

- AllGer compiles from src in 250s (SlashV2VNP!), .gfo loads in 15s on x86_64
2022-04-06 12:55:48 +02:00
aarneranta
cb502488d1 some ParadigmsEng,Fin,Ger additions 2021-07-30 09:29:19 +02:00
aarneranta
94341f57f9 removed the rest of variants from german/ except from LexiconGer 2021-01-19 17:48:14 +01:00
Hans Leiss
8fb8ddd808 Ger: improved infinitives (and passives); tests with more verbs in testing/german
- NP: added field isLight in order to push negation behind light nps;
  this had been done in gf-3.9 using field isPron, but isPron is now
  used to put accusative pronoun before dative pronoun. Removed field
  adv: adverbial extensions cannot be extracted (todo: also for CN).
  Reduced isLight*isPron to w:Weight with 3 values: WPron, WLight, WHeavy.

- added param Control and field ctrl:Control to classify V2V-verbs into
  subject- and object-contol verbs, use ctrl to make reflexives agree
  with subject resp. object in VPSlash, and refine ComplSlash.

- Verb: new versions of ComplVV, SlashV2V and SlashVV to give better
  (nested) infinitives (extracting infzu and correcting object order).
  a) nested SlashVV doesn't work properly;
  b) SlashV2VNP may have to be commented out to prevent a stack overflow
     when compiling.
  Intended change of SlashV2VNP in tests/german/TestLangGer could not
  be tested due to size problems with the compiler.

- VP: changed field a1 : Polarity => Str to a1:Str to collect the adverbs
  coming before negation, using (negation : Polarity => Str) in mkClause.
  Use objCtrl:Bool instead of missingAdv to let reflexives agree with object.

- ResGer: insertObjNP reorganized, infzuVP added

- DictVerbsGer: some corrections (helft -> hilft, *sprecht -> *spricht)

- Some potential passive rules in tests/german/TestLangGer|Eng

- ExtraGer needs to be cleaned up with repect to the modified mkClause.
2019-09-18 15:16:42 +02: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
03e404e518 Improving pronoun-switch and partial ordering of objects in Ger 2019-06-29 20:40:46 +02:00
Aarne Ranta
95ca88bf02 some paradigm extensions 2018-01-21 12:18:15 +01:00
Aarne Ranta
3703b76856 new cases to Ger.mkN 2018-01-14 22:19:19 +01:00
aarne
df39e466bb some new functionalities in Ger 2017-06-05 12:46:53 +00:00
aarne
4fa9ca5d22 German V3 default without preposition is now Dat+Acc, not Acc+Dat - in conformance with ditransitives in other languages 2015-10-15 15:08:25 +00:00
aarne
44986e0dc3 revised comments in Construction so that some functions can be shown in absfun doc 2015-10-15 15:01:38 +00:00
aarne
e36239cf67 restored one-arg mkPN 2015-07-23 16:03:18 +00:00
scharolta_siencnik
dc143dcb02 German resource grammar: major changes. 2015-07-23 15:50:05 +00:00
andrea.christina.unger
6f8f9da3ff added auxV2V (parallel to auxVV) 2015-05-27 14:47:35 +00:00
hallgren
4c38803eea Convert many RGL modules from Latin-1 to UTF-8 to speed up compilation
Also add flags coding=utf8 to silence warnings.
2014-08-19 19:42:05 +00:00
aarne
6ffdf419e7 moved Names to Construction, to make the structure simpler ; use months and weeks as PN's as well 2014-06-18 09:27:57 +00:00
aarne
c18ac43a15 Scharolta's DictionaryGer fixes 2014-05-29 12:06:44 +00:00
aarne
29f8a7b33f several fixes in German RGL: compound verbs added; compound forms of nouns added; made dative -e optional; made mkV Str V recognize which prefixes are certainly not movable ones ((be,er,ge,ver,zer) 2014-05-29 10:21:49 +00:00
aarne
76cad15007 DictionaryGer now with 22k lemmas, after a new extraction from Wiktionary 2014-05-05 21:46:20 +00:00
aarne
930fa3aa0e German Dict and Paradigms: added a case to mkN and removed bogus "e" plurals 2014-05-05 20:36:44 +00:00
aarne
3b77a86b71 more complex verb paradigms for German 2014-05-05 13:42:43 +00:00
aarne
db4d5de815 shall_VV and should_VV in all Dictionary modules, to avoid a common failure ; should be probably in Constructions 2014-04-29 17:10:58 +00:00
aarne
b192199aec interjections in DictEng Fin and Ger 2013-12-02 11:09:28 +00:00
hallgren
2c8fed764b lib/src: adding --# -coding=latin1 to 119 RGL modules
Adding coding pragmas
  
	--# -coding=latin1
  
so that grammars will continue to work when we change the default character
encoding to UTF-8.
2013-11-22 17:26:00 +00:00
aarne
77ca8a89a4 compound word paradigm in Ger 2013-04-03 12:51:23 +00:00
aarne
16b8296562 a typo in ParadigmsGer.mkV2 ; added comma in NounGer.RelCN 2013-03-10 16:17:28 +00:00
aarne
54c6dc5fbe refined the check whether a complement has a preposition by adding a parameter, in Ger 2013-03-08 08:02:06 +00:00
kr.angelov
2c11a50c0a an optimization in the German grammar for the dative/genitive variants 2012-09-26 11:11:42 +00:00
aarne
196281b67e some Ger corrections by Erzsébet 2012-05-15 09:16:57 +00:00
aarne
c3f6d50fdb German verbs with -ieren 2011-03-08 21:07:17 +00:00
aarne
fa56aa9306 documented Paradigms for Swe, Ger, Fre 2010-12-14 22:06:52 +00:00