diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile index 922a2a494..eed661ec2 100644 --- a/lib/resource-1.0/Makefile +++ b/lib/resource-1.0/Makefile @@ -32,7 +32,8 @@ pretest: echo "gr -cat=Cl -number=11 -prob | tb" | $(GF) -probs=lang.gfprob -path=present:prelude -nocf ../present/Lang???.gfc alltenses: -# $(GFC) arabic/LangAra.gf + $(GFC) arabic/LangAra.gf + $(GFC) catalan/LangCat.gf $(GFC) danish/Danish.gf $(GFC) english/English.gf $(GFC) finnish/Finnish.gf diff --git a/lib/resource-1.0/api/ConstructorsAra.gf b/lib/resource-1.0/api/ConstructorsAra.gf new file mode 100644 index 000000000..777f3a249 --- /dev/null +++ b/lib/resource-1.0/api/ConstructorsAra.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource ConstructorsAra = Constructors with (Grammar = GrammarAra) ; diff --git a/lib/resource-1.0/api/ConstructorsCat.gf b/lib/resource-1.0/api/ConstructorsCat.gf new file mode 100644 index 000000000..4efd5bad4 --- /dev/null +++ b/lib/resource-1.0/api/ConstructorsCat.gf @@ -0,0 +1,3 @@ +--# -path=.:alltenses:prelude + +resource ConstructorsCat = Constructors with (Grammar = GrammarCat) ; diff --git a/lib/resource-1.0/api/Syntax.gf b/lib/resource-1.0/api/Syntax.gf index c8c3ab783..0350a9783 100644 --- a/lib/resource-1.0/api/Syntax.gf +++ b/lib/resource-1.0/api/Syntax.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -interface Syntax = Constructors, Cat, Structural ** {} ; +interface Syntax = Constructors, Cat, Structural, Numeral ; diff --git a/lib/resource-1.0/api/SyntaxAra.gf b/lib/resource-1.0/api/SyntaxAra.gf new file mode 100644 index 000000000..2ecd64e66 --- /dev/null +++ b/lib/resource-1.0/api/SyntaxAra.gf @@ -0,0 +1,4 @@ +--# -path=.:alltenses:prelude + +instance SyntaxAra of Syntax = ConstructorsAra, CatAra, StructuralAra, NumeralAra ; + diff --git a/lib/resource-1.0/api/SyntaxCat.gf b/lib/resource-1.0/api/SyntaxCat.gf new file mode 100644 index 000000000..a18726806 --- /dev/null +++ b/lib/resource-1.0/api/SyntaxCat.gf @@ -0,0 +1,4 @@ +--# -path=.:alltenses:prelude + +instance SyntaxCat of Syntax = ConstructorsCat, CatCat, StructuralCat, NumeralCat ; + diff --git a/lib/resource-1.0/api/SyntaxDan.gf b/lib/resource-1.0/api/SyntaxDan.gf index 4eb74d2d7..43430ce0f 100644 --- a/lib/resource-1.0/api/SyntaxDan.gf +++ b/lib/resource-1.0/api/SyntaxDan.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan ** {} ; +instance SyntaxDan of Syntax = ConstructorsDan, CatDan, StructuralDan, NumeralDan ; diff --git a/lib/resource-1.0/api/SyntaxEng.gf b/lib/resource-1.0/api/SyntaxEng.gf index 15144f5f9..0ee6e55bc 100644 --- a/lib/resource-1.0/api/SyntaxEng.gf +++ b/lib/resource-1.0/api/SyntaxEng.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxEng of Syntax = ConstructorsEng, CatEng, StructuralEng ** {} ; +instance SyntaxEng of Syntax = ConstructorsEng, CatEng, StructuralEng, NumeralEng ; diff --git a/lib/resource-1.0/api/SyntaxFin.gf b/lib/resource-1.0/api/SyntaxFin.gf index 07ebbc3dd..eef68d094 100644 --- a/lib/resource-1.0/api/SyntaxFin.gf +++ b/lib/resource-1.0/api/SyntaxFin.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin ** {} ; +instance SyntaxFin of Syntax = ConstructorsFin, CatFin, StructuralFin, NumeralFin ; diff --git a/lib/resource-1.0/api/SyntaxFre.gf b/lib/resource-1.0/api/SyntaxFre.gf index dcc076acd..52fd74354 100644 --- a/lib/resource-1.0/api/SyntaxFre.gf +++ b/lib/resource-1.0/api/SyntaxFre.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre ** {} ; +instance SyntaxFre of Syntax = ConstructorsFre, CatFre, StructuralFre, NumeralFre ; diff --git a/lib/resource-1.0/api/SyntaxGer.gf b/lib/resource-1.0/api/SyntaxGer.gf index d444c7bfb..87b3d03a9 100644 --- a/lib/resource-1.0/api/SyntaxGer.gf +++ b/lib/resource-1.0/api/SyntaxGer.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer ** {} ; +instance SyntaxGer of Syntax = ConstructorsGer, CatGer, StructuralGer, NumeralGer ; diff --git a/lib/resource-1.0/api/SyntaxIta.gf b/lib/resource-1.0/api/SyntaxIta.gf index 9ebdfce86..6b0f99b3a 100644 --- a/lib/resource-1.0/api/SyntaxIta.gf +++ b/lib/resource-1.0/api/SyntaxIta.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta ** {} ; +instance SyntaxIta of Syntax = ConstructorsIta, CatIta, StructuralIta, NumeralIta ; diff --git a/lib/resource-1.0/api/SyntaxNor.gf b/lib/resource-1.0/api/SyntaxNor.gf index 9cf7c252f..ee2ad1bb7 100644 --- a/lib/resource-1.0/api/SyntaxNor.gf +++ b/lib/resource-1.0/api/SyntaxNor.gf @@ -1,4 +1,5 @@ --# -path=.:alltenses:prelude -instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor ** {} ; +instance SyntaxNor of Syntax = ConstructorsNor, CatNor, StructuralNor, NumeralNor + ; diff --git a/lib/resource-1.0/api/SyntaxRus.gf b/lib/resource-1.0/api/SyntaxRus.gf index d4c25113a..0804e209f 100644 --- a/lib/resource-1.0/api/SyntaxRus.gf +++ b/lib/resource-1.0/api/SyntaxRus.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus ** {} ; +instance SyntaxRus of Syntax = ConstructorsRus, CatRus, StructuralRus, NumeralRus ; diff --git a/lib/resource-1.0/api/SyntaxSpa.gf b/lib/resource-1.0/api/SyntaxSpa.gf index eb4029860..7cf6b7646 100644 --- a/lib/resource-1.0/api/SyntaxSpa.gf +++ b/lib/resource-1.0/api/SyntaxSpa.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxSpa of Syntax = ConstructorsSpa, CatSpa, StructuralSpa ** {} ; +instance SyntaxSpa of Syntax = ConstructorsSpa, CatSpa, StructuralSpa, NumeralSpa ; diff --git a/lib/resource-1.0/api/SyntaxSwe.gf b/lib/resource-1.0/api/SyntaxSwe.gf index 96c30e4db..ecf6bbb05 100644 --- a/lib/resource-1.0/api/SyntaxSwe.gf +++ b/lib/resource-1.0/api/SyntaxSwe.gf @@ -1,4 +1,4 @@ --# -path=.:alltenses:prelude -instance SyntaxSwe of Syntax = ConstructorsSwe, CatSwe, StructuralSwe ** {} ; +instance SyntaxSwe of Syntax = ConstructorsSwe, CatSwe, StructuralSwe, NumeralSwe ;