diff --git a/src/demo/Makefile b/src/demo/Makefile index ea27dbeb..dc76d930 100644 --- a/src/demo/Makefile +++ b/src/demo/Makefile @@ -6,7 +6,7 @@ src: runghc MkMini.hs compdemo: - $(compile) Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd linkdemo: - $(compile) -link Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) -link Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd diff --git a/src/demo/MkMini.hs b/src/demo/MkMini.hs index d90353f0..29fe3ec7 100644 --- a/src/demo/MkMini.hs +++ b/src/demo/MkMini.hs @@ -1,9 +1,9 @@ src = "Eng" langs = [ "Afr","Bul","Cat","Chi","Dan","Dut", - "Fin","Fre","Ger","Gre","Hin","Ita", - "Jpn","Lav","Mlt","Nep","Nor","Pes", - "Pol","Pnb","Ron","Rus","Snd", + "Est","Fin","Fre","Ger","Gre","Hin", + "Ita","Jpn","Lav","Mlt","Nep","Nor", + "Pes","Pol","Pnb","Ron","Rus","Snd", "Spa","Swe","Tha","Urd" ] diff --git a/src/demo/ResourceDemo.gf b/src/demo/ResourceDemo.gf index 809eb00e..a9985b7a 100644 --- a/src/demo/ResourceDemo.gf +++ b/src/demo/ResourceDemo.gf @@ -111,7 +111,8 @@ abstract ResourceDemo = Lexicon, Numeral, Grammar [ by_Prep, in_Prep, of_Prep, with_Prep, -- Prep, can_VV, must_VV, want_VV, -- VV, although_Subj, because_Subj, when_Subj, if_Subj, -- Subj, - when_IAdv, where_IAdv, why_IAdv-- IAdv, + when_IAdv, where_IAdv, why_IAdv, -- IAdv, + have_V2 ] ** { diff --git a/src/demo/ResourceDemoEng.gf b/src/demo/ResourceDemoEng.gf index cace07dc..cf1e079a 100644 --- a/src/demo/ResourceDemoEng.gf +++ b/src/demo/ResourceDemoEng.gf @@ -118,7 +118,8 @@ concrete ResourceDemoEng of ResourceDemo = LexiconEng, NumeralEng, GrammarEng [ by_Prep, in_Prep, of_Prep, with_Prep, -- Prep, can_VV, must_VV, want_VV, -- VV, although_Subj, because_Subj, when_Subj, if_Subj, -- Subj, - when_IAdv, where_IAdv, why_IAdv-- IAdv, + when_IAdv, where_IAdv, why_IAdv, -- IAdv, + have_V2 ] ** open SyntaxEng, (S = SyntaxEng) in {