From 6c13446edda4e8d23c24d1b0326a710f60967acc Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 28 Apr 2008 07:18:02 +0000 Subject: [PATCH] established resource-1.4 and moved contents of resource/exper there --- lib/{resource/exper => resource-1.4}/abstract/Adjective.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Adverb.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Backward.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Cat.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Common.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Conjunction.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Extra.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Grammar.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Idiom.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Lang.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Lexicon.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Noun.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Numeral.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Phrase.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Question.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Relative.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Sentence.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Structural.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Text.gf | 0 lib/{resource/exper => resource-1.4}/abstract/Verb.gf | 0 lib/{resource/exper => resource-1.4}/english/AdjectiveEng.gf | 0 lib/{resource/exper => resource-1.4}/english/AdverbEng.gf | 0 lib/{resource/exper => resource-1.4}/english/BackwardEng.gf | 0 lib/{resource/exper => resource-1.4}/english/CatEng.gf | 0 lib/{resource/exper => resource-1.4}/english/ConjunctionEng.gf | 0 lib/{resource/exper => resource-1.4}/english/English.gf | 2 +- lib/{resource/exper => resource-1.4}/english/EnglishAbs.gf | 0 lib/{resource/exper => resource-1.4}/english/ExtraEng.gf | 2 +- lib/{resource/exper => resource-1.4}/english/ExtraEngAbs.gf | 0 lib/{resource/exper => resource-1.4}/english/GrammarEng.gf | 0 lib/{resource/exper => resource-1.4}/english/IdiomEng.gf | 0 lib/{resource/exper => resource-1.4}/english/IrregEng.gf | 0 lib/{resource/exper => resource-1.4}/english/IrregEngAbs.gf | 0 lib/{resource/exper => resource-1.4}/english/LangEng.gf | 2 +- lib/{resource/exper => resource-1.4}/english/LexiconEng.gf | 0 lib/{resource/exper => resource-1.4}/english/MorphoEng.gf | 0 lib/{resource/exper => resource-1.4}/english/NounEng.gf | 0 lib/{resource/exper => resource-1.4}/english/NumeralEng.gf | 0 lib/{resource/exper => resource-1.4}/english/OverloadEng.gf | 0 lib/{resource/exper => resource-1.4}/english/ParadigmsEng.gf | 0 lib/{resource/exper => resource-1.4}/english/PhraseEng.gf | 0 lib/{resource/exper => resource-1.4}/english/QuestionEng.gf | 0 lib/{resource/exper => resource-1.4}/english/RelativeEng.gf | 0 lib/{resource/exper => resource-1.4}/english/ResEng.gf | 0 lib/{resource/exper => resource-1.4}/english/SentenceEng.gf | 0 lib/{resource/exper => resource-1.4}/english/StructuralEng.gf | 0 lib/{resource/exper => resource-1.4}/english/VerbEng.gf | 0 lib/{resource/exper => resource-1.4}/exx-restest.gft | 0 lib/{resource/exper => resource-1.4}/french/AdjectiveFre.gf | 0 lib/{resource/exper => resource-1.4}/french/AdverbFre.gf | 0 lib/{resource/exper => resource-1.4}/french/BeschFre.gf | 0 lib/{resource/exper => resource-1.4}/french/CatFre.gf | 0 lib/{resource/exper => resource-1.4}/french/ConjunctionFre.gf | 0 lib/{resource/exper => resource-1.4}/french/DiffFre.gf | 0 lib/{resource/exper => resource-1.4}/french/ExtraFre.gf | 0 lib/{resource/exper => resource-1.4}/french/ExtraFreAbs.gf | 0 lib/{resource/exper => resource-1.4}/french/ExtraRomanceFre.gf | 0 lib/{resource/exper => resource-1.4}/french/French.gf | 0 lib/{resource/exper => resource-1.4}/french/FrenchAbs.gf | 0 lib/{resource/exper => resource-1.4}/french/GrammarFre.gf | 0 lib/{resource/exper => resource-1.4}/french/IdiomFre.gf | 0 lib/{resource/exper => resource-1.4}/french/IrregFre.gf | 0 lib/{resource/exper => resource-1.4}/french/IrregFreAbs.gf | 0 lib/{resource/exper => resource-1.4}/french/LangFre.gf | 2 +- lib/{resource/exper => resource-1.4}/french/LexiconFre.gf | 0 lib/{resource/exper => resource-1.4}/french/MorphoFre.gf | 0 lib/{resource/exper => resource-1.4}/french/NounFre.gf | 0 lib/{resource/exper => resource-1.4}/french/NumeralFre.gf | 0 lib/{resource/exper => resource-1.4}/french/ParadigmsFre.gf | 0 lib/{resource/exper => resource-1.4}/french/PhonoFre.gf | 0 lib/{resource/exper => resource-1.4}/french/PhraseFre.gf | 0 lib/{resource/exper => resource-1.4}/french/QuestionFre.gf | 0 lib/{resource/exper => resource-1.4}/french/RelativeFre.gf | 0 lib/{resource/exper => resource-1.4}/french/ResFre.gf | 0 lib/{resource/exper => resource-1.4}/french/SentenceFre.gf | 0 lib/{resource/exper => resource-1.4}/french/StructuralFre.gf | 0 lib/{resource/exper => resource-1.4}/french/VerbFre.gf | 0 lib/{resource/exper => resource-1.4}/restest.gfs | 0 .../exper => resource-1.4}/romance/AdjectiveRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/AdverbRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/CatRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/CommonRomance.gf | 0 .../exper => resource-1.4}/romance/ConjunctionRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/DiffRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/ExtRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/ExtraRomance.gf | 2 +- lib/{resource/exper => resource-1.4}/romance/ExtraRomanceAbs.gf | 0 lib/{resource/exper => resource-1.4}/romance/NounRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/PhraseRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/QuestionRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/RelativeRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/ResRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/SentenceRomance.gf | 0 lib/{resource/exper => resource-1.4}/romance/VerbRomance.gf | 0 94 files changed, 5 insertions(+), 5 deletions(-) rename lib/{resource/exper => resource-1.4}/abstract/Adjective.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Adverb.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Backward.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Cat.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Common.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Conjunction.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Extra.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Grammar.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Idiom.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Lang.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Lexicon.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Noun.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Numeral.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Phrase.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Question.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Relative.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Sentence.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Structural.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Text.gf (100%) rename lib/{resource/exper => resource-1.4}/abstract/Verb.gf (100%) rename lib/{resource/exper => resource-1.4}/english/AdjectiveEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/AdverbEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/BackwardEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/CatEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/ConjunctionEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/English.gf (84%) rename lib/{resource/exper => resource-1.4}/english/EnglishAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/english/ExtraEng.gf (96%) rename lib/{resource/exper => resource-1.4}/english/ExtraEngAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/english/GrammarEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/IdiomEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/IrregEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/IrregEngAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/english/LangEng.gf (74%) rename lib/{resource/exper => resource-1.4}/english/LexiconEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/MorphoEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/NounEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/NumeralEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/OverloadEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/ParadigmsEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/PhraseEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/QuestionEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/RelativeEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/ResEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/SentenceEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/StructuralEng.gf (100%) rename lib/{resource/exper => resource-1.4}/english/VerbEng.gf (100%) rename lib/{resource/exper => resource-1.4}/exx-restest.gft (100%) rename lib/{resource/exper => resource-1.4}/french/AdjectiveFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/AdverbFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/BeschFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/CatFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ConjunctionFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/DiffFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ExtraFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ExtraFreAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ExtraRomanceFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/French.gf (100%) rename lib/{resource/exper => resource-1.4}/french/FrenchAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/french/GrammarFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/IdiomFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/IrregFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/IrregFreAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/french/LangFre.gf (72%) rename lib/{resource/exper => resource-1.4}/french/LexiconFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/MorphoFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/NounFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/NumeralFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ParadigmsFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/PhonoFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/PhraseFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/QuestionFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/RelativeFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/ResFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/SentenceFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/StructuralFre.gf (100%) rename lib/{resource/exper => resource-1.4}/french/VerbFre.gf (100%) rename lib/{resource/exper => resource-1.4}/restest.gfs (100%) rename lib/{resource/exper => resource-1.4}/romance/AdjectiveRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/AdverbRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/CatRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/CommonRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/ConjunctionRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/DiffRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/ExtRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/ExtraRomance.gf (93%) rename lib/{resource/exper => resource-1.4}/romance/ExtraRomanceAbs.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/NounRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/PhraseRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/QuestionRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/RelativeRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/ResRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/SentenceRomance.gf (100%) rename lib/{resource/exper => resource-1.4}/romance/VerbRomance.gf (100%) diff --git a/lib/resource/exper/abstract/Adjective.gf b/lib/resource-1.4/abstract/Adjective.gf similarity index 100% rename from lib/resource/exper/abstract/Adjective.gf rename to lib/resource-1.4/abstract/Adjective.gf diff --git a/lib/resource/exper/abstract/Adverb.gf b/lib/resource-1.4/abstract/Adverb.gf similarity index 100% rename from lib/resource/exper/abstract/Adverb.gf rename to lib/resource-1.4/abstract/Adverb.gf diff --git a/lib/resource/exper/abstract/Backward.gf b/lib/resource-1.4/abstract/Backward.gf similarity index 100% rename from lib/resource/exper/abstract/Backward.gf rename to lib/resource-1.4/abstract/Backward.gf diff --git a/lib/resource/exper/abstract/Cat.gf b/lib/resource-1.4/abstract/Cat.gf similarity index 100% rename from lib/resource/exper/abstract/Cat.gf rename to lib/resource-1.4/abstract/Cat.gf diff --git a/lib/resource/exper/abstract/Common.gf b/lib/resource-1.4/abstract/Common.gf similarity index 100% rename from lib/resource/exper/abstract/Common.gf rename to lib/resource-1.4/abstract/Common.gf diff --git a/lib/resource/exper/abstract/Conjunction.gf b/lib/resource-1.4/abstract/Conjunction.gf similarity index 100% rename from lib/resource/exper/abstract/Conjunction.gf rename to lib/resource-1.4/abstract/Conjunction.gf diff --git a/lib/resource/exper/abstract/Extra.gf b/lib/resource-1.4/abstract/Extra.gf similarity index 100% rename from lib/resource/exper/abstract/Extra.gf rename to lib/resource-1.4/abstract/Extra.gf diff --git a/lib/resource/exper/abstract/Grammar.gf b/lib/resource-1.4/abstract/Grammar.gf similarity index 100% rename from lib/resource/exper/abstract/Grammar.gf rename to lib/resource-1.4/abstract/Grammar.gf diff --git a/lib/resource/exper/abstract/Idiom.gf b/lib/resource-1.4/abstract/Idiom.gf similarity index 100% rename from lib/resource/exper/abstract/Idiom.gf rename to lib/resource-1.4/abstract/Idiom.gf diff --git a/lib/resource/exper/abstract/Lang.gf b/lib/resource-1.4/abstract/Lang.gf similarity index 100% rename from lib/resource/exper/abstract/Lang.gf rename to lib/resource-1.4/abstract/Lang.gf diff --git a/lib/resource/exper/abstract/Lexicon.gf b/lib/resource-1.4/abstract/Lexicon.gf similarity index 100% rename from lib/resource/exper/abstract/Lexicon.gf rename to lib/resource-1.4/abstract/Lexicon.gf diff --git a/lib/resource/exper/abstract/Noun.gf b/lib/resource-1.4/abstract/Noun.gf similarity index 100% rename from lib/resource/exper/abstract/Noun.gf rename to lib/resource-1.4/abstract/Noun.gf diff --git a/lib/resource/exper/abstract/Numeral.gf b/lib/resource-1.4/abstract/Numeral.gf similarity index 100% rename from lib/resource/exper/abstract/Numeral.gf rename to lib/resource-1.4/abstract/Numeral.gf diff --git a/lib/resource/exper/abstract/Phrase.gf b/lib/resource-1.4/abstract/Phrase.gf similarity index 100% rename from lib/resource/exper/abstract/Phrase.gf rename to lib/resource-1.4/abstract/Phrase.gf diff --git a/lib/resource/exper/abstract/Question.gf b/lib/resource-1.4/abstract/Question.gf similarity index 100% rename from lib/resource/exper/abstract/Question.gf rename to lib/resource-1.4/abstract/Question.gf diff --git a/lib/resource/exper/abstract/Relative.gf b/lib/resource-1.4/abstract/Relative.gf similarity index 100% rename from lib/resource/exper/abstract/Relative.gf rename to lib/resource-1.4/abstract/Relative.gf diff --git a/lib/resource/exper/abstract/Sentence.gf b/lib/resource-1.4/abstract/Sentence.gf similarity index 100% rename from lib/resource/exper/abstract/Sentence.gf rename to lib/resource-1.4/abstract/Sentence.gf diff --git a/lib/resource/exper/abstract/Structural.gf b/lib/resource-1.4/abstract/Structural.gf similarity index 100% rename from lib/resource/exper/abstract/Structural.gf rename to lib/resource-1.4/abstract/Structural.gf diff --git a/lib/resource/exper/abstract/Text.gf b/lib/resource-1.4/abstract/Text.gf similarity index 100% rename from lib/resource/exper/abstract/Text.gf rename to lib/resource-1.4/abstract/Text.gf diff --git a/lib/resource/exper/abstract/Verb.gf b/lib/resource-1.4/abstract/Verb.gf similarity index 100% rename from lib/resource/exper/abstract/Verb.gf rename to lib/resource-1.4/abstract/Verb.gf diff --git a/lib/resource/exper/english/AdjectiveEng.gf b/lib/resource-1.4/english/AdjectiveEng.gf similarity index 100% rename from lib/resource/exper/english/AdjectiveEng.gf rename to lib/resource-1.4/english/AdjectiveEng.gf diff --git a/lib/resource/exper/english/AdverbEng.gf b/lib/resource-1.4/english/AdverbEng.gf similarity index 100% rename from lib/resource/exper/english/AdverbEng.gf rename to lib/resource-1.4/english/AdverbEng.gf diff --git a/lib/resource/exper/english/BackwardEng.gf b/lib/resource-1.4/english/BackwardEng.gf similarity index 100% rename from lib/resource/exper/english/BackwardEng.gf rename to lib/resource-1.4/english/BackwardEng.gf diff --git a/lib/resource/exper/english/CatEng.gf b/lib/resource-1.4/english/CatEng.gf similarity index 100% rename from lib/resource/exper/english/CatEng.gf rename to lib/resource-1.4/english/CatEng.gf diff --git a/lib/resource/exper/english/ConjunctionEng.gf b/lib/resource-1.4/english/ConjunctionEng.gf similarity index 100% rename from lib/resource/exper/english/ConjunctionEng.gf rename to lib/resource-1.4/english/ConjunctionEng.gf diff --git a/lib/resource/exper/english/English.gf b/lib/resource-1.4/english/English.gf similarity index 84% rename from lib/resource/exper/english/English.gf rename to lib/resource-1.4/english/English.gf index ab3552c6a..a117f34d3 100644 --- a/lib/resource/exper/english/English.gf +++ b/lib/resource-1.4/english/English.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:../common:prelude +--# -path=.:../abstract:../common:prelude concrete English of EnglishAbs = LangEng, diff --git a/lib/resource/exper/english/EnglishAbs.gf b/lib/resource-1.4/english/EnglishAbs.gf similarity index 100% rename from lib/resource/exper/english/EnglishAbs.gf rename to lib/resource-1.4/english/EnglishAbs.gf diff --git a/lib/resource/exper/english/ExtraEng.gf b/lib/resource-1.4/english/ExtraEng.gf similarity index 96% rename from lib/resource/exper/english/ExtraEng.gf rename to lib/resource-1.4/english/ExtraEng.gf index d80387476..7f6b3fde3 100644 --- a/lib/resource/exper/english/ExtraEng.gf +++ b/lib/resource-1.4/english/ExtraEng.gf @@ -31,7 +31,7 @@ concrete ExtraEng of ExtraEngAbs = CatEng ** MkVPI vp = { s = \\v,a => vp.ad ++ vp.inf ++ vp.s2 ! a } ; - ConjVPI = conjunctTable2 VPIForm Agr ; + ConjVPI = conjunctDistrTable2 VPIForm Agr ; ComplVPIVV vv vpi = insertObj (\\a => (if_then_Str vv.isAux [] "to") ++ vpi.s ! VPIInf ! a) (predVV vv) ; diff --git a/lib/resource/exper/english/ExtraEngAbs.gf b/lib/resource-1.4/english/ExtraEngAbs.gf similarity index 100% rename from lib/resource/exper/english/ExtraEngAbs.gf rename to lib/resource-1.4/english/ExtraEngAbs.gf diff --git a/lib/resource/exper/english/GrammarEng.gf b/lib/resource-1.4/english/GrammarEng.gf similarity index 100% rename from lib/resource/exper/english/GrammarEng.gf rename to lib/resource-1.4/english/GrammarEng.gf diff --git a/lib/resource/exper/english/IdiomEng.gf b/lib/resource-1.4/english/IdiomEng.gf similarity index 100% rename from lib/resource/exper/english/IdiomEng.gf rename to lib/resource-1.4/english/IdiomEng.gf diff --git a/lib/resource/exper/english/IrregEng.gf b/lib/resource-1.4/english/IrregEng.gf similarity index 100% rename from lib/resource/exper/english/IrregEng.gf rename to lib/resource-1.4/english/IrregEng.gf diff --git a/lib/resource/exper/english/IrregEngAbs.gf b/lib/resource-1.4/english/IrregEngAbs.gf similarity index 100% rename from lib/resource/exper/english/IrregEngAbs.gf rename to lib/resource-1.4/english/IrregEngAbs.gf diff --git a/lib/resource/exper/english/LangEng.gf b/lib/resource-1.4/english/LangEng.gf similarity index 74% rename from lib/resource/exper/english/LangEng.gf rename to lib/resource-1.4/english/LangEng.gf index a38cd12ac..966308a2b 100644 --- a/lib/resource/exper/english/LangEng.gf +++ b/lib/resource-1.4/english/LangEng.gf @@ -1,4 +1,4 @@ ---# -path=.:abstract:../common:prelude +--# -path=.:../abstract:../common:prelude concrete LangEng of Lang = GrammarEng, diff --git a/lib/resource/exper/english/LexiconEng.gf b/lib/resource-1.4/english/LexiconEng.gf similarity index 100% rename from lib/resource/exper/english/LexiconEng.gf rename to lib/resource-1.4/english/LexiconEng.gf diff --git a/lib/resource/exper/english/MorphoEng.gf b/lib/resource-1.4/english/MorphoEng.gf similarity index 100% rename from lib/resource/exper/english/MorphoEng.gf rename to lib/resource-1.4/english/MorphoEng.gf diff --git a/lib/resource/exper/english/NounEng.gf b/lib/resource-1.4/english/NounEng.gf similarity index 100% rename from lib/resource/exper/english/NounEng.gf rename to lib/resource-1.4/english/NounEng.gf diff --git a/lib/resource/exper/english/NumeralEng.gf b/lib/resource-1.4/english/NumeralEng.gf similarity index 100% rename from lib/resource/exper/english/NumeralEng.gf rename to lib/resource-1.4/english/NumeralEng.gf diff --git a/lib/resource/exper/english/OverloadEng.gf b/lib/resource-1.4/english/OverloadEng.gf similarity index 100% rename from lib/resource/exper/english/OverloadEng.gf rename to lib/resource-1.4/english/OverloadEng.gf diff --git a/lib/resource/exper/english/ParadigmsEng.gf b/lib/resource-1.4/english/ParadigmsEng.gf similarity index 100% rename from lib/resource/exper/english/ParadigmsEng.gf rename to lib/resource-1.4/english/ParadigmsEng.gf diff --git a/lib/resource/exper/english/PhraseEng.gf b/lib/resource-1.4/english/PhraseEng.gf similarity index 100% rename from lib/resource/exper/english/PhraseEng.gf rename to lib/resource-1.4/english/PhraseEng.gf diff --git a/lib/resource/exper/english/QuestionEng.gf b/lib/resource-1.4/english/QuestionEng.gf similarity index 100% rename from lib/resource/exper/english/QuestionEng.gf rename to lib/resource-1.4/english/QuestionEng.gf diff --git a/lib/resource/exper/english/RelativeEng.gf b/lib/resource-1.4/english/RelativeEng.gf similarity index 100% rename from lib/resource/exper/english/RelativeEng.gf rename to lib/resource-1.4/english/RelativeEng.gf diff --git a/lib/resource/exper/english/ResEng.gf b/lib/resource-1.4/english/ResEng.gf similarity index 100% rename from lib/resource/exper/english/ResEng.gf rename to lib/resource-1.4/english/ResEng.gf diff --git a/lib/resource/exper/english/SentenceEng.gf b/lib/resource-1.4/english/SentenceEng.gf similarity index 100% rename from lib/resource/exper/english/SentenceEng.gf rename to lib/resource-1.4/english/SentenceEng.gf diff --git a/lib/resource/exper/english/StructuralEng.gf b/lib/resource-1.4/english/StructuralEng.gf similarity index 100% rename from lib/resource/exper/english/StructuralEng.gf rename to lib/resource-1.4/english/StructuralEng.gf diff --git a/lib/resource/exper/english/VerbEng.gf b/lib/resource-1.4/english/VerbEng.gf similarity index 100% rename from lib/resource/exper/english/VerbEng.gf rename to lib/resource-1.4/english/VerbEng.gf diff --git a/lib/resource/exper/exx-restest.gft b/lib/resource-1.4/exx-restest.gft similarity index 100% rename from lib/resource/exper/exx-restest.gft rename to lib/resource-1.4/exx-restest.gft diff --git a/lib/resource/exper/french/AdjectiveFre.gf b/lib/resource-1.4/french/AdjectiveFre.gf similarity index 100% rename from lib/resource/exper/french/AdjectiveFre.gf rename to lib/resource-1.4/french/AdjectiveFre.gf diff --git a/lib/resource/exper/french/AdverbFre.gf b/lib/resource-1.4/french/AdverbFre.gf similarity index 100% rename from lib/resource/exper/french/AdverbFre.gf rename to lib/resource-1.4/french/AdverbFre.gf diff --git a/lib/resource/exper/french/BeschFre.gf b/lib/resource-1.4/french/BeschFre.gf similarity index 100% rename from lib/resource/exper/french/BeschFre.gf rename to lib/resource-1.4/french/BeschFre.gf diff --git a/lib/resource/exper/french/CatFre.gf b/lib/resource-1.4/french/CatFre.gf similarity index 100% rename from lib/resource/exper/french/CatFre.gf rename to lib/resource-1.4/french/CatFre.gf diff --git a/lib/resource/exper/french/ConjunctionFre.gf b/lib/resource-1.4/french/ConjunctionFre.gf similarity index 100% rename from lib/resource/exper/french/ConjunctionFre.gf rename to lib/resource-1.4/french/ConjunctionFre.gf diff --git a/lib/resource/exper/french/DiffFre.gf b/lib/resource-1.4/french/DiffFre.gf similarity index 100% rename from lib/resource/exper/french/DiffFre.gf rename to lib/resource-1.4/french/DiffFre.gf diff --git a/lib/resource/exper/french/ExtraFre.gf b/lib/resource-1.4/french/ExtraFre.gf similarity index 100% rename from lib/resource/exper/french/ExtraFre.gf rename to lib/resource-1.4/french/ExtraFre.gf diff --git a/lib/resource/exper/french/ExtraFreAbs.gf b/lib/resource-1.4/french/ExtraFreAbs.gf similarity index 100% rename from lib/resource/exper/french/ExtraFreAbs.gf rename to lib/resource-1.4/french/ExtraFreAbs.gf diff --git a/lib/resource/exper/french/ExtraRomanceFre.gf b/lib/resource-1.4/french/ExtraRomanceFre.gf similarity index 100% rename from lib/resource/exper/french/ExtraRomanceFre.gf rename to lib/resource-1.4/french/ExtraRomanceFre.gf diff --git a/lib/resource/exper/french/French.gf b/lib/resource-1.4/french/French.gf similarity index 100% rename from lib/resource/exper/french/French.gf rename to lib/resource-1.4/french/French.gf diff --git a/lib/resource/exper/french/FrenchAbs.gf b/lib/resource-1.4/french/FrenchAbs.gf similarity index 100% rename from lib/resource/exper/french/FrenchAbs.gf rename to lib/resource-1.4/french/FrenchAbs.gf diff --git a/lib/resource/exper/french/GrammarFre.gf b/lib/resource-1.4/french/GrammarFre.gf similarity index 100% rename from lib/resource/exper/french/GrammarFre.gf rename to lib/resource-1.4/french/GrammarFre.gf diff --git a/lib/resource/exper/french/IdiomFre.gf b/lib/resource-1.4/french/IdiomFre.gf similarity index 100% rename from lib/resource/exper/french/IdiomFre.gf rename to lib/resource-1.4/french/IdiomFre.gf diff --git a/lib/resource/exper/french/IrregFre.gf b/lib/resource-1.4/french/IrregFre.gf similarity index 100% rename from lib/resource/exper/french/IrregFre.gf rename to lib/resource-1.4/french/IrregFre.gf diff --git a/lib/resource/exper/french/IrregFreAbs.gf b/lib/resource-1.4/french/IrregFreAbs.gf similarity index 100% rename from lib/resource/exper/french/IrregFreAbs.gf rename to lib/resource-1.4/french/IrregFreAbs.gf diff --git a/lib/resource/exper/french/LangFre.gf b/lib/resource-1.4/french/LangFre.gf similarity index 72% rename from lib/resource/exper/french/LangFre.gf rename to lib/resource-1.4/french/LangFre.gf index 6c70dc33e..eee63e930 100644 --- a/lib/resource/exper/french/LangFre.gf +++ b/lib/resource-1.4/french/LangFre.gf @@ -1,4 +1,4 @@ ---# -path=.:romance:abstract:../common:prelude +--# -path=.:../romance:../abstract:../common concrete LangFre of Lang = GrammarFre, diff --git a/lib/resource/exper/french/LexiconFre.gf b/lib/resource-1.4/french/LexiconFre.gf similarity index 100% rename from lib/resource/exper/french/LexiconFre.gf rename to lib/resource-1.4/french/LexiconFre.gf diff --git a/lib/resource/exper/french/MorphoFre.gf b/lib/resource-1.4/french/MorphoFre.gf similarity index 100% rename from lib/resource/exper/french/MorphoFre.gf rename to lib/resource-1.4/french/MorphoFre.gf diff --git a/lib/resource/exper/french/NounFre.gf b/lib/resource-1.4/french/NounFre.gf similarity index 100% rename from lib/resource/exper/french/NounFre.gf rename to lib/resource-1.4/french/NounFre.gf diff --git a/lib/resource/exper/french/NumeralFre.gf b/lib/resource-1.4/french/NumeralFre.gf similarity index 100% rename from lib/resource/exper/french/NumeralFre.gf rename to lib/resource-1.4/french/NumeralFre.gf diff --git a/lib/resource/exper/french/ParadigmsFre.gf b/lib/resource-1.4/french/ParadigmsFre.gf similarity index 100% rename from lib/resource/exper/french/ParadigmsFre.gf rename to lib/resource-1.4/french/ParadigmsFre.gf diff --git a/lib/resource/exper/french/PhonoFre.gf b/lib/resource-1.4/french/PhonoFre.gf similarity index 100% rename from lib/resource/exper/french/PhonoFre.gf rename to lib/resource-1.4/french/PhonoFre.gf diff --git a/lib/resource/exper/french/PhraseFre.gf b/lib/resource-1.4/french/PhraseFre.gf similarity index 100% rename from lib/resource/exper/french/PhraseFre.gf rename to lib/resource-1.4/french/PhraseFre.gf diff --git a/lib/resource/exper/french/QuestionFre.gf b/lib/resource-1.4/french/QuestionFre.gf similarity index 100% rename from lib/resource/exper/french/QuestionFre.gf rename to lib/resource-1.4/french/QuestionFre.gf diff --git a/lib/resource/exper/french/RelativeFre.gf b/lib/resource-1.4/french/RelativeFre.gf similarity index 100% rename from lib/resource/exper/french/RelativeFre.gf rename to lib/resource-1.4/french/RelativeFre.gf diff --git a/lib/resource/exper/french/ResFre.gf b/lib/resource-1.4/french/ResFre.gf similarity index 100% rename from lib/resource/exper/french/ResFre.gf rename to lib/resource-1.4/french/ResFre.gf diff --git a/lib/resource/exper/french/SentenceFre.gf b/lib/resource-1.4/french/SentenceFre.gf similarity index 100% rename from lib/resource/exper/french/SentenceFre.gf rename to lib/resource-1.4/french/SentenceFre.gf diff --git a/lib/resource/exper/french/StructuralFre.gf b/lib/resource-1.4/french/StructuralFre.gf similarity index 100% rename from lib/resource/exper/french/StructuralFre.gf rename to lib/resource-1.4/french/StructuralFre.gf diff --git a/lib/resource/exper/french/VerbFre.gf b/lib/resource-1.4/french/VerbFre.gf similarity index 100% rename from lib/resource/exper/french/VerbFre.gf rename to lib/resource-1.4/french/VerbFre.gf diff --git a/lib/resource/exper/restest.gfs b/lib/resource-1.4/restest.gfs similarity index 100% rename from lib/resource/exper/restest.gfs rename to lib/resource-1.4/restest.gfs diff --git a/lib/resource/exper/romance/AdjectiveRomance.gf b/lib/resource-1.4/romance/AdjectiveRomance.gf similarity index 100% rename from lib/resource/exper/romance/AdjectiveRomance.gf rename to lib/resource-1.4/romance/AdjectiveRomance.gf diff --git a/lib/resource/exper/romance/AdverbRomance.gf b/lib/resource-1.4/romance/AdverbRomance.gf similarity index 100% rename from lib/resource/exper/romance/AdverbRomance.gf rename to lib/resource-1.4/romance/AdverbRomance.gf diff --git a/lib/resource/exper/romance/CatRomance.gf b/lib/resource-1.4/romance/CatRomance.gf similarity index 100% rename from lib/resource/exper/romance/CatRomance.gf rename to lib/resource-1.4/romance/CatRomance.gf diff --git a/lib/resource/exper/romance/CommonRomance.gf b/lib/resource-1.4/romance/CommonRomance.gf similarity index 100% rename from lib/resource/exper/romance/CommonRomance.gf rename to lib/resource-1.4/romance/CommonRomance.gf diff --git a/lib/resource/exper/romance/ConjunctionRomance.gf b/lib/resource-1.4/romance/ConjunctionRomance.gf similarity index 100% rename from lib/resource/exper/romance/ConjunctionRomance.gf rename to lib/resource-1.4/romance/ConjunctionRomance.gf diff --git a/lib/resource/exper/romance/DiffRomance.gf b/lib/resource-1.4/romance/DiffRomance.gf similarity index 100% rename from lib/resource/exper/romance/DiffRomance.gf rename to lib/resource-1.4/romance/DiffRomance.gf diff --git a/lib/resource/exper/romance/ExtRomance.gf b/lib/resource-1.4/romance/ExtRomance.gf similarity index 100% rename from lib/resource/exper/romance/ExtRomance.gf rename to lib/resource-1.4/romance/ExtRomance.gf diff --git a/lib/resource/exper/romance/ExtraRomance.gf b/lib/resource-1.4/romance/ExtraRomance.gf similarity index 93% rename from lib/resource/exper/romance/ExtraRomance.gf rename to lib/resource-1.4/romance/ExtraRomance.gf index cd70f2c08..9bddb29f3 100644 --- a/lib/resource/exper/romance/ExtraRomance.gf +++ b/lib/resource-1.4/romance/ExtraRomance.gf @@ -14,7 +14,7 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** ConsVPI = consrSS comma ; MkVPI vp = {s = infVP vp (agrP3 Masc Sg)} ; - ConjVPI = conjunctSS ; + ConjVPI = conjunctDistrSS ; ComplVPIVV v vpi = insertComplement (\\a => prepCase v.c2.c ++ vpi.s) (predV v) ; diff --git a/lib/resource/exper/romance/ExtraRomanceAbs.gf b/lib/resource-1.4/romance/ExtraRomanceAbs.gf similarity index 100% rename from lib/resource/exper/romance/ExtraRomanceAbs.gf rename to lib/resource-1.4/romance/ExtraRomanceAbs.gf diff --git a/lib/resource/exper/romance/NounRomance.gf b/lib/resource-1.4/romance/NounRomance.gf similarity index 100% rename from lib/resource/exper/romance/NounRomance.gf rename to lib/resource-1.4/romance/NounRomance.gf diff --git a/lib/resource/exper/romance/PhraseRomance.gf b/lib/resource-1.4/romance/PhraseRomance.gf similarity index 100% rename from lib/resource/exper/romance/PhraseRomance.gf rename to lib/resource-1.4/romance/PhraseRomance.gf diff --git a/lib/resource/exper/romance/QuestionRomance.gf b/lib/resource-1.4/romance/QuestionRomance.gf similarity index 100% rename from lib/resource/exper/romance/QuestionRomance.gf rename to lib/resource-1.4/romance/QuestionRomance.gf diff --git a/lib/resource/exper/romance/RelativeRomance.gf b/lib/resource-1.4/romance/RelativeRomance.gf similarity index 100% rename from lib/resource/exper/romance/RelativeRomance.gf rename to lib/resource-1.4/romance/RelativeRomance.gf diff --git a/lib/resource/exper/romance/ResRomance.gf b/lib/resource-1.4/romance/ResRomance.gf similarity index 100% rename from lib/resource/exper/romance/ResRomance.gf rename to lib/resource-1.4/romance/ResRomance.gf diff --git a/lib/resource/exper/romance/SentenceRomance.gf b/lib/resource-1.4/romance/SentenceRomance.gf similarity index 100% rename from lib/resource/exper/romance/SentenceRomance.gf rename to lib/resource-1.4/romance/SentenceRomance.gf diff --git a/lib/resource/exper/romance/VerbRomance.gf b/lib/resource-1.4/romance/VerbRomance.gf similarity index 100% rename from lib/resource/exper/romance/VerbRomance.gf rename to lib/resource-1.4/romance/VerbRomance.gf