Commit Graph

28 Commits

Author SHA1 Message Date
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
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
aarneranta
e552ceb71d corrected number of whatPl_IP 2021-11-19 14:59:18 +01:00
aarneranta
f59a706d45 commented out variants in StructuralGer: they do not belong to the RGL but to extensions 2021-01-18 14:16:38 +01:00
aarneranta
1f030252a1 fixed genitive es/en in German adjectives and determiners 2020-04-14 16:32: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
06f5f906d6 much_Det = viel without inflection in StructuralGer 2016-05-02 17:47:52 +00:00
scharolta_siencnik
dc143dcb02 German resource grammar: major changes. 2015-07-23 15:50:05 +00:00
andrea.christina.unger
0d95df39ad ß -> ss (according to new spelling) 2015-02-11 16:40:58 +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
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
d2ca42bed9 Ger Quant sp field gets a Boolean to manage the use of numerals like in English 2013-01-26 10:52:31 +00:00
aarne
97ec3b2af2 Exist with Adv in German, also wie viel 2012-12-07 13:44:51 +00:00
aarne
c479da280d adjusting German negation place for some indefinite determiners; this is difficult and not yet conclusive 2012-05-28 09:17:19 +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
e6dfb602aa German preposition contractions 2010-05-26 09:37:17 +00:00
aarne
78244926f1 new Utt constructors for AP, Card 2010-03-28 20:13:15 +00:00
aarne
1125dabaf8 agreement in German Predet 2010-01-05 13:35:24 +00:00
aarne
8a458b5cb5 that_Subj in Eng,Fre,Ger 2009-12-17 09:01:20 +00:00
aarne
c6ad6e5d05 added Structural.language_title_Utt and a script for making alignment logo 2009-06-23 19:23:27 +00:00
aarne
a1fdeb6704 next-lib renamed to lib, lib to old-lib 2009-06-22 15:39:08 +00:00