quick hack: changed cat name Language to LAnguage in Phrasebook to avoid clash with Construction.Language in App

examples/phrasebook/Sentences.gf

@@ -36,7 +36,7 @@ abstract Sentences = Numeral ** {
     Person ;      -- agent wanting or doing something          e.g. "you" 
     Action ;      -- proposition about a Person                e.g. "you are here"
     Nationality ; -- complex of language, property, country    e.g. "Swedish, Sweden"
-    Language ;    -- language (can be without nationality)     e.g. "Flemish"
+    LAnguage ;    -- language (can be without nationality)     e.g. "Flemish"
     Citizenship ; -- property (can be without language)        e.g. "Belgian"
     Country ;     -- country (can be without language)         e.g. "Belgium"
     Day ;         -- weekday type                              e.g. "Friday"
@@ -75,7 +75,7 @@ abstract Sentences = Numeral ** {
     PPlace       : Place       -> Word ;
     PPlaceKind   : PlaceKind   -> Word ;
     PCurrency    : Currency    -> Word ;
-    PLanguage    : Language    -> Word ;
+    PLanguage    : LAnguage    -> Word ;
     PCitizenship : Citizenship -> Word ;
     PCountry     : Country     -> Word ;
     PDay         : Day         -> Word ;
@@ -142,7 +142,7 @@ abstract Sentences = Numeral ** {
     YouFamMale, YouFamFemale,           -- familiar you, said to man/woman (affects agreement)
     YouPolMale, YouPolFemale : Person ; -- polite you, said to man/woman (affects agreement)
 
-    LangNat    : Nationality -> Language ;    -- Swedish
+    LangNat    : Nationality -> LAnguage ;    -- Swedish
     CitiNat    : Nationality -> Citizenship ; -- Swedish
     CountryNat : Nationality -> Country ;     -- Sweden
     PropCit    : Citizenship -> Property ;    -- Swedish

examples/phrasebook/SentencesBul.gf

@@ -2,7 +2,7 @@ concrete SentencesBul of Sentences =
   NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale, 
                               YouPolFemale, ACitizen, Citizenship, PCitizenship, 
                               LangNat, CitiNat, CountryNat, PropCit,
-                              Nationality, Country, Language, PLanguage, PCountry
+                              Nationality, Country, LAnguage, PLanguage, PCountry
                               ] with 
   (Syntax = SyntaxBul),
   (Symbolic = SymbolicBul),
@@ -16,7 +16,7 @@ lincat
                    s2 : A;                                          -- furthermore, adjective for Property
                    s3 : PN                                          -- country name
                   } ;
-    Language = A ;
+    LAnguage = A ;
     Country = PN ;
 
 lin IMale = mkPerson i_Pron ;

examples/phrasebook/SentencesGer.gf

@@ -2,7 +2,7 @@ concrete SentencesGer of Sentences = NumeralGer ** SentencesI -
   [PYesToNo,SHaveNo,SHaveNoMass,
    Proposition, Action, Is, IsMass, SProp, SPropNot, QProp,
    AHaveCurr, ACitizen, ABePlace, AKnowSentence, AKnowPerson, AKnowQuestion,
-   Nationality, Language,
+   Nationality, LAnguage,
    ADoVerbPhrase, AModVerbPhrase, ADoVerbPhrasePlace, AModVerbPhrasePlace,
    YouPlurPolMale, YouPlurPolFemale
   ] with 
@@ -38,7 +38,7 @@ concrete SentencesGer of Sentences = NumeralGer ** SentencesI -
 
   lincat
     Nationality = {lang : CN ; country : NP ; prop : A} ;
-    Language = CN ; -- kein Deutsch
+    LAnguage = CN ; -- kein Deutsch
 
 -- the new things
   lin

examples/phrasebook/SentencesI.gf

@@ -34,7 +34,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
     Action = Cl ;
     Person = NPPerson ; -- {name : NP ; isPron : Bool ; poss : Quant} ;
     Nationality = NPNationality ; -- {lang : NP ; country : NP ; prop : A} ; 
-    Language = NP ;
+    LAnguage = NP ;
     Citizenship = A ;
     Country = NP ;
     Day = NPDay ; -- {name : NP ; point : Syntax.Adv ; habitual : Syntax.Adv} ;

examples/phrasebook/SentencesPol.gf

@@ -1,6 +1,6 @@
 concrete SentencesPol of Sentences = 
   NumeralPol ** SentencesI - [
-    Day,PDay,OnDay,Language,PLanguage,Citizenship,
+    Day,PDay,OnDay,LAnguage,PLanguage,Citizenship,
     PCitizenship,CitiNat,PropCit,ACitizen,
     Nationality,Transport,PTransport,ByTransp,
     IFemale,YouFamFemale, YouPolFemale,YouPolMale,

examples/phrasebook/Words.gf

@@ -78,8 +78,10 @@ abstract Words = Sentences ** {
     NorwegianCrown : Currency ;
     Pound : Currency ; -- UK
     Rouble : Currency ; -- Russia
+    Rupee : Currency ; -- India
     SwedishCrown : Currency ;
     Zloty : Currency ; -- Poland
+    Yuan : Currency ; -- China
 
   
 -- nationalities, countries, languages, citizenships
@@ -88,13 +90,17 @@ abstract Words = Sentences ** {
     Belgium : Country ;
     Bulgarian : Nationality ;
     Catalan : Nationality ;
+    Chinese : Nationality ;
     Danish : Nationality ;
     Dutch : Nationality ;
     English : Nationality ;
     Finnish : Nationality ;
-    Flemish : Language ;
+    Flemish : LAnguage ;
     French : Nationality ;
     German : Nationality ;
+    Hindi : LAnguage ;
+    India : Country ;
+    Indian : Citizenship ;
     Italian : Nationality ;
     Norwegian : Nationality ;
     Polish : Nationality ;
@@ -135,7 +141,7 @@ abstract Words = Sentences ** {
     AMarried    : Person -> Action ;              -- I am married
     AReady      : Person -> Action ;              -- I am ready
     AScared     : Person -> Action ;              -- I am scared
-    ASpeak      : Person -> Language -> Action ;  -- I speak Finnish
+    ASpeak      : Person -> LAnguage -> Action ;  -- I speak Finnish
     AThirsty    : Person -> Action ;              -- I am thirsty
     ATired      : Person -> Action ;              -- I am tired
     AUnderstand : Person -> Action ;              -- I (don't) understand

examples/phrasebook/WordsEng.gf

@@ -85,8 +85,10 @@ concrete WordsEng of Words = SentencesEng **
     NorwegianCrown = mkCN (mkA "Norwegian") (mkN "crown") | mkCN (mkN "crown") ;
     Pound = mkCN (mkN "pound") ;
     Rouble = mkCN (mkN "rouble") ;
+    Rupee = mkCN (mkN "rupee") ;
     SwedishCrown = mkCN (mkA "Swedish") (mkN "crown") | mkCN (mkN "crown") ;
     Zloty = mkCN (mkN "zloty" "zloty") ;
+    Yuan = mkCN (mkN "yuan" "yuan") ;
 
 -- Nationalities
 
@@ -94,6 +96,7 @@ concrete WordsEng of Words = SentencesEng **
     Belgium = mkNP (mkPN "Belgium") ;
     Bulgarian = mkNat "Bulgarian" "Bulgaria" ;
     Catalan = mkNPNationality (mkNP (mkPN "Catalan")) (mkNP (mkPN "Catalonia")) (mkA "Catalonian") ;
+    Chinese = mkNat "Chinese" "China" ;
     Danish = mkNat "Danish" "Denmark" ;
     Dutch =  mkNPNationality (mkNP (mkPN "Dutch")) (mkNP the_Quant (mkN "Netherlands")) (mkA "Dutch") ;
     English = mkNat "English" "England" ;
@@ -101,6 +104,9 @@ concrete WordsEng of Words = SentencesEng **
     Flemish = mkNP (mkPN "Flemish") ;
     French = mkNat "French" "France" ; 
     German = mkNat "German" "Germany" ;
+    Hindi = mkNP (mkPN "Hindi") ;
+    India = mkNP (mkPN "India") ;
+    Indian = mkA "Indian" ;
     Italian = mkNat "Italian" "Italy" ;
     Norwegian = mkNat "Norwegian" "Norway" ;
     Polish = mkNat "Polish" "Poland" ;

examples/phrasebook/WordsSwe.gf

@@ -78,8 +78,10 @@ concrete WordsSwe of Words = SentencesSwe **
     NorwegianCrown = mkCN (mkA "norsk") (mkN "krona") | mkCN (mkN "krona") ;
     Pound = mkCN (mkN "pund" "pund") ; ---- ett pund ?
     Rouble = mkCN (mkN "rubel" "rubeln" "rubel" "rubeln") ; ---- ?
+    Rupee = mkCN (mkN "rupee" "rupee") ; ---- 
     SwedishCrown = mkCN (mkA "svensk") (mkN "krona") | mkCN (mkN "krona") ;
     Zloty = mkCN (mkN "zloty" "zloty") ;
+    Yuan = mkCN (mkN "yuan" "yuan") ;
 
 -- nationalities
 
@@ -87,13 +89,17 @@ concrete WordsSwe of Words = SentencesSwe **
     Belgium = mkNP (mkPN "Belgien") ;
     Bulgarian = mkNat "bulgarisk" "Bulgarien" ;
     Catalan = mkNat "katalansk" "Katalonien" ;
+    China = mkNat "kinesisk" "Kina" ;
     Danish = mkNat "dansk" "Danmark" ;
     Dutch = mkNat "nederländsk" "Nederländerna" ;
     English = mkNat "engelsk" "England" ;
     Finnish = mkNat "finsk" "Finland" ;
     Flemish = mkNP (mkPN "flamländska") ;
     French = mkNat "fransk" "Frankrike" ;
-    German = mkNat "tysk" "Tyskland" ; 
+    German = mkNat "tysk" "Tyskland" ;
+    Hindi = mkNP (mkPN "hindi") ;
+    Indian = mkA "indisk" ; 
+    India = mkNP (mkPN "Indien") ;
     Italian = mkNat "italiensk" "Italien" ;
     Norwegian = mkNat "norsk" "Norge" ;
     Polish = mkNat "polsk" "Polen" ;