diff --git a/examples/phrasebook/GreetingsHin.gf b/examples/phrasebook/GreetingsHin.gf index 8d5c74489..97cba0489 100644 --- a/examples/phrasebook/GreetingsHin.gf +++ b/examples/phrasebook/GreetingsHin.gf @@ -1,4 +1,4 @@ -concrete GreetingsHin of Greetings = SentencesHin [mkGreeting] ** open (P=Prelude) in { +concrete GreetingsHin of Greetings = SentencesHin [Greeting,mkGreeting] ** open (P=Prelude) in { -- lincat -- Greeting = {s : Str; lock_Text : {}} ; diff --git a/examples/phrasebook/GreetingsUrd.gf b/examples/phrasebook/GreetingsUrd.gf index 46ae37d8d..1d004e2ca 100644 --- a/examples/phrasebook/GreetingsUrd.gf +++ b/examples/phrasebook/GreetingsUrd.gf @@ -1,4 +1,4 @@ -concrete GreetingsUrd of Greetings = SentencesUrd [mkGreeting] ** open (P=Prelude) in { +concrete GreetingsUrd of Greetings = SentencesUrd [mkGreeting,Greeting] ** open (P=Prelude) in { -- lincat -- Greeting = {s : Str; lock_Text : {}} ; diff --git a/examples/phrasebook/SentencesHin.gf b/examples/phrasebook/SentencesHin.gf index 607d86963..da2719795 100644 --- a/examples/phrasebook/SentencesHin.gf +++ b/examples/phrasebook/SentencesHin.gf @@ -1,4 +1,5 @@ -concrete SentencesHin of Sentences = NumeralHin ** SentencesI - [sing,IFemale,YouFamFemale,YouPolFemale,MMust,YouPlurFamFemale,YouPlurPolFemale,YouFamMale] with +concrete SentencesHin of Sentences = NumeralHin ** SentencesI - + [sing,IFemale,YouFamFemale,YouPolFemale,MMust,YouPlurFamFemale,YouPlurPolFemale,YouFamMale,mkGreeting] with (Syntax = SyntaxHin), (Symbolic = SymbolicHin), (Lexicon = LexiconHin) ** @@ -17,6 +18,9 @@ concrete SentencesHin of Sentences = NumeralHin ** SentencesI - [sing,IFemale, flags coding = utf8 ; +oper + mkGreeting = ss ; + oper myN = "मैं" ; mjh = "मुझ" ; diff --git a/examples/phrasebook/missing.txt b/examples/phrasebook/missing.txt index c3a9a888c..3fc81cd9a 100644 --- a/examples/phrasebook/missing.txt +++ b/examples/phrasebook/missing.txt @@ -1,20 +1,5 @@ DisambPhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookBul : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookCat : MMust ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookDan : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookDut : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookEng : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookFin : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookFre : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookGer : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookHin : AScared ATired MMust ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookIta : MCan MMust ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookLav : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookNor : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookPes : AHasAge AHasChildren AHasRoom AHasTable AmountCurrency Belgian DrinkNumber ItCost MCan MKnow MMust NNumeral ObjNumber ObjPlur PNumber PPrice ThesPlur ThesePlur ThosePlur V2Wait VWait -PhrasebookPol : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookRon : ObjPlur ThesPlur ThesePlur ThosePlur -PhrasebookRus : Belgian Belgium Flemish ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookSpa : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookSwe : ObjPlur ThesPlur ThesePlur ThosePlur PhrasebookTha : ObjPlur ThesPlur ThesePlur ThosePlur diff --git a/lib/src/Make.hs b/lib/src/Make.hs index e4f954f3e..1fd684ac1 100644 --- a/lib/src/Make.hs +++ b/lib/src/Make.hs @@ -83,7 +83,7 @@ langsIncomplete = ["Amh","Ara","Lat","Mlt","Tur","Thb"] langsAPI = langsLang `except` langsIncomplete -- languages for which to compile Symbolic -langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Chi","Hin","Ina","Jpn","Nep","Pnb","Rus", "Snd", "Thb"]) +langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Ina","Jpn","Nep","Pnb","Snd", "Thb"]) -- languages for which to compile minimal Syntax langsMinimal = langs `only` ["Ara","Eng","Bul","Rus"] diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile index 43aa17677..cd9485bd7 100644 --- a/lib/src/demo/Makefile +++ b/lib/src/demo/Makefile @@ -6,7 +6,7 @@ src: runghc MkMini.hs compdemo: - $(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd linkdemo: - $(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) -link Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Hin Ita Jpn Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd diff --git a/lib/src/demo/MkMini.hs b/lib/src/demo/MkMini.hs index 6286e8698..f162071e5 100644 --- a/lib/src/demo/MkMini.hs +++ b/lib/src/demo/MkMini.hs @@ -1,6 +1,6 @@ src = "Eng" langs = [ - "Afr","Bul","Cat","Dan","Dut", + "Afr","Bul","Cat","Chi","Dan","Dut", "Fin","Fre","Ger","Hin","Ita", "Jpn","Lav","Nep","Nor","Pes", "Pol","Pnb","Ron","Rus","Snd",