Commit Graph

57 Commits

Author SHA1 Message Date
Hans Leiss
55f8f5ebd8 (Ger) APred of OrdSuperl and OrdNumeralSuperl corrected 2023-12-27 16:19:34 +01:00
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
c365d802fe (Ger) APred superlative and NOrd forms of numerals corrected 2023-12-04 15:48:36 +01:00
Hans Leiss
96076d6d81 Reduced Agr to 9 values by removing AgP3SgGen 2023-11-16 19:16:58 +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
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
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
828bf9c677 extend the names API 2023-02-07 08:47:34 +01: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
0e8ac21976 (Ger) small fix to make reimplementation of infinitives compile for 'present'
new SlashVP, RelSlash in tests/german/TestLangGer to control reflexives in relative clauses
2022-04-11 15:33:36 +02:00
Hans Leiss
b8ddf4304b (Ger) Small fix to get 'present' installed
new SlashVP, RelSlash in tests/german/TestLangGer.gf to control reflexives in relative clauses
2022-04-11 12:27:39 +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
94341f57f9 removed the rest of variants from german/ except from LexiconGer 2021-01-19 17:48:14 +01:00
aarneranta
1f030252a1 fixed genitive es/en in German adjectives and determiners 2020-04-14 16:32:17 +02: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
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
Hans Leiss
2a1c22c5ca fixed the syntax error with --# notpresent in ResGer 2019-07-04 14:15:50 +02:00
Hans Leiss
d3c6dddf2c removed comment from ResGer 2019-07-01 17:39:42 +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
3089155590 (Ger) Agreement with ReflVP + ComplSlash
ComplSlash ( … ReflVP … ) X:    reflexive should agree with X
ReflVP ... ( … ComplSlash … X): reflexive should agree with subject
2018-05-01 16:38:17 +02:00
Aarne Ranta
485b095462 fixed a bug in German infinitives where some fields were left out 2017-12-19 14:16:14 +01:00
aarne
2d6a343937 reflexive possessives in Fin and Ger ; in Fin, it also makes a difference in the recognized strings, because it always involves pro-drop unlike ordinary possessives 2016-06-07 13:59:09 +00:00
scharolta_siencnik
dc143dcb02 German resource grammar: major changes. 2015-07-23 15:50:05 +00:00
aarne
aa8c214671 German relative "was" in RelS 2015-07-21 15:00: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
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
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
54c6dc5fbe refined the check whether a complement has a preposition by adding a parameter, in Ger 2013-03-08 08:02:06 +00:00
aarne
7c18616b87 in Ger, an NP can be light only if the complement case is Acc 2013-03-07 20:49:04 +00:00
aarne
93ce3c12f9 more fine-grained place of German negation 2013-03-07 20:47:21 +00:00
aarne
4f0c655071 corrected Ger euere to eure 2013-01-19 14:23:16 +00:00
kr.angelov
18b06fea67 added EmptyRelSlash in ExtraBul and ExtraGer. For Bulgarian and German the function simply inserts the default relative pronoun 2012-09-27 09:28:31 +00:00
aarne
b4724f29f3 refactoring German VP 2012-09-23 07:46:43 +00:00
aarne
099d24602b Ger negation adjusted once more 2012-05-27 21:09:17 +00:00
aarne
7fef4c268c place of negation in Ger 2012-05-27 18:50:41 +00:00
aarne
cb0601bb47 Erzsébet's fixes to Ger 2012-05-26 08:57:01 +00:00
aarne
196281b67e some Ger corrections by Erzsébet 2012-05-15 09:16:57 +00:00
aarne
88e97ba120 another fix in Ger Quant, for "gute Häuser" 2012-05-08 13:45:31 +00:00
aarne
453e204813 adjective form with Ger determiners 2012-05-08 11:54:36 +00:00
aarne
fff515d11c fixes in PhrasebookGer and the inAcc_Prep 2010-05-29 21:14:13 +00:00
aarne
731f7233b7 heavy/light NP distinction in Ger to control the place of negation 2010-05-29 09:43:42 +00:00