diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile index 5a90dff09..cd6b1fa90 100644 --- a/resource-1.0/Makefile +++ b/resource-1.0/Makefile @@ -58,7 +58,14 @@ present: mv */*.gfc */*.gfr ../present mathematical: - $(GF) -make -nocf $(GFCP) mathematical/Mathematical???.gf + $(GFCC) mathematical/MathematicalEng.gf + $(GFCC) mathematical/MathematicalNor.gf + $(GFCC) mathematical/MathematicalGer.gf + $(GFCC) mathematical/MathematicalSpa.gf + $(GFCC) mathematical/MathematicalIta.gf + $(GFCC) mathematical/MathematicalFre.gf + $(GFCC) mathematical/MathematicalSwe.gf + $(GFCC) mathematical/MathematicalFin.gf mv mathematical/*.gfc ../mathematical multimodal: diff --git a/resource-1.0/api/Combinators.gf b/resource-1.0/api/Combinators.gf index eaeec71bf..4cb19d93a 100644 --- a/resource-1.0/api/Combinators.gf +++ b/resource-1.0/api/Combinators.gf @@ -20,7 +20,10 @@ incomplete resource Combinators = open Grammar in { = \a,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompAP (PositA a))) ; pred : N -> NP -> Cl = \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN n)))) ; - pred : N2 -> NP -> NP -> Cl + pred : CN -> NP -> Cl + = \n,x -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) n))) ; + pred : NP -> NP -> Cl + = \n,x -> PredVP x (UseComp (CompNP n)) ; pred : N2 -> NP -> NP -> Cl = \n,x,y -> PredVP x (UseComp (CompNP (DetCN (DetSg (SgQuant IndefArt) NoOrd) (ComplN2 n y)))) ; pred : N -> NP -> NP -> Cl = \n,x,y -> PredVP (ConjNP and_Conj (BaseNP x y)) (UseComp (CompNP (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) (UseN n)))) ; @@ -97,5 +100,9 @@ incomplete resource Combinators = open Grammar in { } ; +-- This is not in ground API, because it would destroy parsing. + + appendText : Text -> Text -> Text + = \x,y -> {s = x.s ++ y.s ; lock_Text = <>} ; } diff --git a/resource-1.0/api/Constructors.gf b/resource-1.0/api/Constructors.gf index f6547f148..e5b5f35d1 100644 --- a/resource-1.0/api/Constructors.gf +++ b/resource-1.0/api/Constructors.gf @@ -38,7 +38,7 @@ incomplete resource Constructors = open Grammar in { mkText : overload { mkText : Text ; -- [empty text] - mkText : Phr -> Text -> Text; -- John walks. ... + mkText : Phr -> Text -> Text -- John walks. ... } ; mkPhr : overload {