cleanup CountriesAndRegions and Mondial. For some reasonthe abstract syntax for all countries was moved from CountriesAndRegions to Mondial. It is even more odd that there was a linearization for them both in CountriesAndRegions and Mondial

examples/SUMO/CountriesAndRegions.gf

@@ -1,5 +1,400 @@
 abstract CountriesAndRegions = MidLevelOntology, Geography, Government ** {
 
+  fun Country : Class ;
+
+  fun Afghanistan : Ind (both Country Nation);
+
+  fun Albania : Ind (both Country Nation);
+
+  fun Algeria : Ind (both Country Nation);
+
+  fun Andorra : Ind (both Country EuropeanNation);
+
+  fun Angola : Ind (both Country Nation);
+
+  fun AntiguaAndBarbuda : Ind (both Country Nation);
+
+  fun Argentina : Ind (both Country Nation);
+
+  fun Armenia : Ind (both Country Nation);
+
+  fun Australia : Ind (both Country Nation);
+
+  fun Austria : Ind (both Country Nation);
+
+  fun Azerbaijan : Ind (both Country Nation);
+
+  fun Bahamas : Ind Country ;
+
+  fun Bahrain : Ind (both Country Nation);
+
+  fun Bangladesh : Ind (both Country Nation);
+
+  fun Barbados : Ind (both Country Nation);
+
+  fun Belarus : Ind (both Country Nation);
+
+  fun Belgium : Ind (both Country EuropeanNation);
+
+  fun Belize : Ind (both Country Nation);
+
+  fun Benin : Ind (both Country Nation);
+
+  fun Bhutan : Ind (both Country Nation);
+
+  fun Bolivia : Ind (both Country Nation);
+
+  fun BosniaAndHerzegovina : Ind (both Country Nation);
+
+  fun Botswana : Ind (both Country Nation);
+
+  fun Brazil : Ind (both Country Nation);
+
+  fun Brunei : Ind (both Country Nation);
+
+  fun Bulgaria : Ind (both Country Nation);
+
+  fun BurkinaFaso : Ind (both Country Nation);
+
+  fun Burma : Ind Country ;
+
+  fun Burundi : Ind (both Country Nation);
+
+  fun Cambodia : Ind (both Country Nation);
+
+  fun Cameroon : Ind (both Country Nation);
+
+  fun Canada : Ind (both Country Nation);
+
+  fun CapeVerde : Ind (both Country Nation);
+
+  fun CentralAfricanRepublic : Ind (both Country Nation);
+
+  fun Chad : Ind (both Country Nation);
+
+  fun Chile : Ind (both Country Nation);
+
+  fun China : Ind (both Country Nation);
+
+  fun Colombia : Ind (both Country Nation);
+
+  fun Comoros : Ind (both Country Nation);
+
+  fun Congo : Ind Country ;
+
+  fun CostaRica : Ind (both Country Nation);
+
+  fun CoteDIvoire : Ind (both Country Nation);
+
+  fun Croatia : Ind (both Country Nation);
+
+  fun Cuba : Ind (both Country (both Nation Island)) ;
+
+  fun Cyprus : Ind (both Country Nation);
+
+  fun CzechRepublic : Ind (both Country Nation);
+
+  fun Denmark : Ind (both Country EuropeanNation);
+
+  fun Djibouti : Ind (both Country Nation);
+
+  fun Dominica : Ind (both Country Nation);
+
+  fun DominicanRepublic : Ind (both Country Nation);
+
+  fun Ecuador : Ind (both Country Nation);
+
+  fun Egypt : Ind (both Country Nation);
+
+  fun ElSalvador : Ind (both Country Nation);
+
+  fun EquatorialGuinea : Ind (both Country Nation);
+
+  fun Eritrea : Ind (both Country Nation);
+
+  fun Estonia : Ind (both Country Nation);
+
+  fun Ethiopia : Ind (both Country Nation);
+
+  fun Fiji : Ind (both Country Nation);
+
+  fun Finland : Ind (both Country EuropeanNation);
+
+  fun France : Ind (both Country EuropeanNation);
+
+  fun FrenchGuiana : Ind (both Country (both LandArea DependencyOrSpecialSovereigntyArea)) ;
+
+  fun Gabon : Ind (both Country Nation);
+
+  fun Gambia : Ind (both Country Nation);
+
+  fun Georgia : Ind (both Country Nation);
+
+  fun Germany : Ind (both Country EuropeanNation);
+
+  fun Ghana : Ind (both Country Nation);
+
+  fun Greece : Ind (both Country EuropeanNation);
+
+  fun Grenada : Ind (both Country Nation);
+
+  fun Guatemala : Ind (both Country Nation);
+
+  fun Guinea : Ind (both Country Nation);
+
+  fun Guinea_Bissau : Ind Country ;
+
+  fun Guyana : Ind (both Country Nation);
+
+  fun Haiti : Ind (both Country Nation);
+
+  fun HolySee : Ind (both Country EuropeanNation);
+
+  fun Honduras : Ind (both Country Nation);
+
+  fun Hungary : Ind (both Country Nation);
+
+  fun Iceland : Ind (both Country (both EuropeanNation Island)) ;
+
+  fun India : Ind (both Country Nation);
+
+  fun Indonesia : Ind (both Country Nation);
+
+  fun Iran : Ind (both Country Nation);
+
+  fun Iraq : Ind (both Country Nation);
+
+  fun Ireland : Ind (both Country EuropeanNation);
+
+  fun Israel : Ind (both Country Nation);
+
+  fun Italy : Ind (both Country EuropeanNation);
+
+  fun Jamaica : Ind (both Country Nation);
+
+  fun Japan : Ind (both Country (both Nation Island)) ;
+
+  fun Jordan : Ind (both Country Nation);
+
+  fun Kazakstan : Ind Country ;
+
+  fun Kenya : Ind (both Country Nation);
+
+  fun Kiribati : Ind (both Country Nation);
+
+  fun Kuwait : Ind (both Country Nation);
+
+  fun Kyrgyzstan : Ind (both Country Nation);
+
+  fun Laos : Ind (both Country Nation);
+
+  fun Latvia : Ind (both Country Nation);
+
+  fun Lebanon : Ind (both Country Nation);
+
+  fun Lesotho : Ind (both Country Nation);
+
+  fun Liberia : Ind (both Country Nation);
+
+  fun Libya : Ind (both Country Nation);
+
+  fun Liechtenstein : Ind (both Country Nation);
+
+  fun Lithuania : Ind (both Country Nation);
+
+  fun Luxembourg : Ind (both Country Nation);
+
+  fun Macedonia : Ind (both Country Nation);
+
+  fun Madagascar : Ind (both Country Nation);
+
+  fun Malawi : Ind (both Country Nation);
+
+  fun Malaysia : Ind (both Country Nation);
+
+  fun Maldives : Ind (both Country Nation);
+
+  fun Mali : Ind (both Country Nation);
+
+  fun Malta : Ind (both Country EuropeanNation);
+
+  fun MarshallIslands : Ind (both Country Nation);
+
+  fun Mauritania : Ind (both Country Nation);
+
+  fun Mauritius : Ind (both Country Nation);
+
+  fun Mexico : Ind (both Country Nation);
+
+  fun Micronesia : Ind (both Country Nation);
+
+  fun Moldova : Ind (both Country Nation);
+
+  fun Monaco : Ind (both Country EuropeanNation);
+
+  fun Mongolia : Ind (both Country Nation);
+
+  fun Morocco : Ind (both Country Nation);
+
+  fun Mozambique : Ind (both Country Nation);
+
+  fun Namibia : Ind (both Country Nation);
+
+  fun Nauru : Ind (both Country Nation);
+
+  fun Nepal : Ind (both Country Nation);
+
+  fun Netherlands : Ind (both Country EuropeanNation);
+
+  fun NewCaledonia : Ind (both Country (both LandArea DependencyOrSpecialSovereigntyArea)) ;
+
+  fun NewZealand : Ind (both Country Nation);
+
+  fun Nicaragua : Ind (both Country Nation);
+
+  fun Niger : Ind (both Country Nation);
+
+  fun Nigeria : Ind (both Country Nation);
+
+  fun NorthKorea : Ind (both Country Nation);
+
+  fun Norway : Ind (both Country EuropeanNation);
+
+  fun Oman : Ind (both Country Nation);
+
+  fun Pakistan : Ind (both Country Nation);
+
+  fun Palau : Ind (both Country Nation);
+
+  fun Panama : Ind (both Country Nation);
+
+  fun PapuaNewGuinea : Ind (both Country Nation);
+
+  fun Paraguay : Ind (both Country Nation);
+
+  fun Peru : Ind (both Country Nation);
+
+  fun Philippines : Ind (both Country Nation);
+
+  fun Poland : Ind (both Country EuropeanNation);
+
+  fun Portugal : Ind (both Country EuropeanNation);
+
+  fun Qatar : Ind (both Country Nation);
+
+  fun Romania : Ind (both Country Nation);
+
+  fun Russia : Ind (both Country Nation);
+
+  fun Rwanda : Ind (both Country Nation);
+
+  -- The nation of SaintKittsAndNevis
+  fun SaintKittsAndNevis : Ind (both Country Nation);
+
+  fun SaintLucia : Ind (both Country Nation);
+
+  -- The nation of SaintVincentAndTheGrenadines.
+  fun SaintVincentAndTheGrenadines : Ind (both Country Nation);
+
+  fun SanMarino : Ind (both Country EuropeanNation);
+
+  -- The nation of SaoTomeAndPrincipe.
+  fun SaoTomeAndPrincipe : Ind (both Country Nation);
+
+  fun SaudiArabia : Ind (both Country Nation);
+
+  fun Senegal : Ind (both Country Nation);
+
+  -- The nation of SerbiaAndMontenegro.
+  fun SerbiaAndMontenegro : Ind (both Country Nation);
+
+  fun Seychelles : Ind (both Country Nation);
+
+  fun SierraLeone : Ind (both Country Nation);
+
+  fun Singapore : Ind (both Country Nation);
+
+  fun Slovakia : Ind (both Country Nation);
+
+  fun Slovenia : Ind (both Country Nation);
+
+  fun SolomonIslands : Ind (both Country Nation);
+
+  fun Somalia : Ind (both Country Nation);
+
+  fun SouthAfrica : Ind (both Country Nation);
+
+  fun SouthKorea : Ind (both Country Nation);
+
+  fun Spain : Ind (both Country EuropeanNation);
+
+  fun SriLanka : Ind (both Country Nation);
+
+  fun Sudan : Ind (both Country Nation);
+
+  fun Suriname : Ind (both Country Nation);
+
+  fun Swaziland : Ind (both Country Nation);
+
+  fun Sweden : Ind (both Country EuropeanNation);
+
+  fun Switzerland : Ind (both Country EuropeanNation);
+
+  fun Syria : Ind (both Country Nation);
+
+  fun Taiwan : Ind (both Country Nation);
+
+  fun Tajikistan : Ind (both Country Nation);
+
+  fun Tanzania : Ind (both Country Nation);
+
+  fun Thailand : Ind (both Country Nation);
+
+  fun Togo : Ind (both Country Nation);
+
+  fun Tonga : Ind (both Country Nation);
+
+  -- The nation of TrinidadAndTobago.
+  fun TrinidadAndTobago : Ind (both Country Nation);
+
+  fun Tunisia : Ind (both Country Nation);
+
+  fun Turkey : Ind (both Country Nation);
+
+  fun Turkmenistan : Ind (both Country Nation);
+
+  fun Tuvalu : Ind (both Country Nation);
+
+  fun Uganda : Ind (both Country Nation);
+
+  fun Ukraine : Ind (both Country Nation);
+
+  fun UnitedArabEmirates : Ind (both Country EuropeanNation);
+
+  fun UnitedKingdom : Ind (both Country Nation);
+
+  fun UnitedStates : Ind (both Country Nation);
+
+  fun Uruguay : Ind (both Country Nation);
+
+  fun Uzbekistan : Ind (both Country Nation);
+
+  fun Vanuatu : Ind (both Country Nation);
+
+  fun Venezuela : Ind (both Country Nation);
+
+  fun Vietnam : Ind (both Country Nation);
+
+  fun WesternSahara : Ind (both Country (both Nation GeopoliticalArea)) ;
+
+  fun WesternSamoa : Ind Country ;
+
+  fun Yemen : Ind (both Country Nation);
+
+  fun Zaire : Ind Country ;
+
+  fun Zambia : Ind (both Country Nation);
+
   --  The City of Adana in Turkey.
   fun AdanaTurkey : Ind City ;
 

examples/SUMO/CountriesAndRegionsEng.gf

@@ -52,6 +52,7 @@ lin
   BadVilbelGermany = UsePN (mkPN "Bad Vilbel") ;
   BaghdadIraq = UsePN (mkPN "Baghdad") ;
   BagreColombia = UsePN (mkPN "Bagre") ;
+  Bahamas = UsePN (mkPN "Bahamas") ;
   BahawalpurPakistan = UsePN (mkPN "Bahawalpur") ;
   BakaAlGarbiyehIsrael = UsePN (mkPN "Baka al-Garbiyeh") ;
   BakkaAlSharkiyaWestBank = UsePN (mkPN "Bakka al-Sharkiya") ;
@@ -100,6 +101,7 @@ lin
   BucharestIndia = UsePN (mkPN "Bucharest") ;
   BuenosAiresArgentina = UsePN (mkPN "Buenos Aires") ;
   BuinakskRussia = UsePN (mkPN "Buinaksk") ;
+  Burma = UsePN (mkPN "Burma") ;
   BwindiforestUganda = UsePN (mkPN "Bwindi forest") ;
   CabindaAngola = UsePN (mkPN "Cabinda") ;
   CaglayanTurkey = UsePN (mkPN "Caglayan") ;
@@ -130,6 +132,7 @@ lin
   ColombiaPanama = UsePN (mkPN "Colombia") ;
   ColomboSriLanka = UsePN (mkPN "Colombo") ;
   ComayaguaHonduras = UsePN (mkPN "Comayagua") ;
+  Congo = UsePN (mkPN "Congo") ;
   CopacaBanaCuba = UsePN (mkPN "Copaca-bana") ;
   CopenhagenDenmark = UsePN (mkPN "Copenhagen") ;
   CorsicaFrance = UsePN (mkPN "Corsica") ;
@@ -187,6 +190,7 @@ lin
   GashuriIsrael = UsePN (mkPN "Gashuri") ;
   GeneralSantosPhilippines = UsePN (mkPN "General Santos") ;
   GenevaSwitzerland = UsePN (mkPN "Geneva") ;
+  Georgia = UsePN (mkPN "Georgia") ;
   GetxoSpain = UsePN (mkPN "Getxo") ;
   GhalebiehIraq = UsePN (mkPN "Ghalebieh") ;
   GhaziabadUttarPradeshIndia = UsePN (mkPN "Ghaziabad Uttar Pradesh") ;
@@ -843,5 +847,6 @@ lin
   Vanuatu = UsePN (mkPN "Vanuatu") ;
   WakeIsland = UsePN (mkPN "Wake Island") ;
   WallisAndFutuna = UsePN (mkPN "Wallis and Futuna") ;
+  Zaire = UsePN (mkPN "Zaire") ;
   
 };

examples/SUMO/CountriesAndRegionsRon.gf

@@ -54,5 +54,192 @@ lin
   VirginIslands = UsePN (mkPN "Insulele Virgine, SUA") ;
   WallisAndFutuna = UsePN (mkPN "Wallis şi Futuna") ;
   Zimbabwe = UsePN (mkPN "Zimbabwe") ;
+  Andorra = UsePN (mkPN "Andorra" | mkPN "Andora") ;
+  UnitedArabEmirates = UsePN (mkPN "Emiratele Arabe Unite") ;
+  Afghanistan = UsePN (mkPN "Afghanistan" | mkPN "Afganistan") ;
+  AntiguaAndBarbuda = UsePN (mkPN "Antigua şi Barbuda") ;
+  Albania = UsePN (mkPN "Albania") ;
+  Armenia = UsePN (mkPN "Armenia") ;
+  Angola = UsePN (mkPN "Angola") ;
+  Argentina = UsePN (mkPN "Argentina") ;
+  Austria = UsePN (mkPN "Austria") ;
+  Australia = UsePN (mkPN "Australia") ;
+  Azerbaijan = UsePN (mkPN "Azerbaijan" | mkPN "Azerbaidjan") ;
+  BosniaAndHerzegovina = UsePN (mkPN "Bosnia şi Herzegovina" | mkPN "Bosnia şi Herţegovina") ;
+  Barbados = UsePN (mkPN "Barbados") ;
+  Bangladesh = UsePN (mkPN "Bangladeş" | mkPN "Bangladesh") ;
+  Belgium = UsePN (mkPN "Belgia") ;
+  BurkinaFaso = UsePN (mkPN "Burkina Fasso" | mkPN "Burkina Faso") ;
+  Bulgaria = UsePN (mkPN "Bulgaria") ;
+  Bahrain = UsePN (mkPN "Bahrain") ;
+  Burundi = UsePN (mkPN "Burundi") ;
+  Benin = UsePN (mkPN "Benin") ;
+  Brunei = UsePN (mkPN "Brunei") ;
+  Bolivia = UsePN (mkPN "Bolivia") ;
+  Brazil = UsePN (mkPN "Brazilia") ;
+  Bahamas = UsePN (mkPN "Bahamas") ;
+  Bhutan = UsePN (mkPN "Bhutan") ;
+  Botswana = UsePN (mkPN "Botswana") ;
+  Belarus = UsePN (mkPN "Belarus" | mkPN "Bielorusia") ;
+  Belize = UsePN (mkPN "Belize") ;
+  Canada = UsePN (mkPN "Canada") ;
+  CentralAfricanRepublic = UsePN (mkPN "Republica Central Africană" | mkPN "Republica Centrafricană") ;
+  Congo = UsePN (mkPN "Republica Congo" | mkPN "Congo") ;
+  Switzerland = UsePN (mkPN "Elveţia" | mkPN "Eleveţia") ;
+  Chile = UsePN (mkPN "Chile") ;
+  Cameroon = UsePN (mkPN "Camerun") ;
+  China = UsePN (mkPN "Republica Populară Chineză" | mkPN "China") ;
+  Colombia = UsePN (mkPN "Columbia") ;
+  CostaRica = UsePN (mkPN "Costa Rica") ;
+  Cuba = UsePN (mkPN "Cuba") ;
+  CapeVerde = UsePN (mkPN "Capul Verde") ;
+  Cyprus = UsePN (mkPN "Cipru") ;
+  CzechRepublic = UsePN (mkPN "Republica Cehă" | mkPN "Cehia") ;
+  Germany = UsePN (mkPN "Germania") ;
+  Djibouti = UsePN (mkPN "Djibouti") ;
+  Denmark = UsePN (mkPN "Danemarca") ;
+  Dominica = UsePN (mkPN "Dominica") ;
+  DominicanRepublic = UsePN (mkPN "Republica Dominicană") ;
+  Algeria = UsePN (mkPN "Algeria") ;
+  Ecuador = UsePN (mkPN "Ecuador") ;
+  Estonia = UsePN (mkPN "Estonia") ;
+  Egypt = UsePN (mkPN "Egipt") ;
+  WesternSahara = UsePN (mkPN "Sahara de Vest") ;
+  Eritrea = UsePN (mkPN "Eritreea" | mkPN "Eritrea") ;
+  Spain = UsePN (mkPN "Spania") ;
+  Ethiopia = UsePN (mkPN "Etiopia") ;
+  Finland = UsePN (mkPN "Finlanda") ;
+  Fiji = UsePN (mkPN "Fiji") ;
+  Micronesia = UsePN (mkPN "Micronezia, Republica Federală") ;
+  France = UsePN (mkPN "Franţa") ;
+  Gabon = UsePN (mkPN "Gabon") ;
+  UnitedKingdom = UsePN (mkPN "Regatul Unit" | mkPN "Marea Britanie") ;
+  Grenada = UsePN (mkPN "Grenada") ;
+  Georgia = UsePN (mkPN "Georgia") ;
+  FrenchGuiana = UsePN (mkPN "Guiana Franceză") ;
+  Ghana = UsePN (mkPN "Ghana") ;
+  Gambia = UsePN (mkPN "Gambia") ;
+  Guinea = UsePN (mkPN "Guinea" | mkPN "Guineea") ;
+  EquatorialGuinea = UsePN (mkPN "Guineea Ecuatorială") ;
+  Greece = UsePN (mkPN "Grecia") ;
+  Guatemala = UsePN (mkPN "Guatemala") ;
+  Guyana = UsePN (mkPN "Guiana" | mkPN "Guyana") ;
+  Honduras = UsePN (mkPN "Honduras") ;
+  Croatia = UsePN (mkPN "Croaţia") ;
+  Haiti = UsePN (mkPN "Haiti") ;
+  Hungary = UsePN (mkPN "Ungaria") ;
+  Indonesia = UsePN (mkPN "Indonezia") ;
+  Ireland = UsePN (mkPN "Republica Irlanda" | mkPN "Irlanda") ;
+  Israel = UsePN (mkPN "Israel") ;
+  India = UsePN (mkPN "India") ;
+  Iraq = UsePN (mkPN "Irak" | mkPN "Iraq") ;
+  Iran = UsePN (mkPN "Iran (Republica islamică)" | mkPN "Iran") ;
+  Iceland = UsePN (mkPN "Islanda") ;
+  Italy = UsePN (mkPN "Italia") ;
+  Jamaica = UsePN (mkPN "Jamaica") ;
+  Jordan = UsePN (mkPN "Iordania") ;
+  Japan = UsePN (mkPN "Japonia") ;
+  Kenya = UsePN (mkPN "Kenya") ;
+  Kyrgyzstan = UsePN (mkPN "Kârgâzstan" | mkPN "Kirghizia") ;
+  Cambodia = UsePN (mkPN "Cambodgia") ;
+  Kiribati = UsePN (mkPN "Kiribati") ;
+  Comoros = UsePN (mkPN "Comore" | mkPN "Comoros") ;
+  NorthKorea = UsePN (mkPN "Coreea de Nord") ;
+  SouthKorea = UsePN (mkPN "Coreea de Sud") ;
+  Kuwait = UsePN (mkPN "Kuweit") ;
+  Laos = UsePN (mkPN "Lao, Republica Democratică Populară" | mkPN "Laos") ;
+  Lebanon = UsePN (mkPN "Liban") ;
+  SaintLucia = UsePN (mkPN "Saint Lucia") ;
+  Liechtenstein = UsePN (mkPN "Liechtenstein") ;
+  SriLanka = UsePN (mkPN "Sri Lanka") ;
+  Liberia = UsePN (mkPN "Liberia") ;
+  Lesotho = UsePN (mkPN "Lesotho") ;
+  Lithuania = UsePN (mkPN "Lituania") ;
+  Luxembourg = UsePN (mkPN "Luxemburg") ;
+  Latvia = UsePN (mkPN "Letonia") ;
+  Libya = UsePN (mkPN "Libia, Jamahiriya Arabă" | mkPN "Libia") ;
+  Morocco = UsePN (mkPN "Maroc") ;
+  Monaco = UsePN (mkPN "Monaco") ;
+  Moldova = UsePN (mkPN "Moldova, Republica" | mkPN "Republica Moldova") ;
+  Madagascar = UsePN (mkPN "Madagascar") ;
+  MarshallIslands = UsePN (mkPN "Insulele Marshall") ;
+  Macedonia = UsePN (mkPN "Fosta Republică Iugoslavă Macedonia" | mkPN "Republica Macedonia" | mkPN "Macedonia") ;
+  Mali = UsePN (mkPN "Mali") ;
+  Mongolia = UsePN (mkPN "Mongolia") ;
+  Mauritania = UsePN (mkPN "Mauritania") ;
+  Malta = UsePN (mkPN "Insula Malta" | mkPN "Malta") ;
+  Mauritius = UsePN (mkPN "Mauriţius" | mkPN "Mauritius") ;
+  Maldives = UsePN (mkPN "Maldive") ;
+  Malawi = UsePN (mkPN "Malawi") ;
+  Mexico = UsePN (mkPN "Mexic") ;
+  Malaysia = UsePN (mkPN "Malaiezia" | mkPN "Malaysia" | mkPN "Malaezia") ;
+  Mozambique = UsePN (mkPN "Mozambic") ;
+  Namibia = UsePN (mkPN "Namibia") ;
+  NewCaledonia = UsePN (mkPN "Noua Caledonie") ;
+  Niger = UsePN (mkPN "Niger") ;
+  Nigeria = UsePN (mkPN "Nigeria") ;
+  Nicaragua = UsePN (mkPN "Nicaragua") ;
+  Netherlands = UsePN (mkPN "Ţările de Jos" | mkPN "Olanda") ;
+  Norway = UsePN (mkPN "Norvegia") ;
+  Nepal = UsePN (mkPN "Nepal") ;
+  Nauru = UsePN (mkPN "Nauru") ;
+  NewZealand = UsePN (mkPN "Noua Zeelandă") ;
+  Oman = UsePN (mkPN "Oman") ;
+  Panama = UsePN (mkPN "Panama") ;
+  Peru = UsePN (mkPN "Peru") ;
+  PapuaNewGuinea = UsePN (mkPN "Papua Noua Guinee") ;
+  Philippines = UsePN (mkPN "Filipine") ;
+  Pakistan = UsePN (mkPN "Pakistan") ;
+  Poland = UsePN (mkPN "Polonia") ;
+  Portugal = UsePN (mkPN "Portugalia") ;
+  Palau = UsePN (mkPN "Palau") ;
+  Paraguay = UsePN (mkPN "Paraguay") ;
+  Qatar = UsePN (mkPN "Qatar") ;
+  Romania = UsePN (mkPN "România") ;
+  Russia = UsePN (mkPN "Federația Rusă" | mkPN "Rusia") ;
+  Rwanda = UsePN (mkPN "Ruanda" | mkPN "Rwanda") ;
+  SaintKittsAndNevis = UsePN (mkPN "Sain Kitts şi Nevis" | mkPN "Saint Kitts şi Nevis" | mkPN "Sfântul Kitts şi Nevis") ;
+  SaintVincentAndTheGrenadines = UsePN (mkPN "Sfântul Vincenţiu şi Grenadine" | mkPN "Saint Vincent şi Grenadines" | mkPN "Sfântul Vincent şi Grenadine") ;
+  SaudiArabia = UsePN (mkPN "Arabia Saudită") ;
+  SaoTomeAndPrincipe = UsePN (mkPN "São Tomé şi Príncipe" | mkPN "Sao Tome şi Principe") ;
+  SolomonIslands = UsePN (mkPN "Insulele Solomon") ;
+  Seychelles = UsePN (mkPN "Seychelles") ;
+  Sudan = UsePN (mkPN "Sudan") ;
+  Sweden = UsePN (mkPN "Suedia") ;
+  Singapore = UsePN (mkPN "Singapore") ;
+  Slovenia = UsePN (mkPN "Slovenia") ;
+  Slovakia = UsePN (mkPN "Slovacia") ;
+  SierraLeone = UsePN (mkPN "Sierra Leone") ;
+  SanMarino = UsePN (mkPN "San Marino") ;
+  Senegal = UsePN (mkPN "Senegal") ;
+  Somalia = UsePN (mkPN "Somalia") ;
+  Suriname = UsePN (mkPN "Surinam") ;
+  ElSalvador = UsePN (mkPN "El Salvador") ;
+  Syria = UsePN (mkPN "Siria") ;
+  Swaziland = UsePN (mkPN "Swaziland") ;
+  Chad = UsePN (mkPN "Ciad") ;
+  Togo = UsePN (mkPN "Togo") ;
+  Thailand = UsePN (mkPN "Thailanda" | mkPN "Tailanda") ;
+  Tajikistan = UsePN (mkPN "Tajikistan" | mkPN "Tadjikistan") ;
+  Turkmenistan = UsePN (mkPN "Turkmenia" | mkPN "Turkmenistan") ;
+  Tunisia = UsePN (mkPN "Tunisia") ;
+  Tonga = UsePN (mkPN "Tonga") ;
+  Turkey = UsePN (mkPN "Turcia") ;
+  Tuvalu = UsePN (mkPN "Tuvalu") ;
+  Taiwan = UsePN (mkPN "Taiwan") ;
+  Tanzania = UsePN (mkPN "Tanzania") ;
+  Ukraine = UsePN (mkPN "Ucraina") ;
+  Uganda = UsePN (mkPN "Uganda") ;
+  UnitedStates = UsePN (mkPN "Statele Unite" | mkPN "Statele Unite ale Americii") ;
+  Uruguay = UsePN (mkPN "Uruguay") ;
+  Uzbekistan = UsePN (mkPN "Uzbekistan") ;
+  Venezuela = UsePN (mkPN "Venezuela") ;
+  Vietnam = UsePN (mkPN "Vietnam") ;
+  Vanuatu = UsePN (mkPN "Vanuatu") ;
+  Yemen = UsePN (mkPN "Yemen") ;
+  SouthAfrica = UsePN (mkPN "Africa de Sud") ;
+  Zambia = UsePN (mkPN "Zambia") ;
+  SerbiaAndMontenegro = UsePN (mkPN "Serbia şi Muntenegru") ;
+  TrinidadAndTobago = UsePN (mkPN "Trinidad şi Tobago" | mkPN "Trinidad-Tobago") ;
 
 };

examples/SUMO/Mondial.gf

@@ -1,84 +1,4 @@
-abstract Mondial = MidLevelOntology, Geography, Government ** {
+abstract Mondial = CountriesAndRegions ** {
-
-  fun Afghanistan : Ind (both Country Nation);
-
-  fun Albania : Ind (both Country Nation);
-
-  fun Algeria : Ind (both Country Nation);
-
-  fun Andorra : Ind (both Country EuropeanNation);
-
-  fun Angola : Ind (both Country Nation);
-
-  fun AntiguaAndBarbuda : Ind (both Country Nation);
-
-  fun Argentina : Ind (both Country Nation);
-
-  fun Armenia : Ind (both Country Nation);
-
-  fun Australia : Ind (both Country Nation);
-
-  fun Austria : Ind (both Country Nation);
-
-  fun Azerbaijan : Ind (both Country Nation);
-
-  fun Bahamas : Ind Country ;
-
-  fun Bahrain : Ind (both Country Nation);
-
-  fun Bangladesh : Ind (both Country Nation);
-
-  fun Barbados : Ind (both Country Nation);
-
-  fun Belarus : Ind (both Country Nation);
-
-  fun Belgium : Ind (both Country EuropeanNation);
-
-  fun Belize : Ind (both Country Nation);
-
-  fun Benin : Ind (both Country Nation);
-
-  fun Bhutan : Ind (both Country Nation);
-
-  fun Bolivia : Ind (both Country Nation);
-
-  fun BosniaAndHerzegovina : Ind (both Country Nation);
-
-  fun Botswana : Ind (both Country Nation);
-
-  fun Brazil : Ind (both Country Nation);
-
-  fun Brunei : Ind (both Country Nation);
-
-  fun Bulgaria : Ind (both Country Nation);
-
-  fun BurkinaFaso : Ind (both Country Nation);
-
-  fun Burma : Ind Country ;
-
-  fun Burundi : Ind (both Country Nation);
-
-  fun Cambodia : Ind (both Country Nation);
-
-  fun Cameroon : Ind (both Country Nation);
-
-  fun Canada : Ind (both Country Nation);
-
-  fun CapeVerde : Ind (both Country Nation);
-
-  fun CentralAfricanRepublic : Ind (both Country Nation);
-
-  fun Chad : Ind (both Country Nation);
-
-  fun Chile : Ind (both Country Nation);
-
-  fun China : Ind (both Country Nation);
-
-  fun Colombia : Ind (both Country Nation);
-
-  fun Comoros : Ind (both Country Nation);
-
-  fun Congo : Ind Country ;
 
   fun Continents_Africa : Ind Continent ;
 
@@ -90,10 +10,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Continents_Europe : Ind Continent ;
 
-  fun CostaRica : Ind (both Country Nation);
-
-  fun CoteDIvoire : Ind (both Country Nation);
-
   fun Countries_AFG_cities_Kabul : Ind City ;
 
   fun Countries_AG_cities_SaintJohns : Ind City ;
@@ -9382,18 +9298,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Countries_cid_cia_West_Bank : Ind Country ;
 
-  fun Country : Class ;
-
-  fun Croatia : Ind (both Country Nation);
-
-  fun Cuba : Ind (both Country (both Nation Island)) ;
-
-  fun Cyprus : Ind (both Country Nation);
-
-  fun CzechRepublic : Ind (both Country Nation);
-
-  fun Denmark : Ind (both Country EuropeanNation);
-
   fun Deserts_ArabianDesert : Ind Desert ;
 
   fun Deserts_Asauad : Ind Desert ;
@@ -9454,76 +9358,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Deserts_Uaran : Ind Desert ;
 
-  fun Djibouti : Ind (both Country Nation);
-
-  fun Dominica : Ind (both Country Nation);
-
-  fun DominicanRepublic : Ind (both Country Nation);
-
-  fun Ecuador : Ind (both Country Nation);
-
-  fun Egypt : Ind (both Country Nation);
-
-  fun ElSalvador : Ind (both Country Nation);
-
-  fun EquatorialGuinea : Ind (both Country Nation);
-
-  fun Eritrea : Ind (both Country Nation);
-
-  fun Estonia : Ind (both Country Nation);
-
-  fun Ethiopia : Ind (both Country Nation);
-
-  fun Fiji : Ind (both Country Nation);
-
-  fun Finland : Ind (both Country EuropeanNation);
-
-  fun France : Ind (both Country EuropeanNation);
-
-  fun FrenchGuiana : Ind (both Country (both LandArea DependencyOrSpecialSovereigntyArea)) ;
-
-  fun Gabon : Ind (both Country Nation);
-
-  fun Gambia : Ind (both Country Nation);
-
-  fun Georgia : Ind (both Country Nation);
-
-  fun Germany : Ind (both Country EuropeanNation);
-
-  fun Ghana : Ind (both Country Nation);
-
-  fun Greece : Ind (both Country EuropeanNation);
-
-  fun Grenada : Ind (both Country Nation);
-
-  fun Guatemala : Ind (both Country Nation);
-
-  fun Guinea : Ind (both Country Nation);
-
-  fun Guinea_Bissau : Ind Country ;
-
-  fun Guyana : Ind (both Country Nation);
-
-  fun Haiti : Ind (both Country Nation);
-
-  fun HolySee : Ind (both Country EuropeanNation);
-
-  fun Honduras : Ind (both Country Nation);
-
-  fun Hungary : Ind (both Country Nation);
-
-  fun Iceland : Ind (both Country (both EuropeanNation Island)) ;
-
-  fun India : Ind (both Country Nation);
-
-  fun Indonesia : Ind (both Country Nation);
-
-  fun Iran : Ind (both Country Nation);
-
-  fun Iraq : Ind (both Country Nation);
-
-  fun Ireland : Ind (both Country EuropeanNation);
-
   fun Islands_Aland : Ind Island ;
 
   fun Islands_Alderney : Ind Island ;
@@ -9872,26 +9706,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Islands_Zakinthos : Ind Island ;
 
-  fun Israel : Ind (both Country Nation);
-
-  fun Italy : Ind (both Country EuropeanNation);
-
-  fun Jamaica : Ind (both Country Nation);
-
-  fun Japan : Ind (both Country (both Nation Island)) ;
-
-  fun Jordan : Ind (both Country Nation);
-
-  fun Kazakstan : Ind Country ;
-
-  fun Kenya : Ind (both Country Nation);
-
-  fun Kiribati : Ind (both Country Nation);
-
-  fun Kuwait : Ind (both Country Nation);
-
-  fun Kyrgyzstan : Ind (both Country Nation);
-
   fun Lakes_Arresee : Ind Lake ;
 
   fun Lakes_BarragedeMbakaou : Ind Lake ;
@@ -10076,56 +9890,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Lakes_Vaettern : Ind Lake ;
 
-  fun Laos : Ind (both Country Nation);
-
-  fun Latvia : Ind (both Country Nation);
-
-  fun Lebanon : Ind (both Country Nation);
-
-  fun Lesotho : Ind (both Country Nation);
-
-  fun Liberia : Ind (both Country Nation);
-
-  fun Libya : Ind (both Country Nation);
-
-  fun Liechtenstein : Ind (both Country Nation);
-
-  fun Lithuania : Ind (both Country Nation);
-
-  fun Luxembourg : Ind (both Country Nation);
-
-  fun Macedonia : Ind (both Country Nation);
-
-  fun Madagascar : Ind (both Country Nation);
-
-  fun Malawi : Ind (both Country Nation);
-
-  fun Malaysia : Ind (both Country Nation);
-
-  fun Maldives : Ind (both Country Nation);
-
-  fun Mali : Ind (both Country Nation);
-
-  fun Malta : Ind (both Country EuropeanNation);
-
-  fun MarshallIslands : Ind (both Country Nation);
-
-  fun Mauritania : Ind (both Country Nation);
-
-  fun Mauritius : Ind (both Country Nation);
-
-  fun Mexico : Ind (both Country Nation);
-
-  fun Micronesia : Ind (both Country Nation);
-
-  fun Moldova : Ind (both Country Nation);
-
-  fun Monaco : Ind (both Country EuropeanNation);
-
-  fun Mongolia : Ind (both Country Nation);
-
-  fun Morocco : Ind (both Country Nation);
-
   fun Mountains_Aconcagua : Ind Mountain ;
 
   fun Mountains_Bjelucha : Ind Mountain ;
@@ -10302,32 +10066,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Mountains_Zugspitze : Ind Mountain ;
 
-  fun Mozambique : Ind (both Country Nation);
-
-  fun Namibia : Ind (both Country Nation);
-
-  fun Nauru : Ind (both Country Nation);
-
-  fun Nepal : Ind (both Country Nation);
-
-  fun Netherlands : Ind (both Country EuropeanNation);
-
-  fun NewCaledonia : Ind (both Country (both LandArea DependencyOrSpecialSovereigntyArea)) ;
-
-  fun NewZealand : Ind (both Country Nation);
-
-  fun Nicaragua : Ind (both Country Nation);
-
-  fun Niger : Ind (both Country Nation);
-
-  fun Nigeria : Ind (both Country Nation);
-
-  fun NorthKorea : Ind (both Country Nation);
-
-  fun Norway : Ind (both Country EuropeanNation);
-
-  fun Oman : Ind (both Country Nation);
-
   fun Organizations_ABEDA : Ind Organization ;
 
   fun Organizations_ACC : Ind Organization ;
@@ -10664,29 +10402,9 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Organizations_ZC : Ind Organization ;
 
-  fun Pakistan : Ind (both Country Nation);
-
-  fun Palau : Ind (both Country Nation);
-
-  fun Panama : Ind (both Country Nation);
-
-  fun PapuaNewGuinea : Ind (both Country Nation);
-
-  fun Paraguay : Ind (both Country Nation);
-
-  fun Peru : Ind (both Country Nation);
-
-  fun Philippines : Ind (both Country Nation);
-
-  fun Poland : Ind (both Country EuropeanNation);
-
-  fun Portugal : Ind (both Country EuropeanNation);
-
   fun Province : Class ;
   fun Province_Class : SubClass Province StateOrProvince ;
 
-  fun Qatar : Ind (both Country Nation);
-
   fun Rivers_Ajan_Jurjach : Ind River ;
 
   fun Rivers_Amazonas : Ind River ;
@@ -10957,27 +10675,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Rivers_Zambezi : Ind River ;
 
-  fun Romania : Ind (both Country Nation);
-
-  fun Russia : Ind (both Country Nation);
-
-  fun Rwanda : Ind (both Country Nation);
-
-  -- The nation of SaintKittsAndNevis
-  fun SaintKittsAndNevis : Ind (both Country Nation);
-
-  fun SaintLucia : Ind (both Country Nation);
-
-  -- The nation of SaintVincentAndTheGrenadines.
-  fun SaintVincentAndTheGrenadines : Ind (both Country Nation);
-
-  fun SanMarino : Ind (both Country EuropeanNation);
-
-  -- The nation of SaoTomeAndPrincipe.
-  fun SaoTomeAndPrincipe : Ind (both Country Nation);
-
-  fun SaudiArabia : Ind (both Country Nation);
-
   fun Seas_ArabianSea : Ind Sea ;
 
   fun Seas_ArcticOcean : Ind Sea ;
@@ -11022,98 +10719,6 @@ abstract Mondial = MidLevelOntology, Geography, Government ** {
 
   fun Seas_YellowSea : Ind Sea ;
 
-  fun Senegal : Ind (both Country Nation);
-
-  -- The nation of SerbiaAndMontenegro.
-  fun SerbiaAndMontenegro : Ind (both Country Nation);
-
-  fun Seychelles : Ind (both Country Nation);
-
-  fun SierraLeone : Ind (both Country Nation);
-
-  fun Singapore : Ind (both Country Nation);
-
-  fun Slovakia : Ind (both Country Nation);
-
-  fun Slovenia : Ind (both Country Nation);
-
-  fun SolomonIslands : Ind (both Country Nation);
-
-  fun Somalia : Ind (both Country Nation);
-
-  fun SouthAfrica : Ind (both Country Nation);
-
-  fun SouthKorea : Ind (both Country Nation);
-
-  fun Spain : Ind (both Country EuropeanNation);
-
-  fun SriLanka : Ind (both Country Nation);
-
-  fun Sudan : Ind (both Country Nation);
-
-  fun Suriname : Ind (both Country Nation);
-
-  fun Swaziland : Ind (both Country Nation);
-
-  fun Sweden : Ind (both Country EuropeanNation);
-
-  fun Switzerland : Ind (both Country EuropeanNation);
-
-  fun Syria : Ind (both Country Nation);
-
-  fun Taiwan : Ind (both Country Nation);
-
-  fun Tajikistan : Ind (both Country Nation);
-
-  fun Tanzania : Ind (both Country Nation);
-
-  fun Thailand : Ind (both Country Nation);
-
-  fun Togo : Ind (both Country Nation);
-
-  fun Tonga : Ind (both Country Nation);
-
-  -- The nation of TrinidadAndTobago.
-  fun TrinidadAndTobago : Ind (both Country Nation);
-
-  fun Tunisia : Ind (both Country Nation);
-
-  fun Turkey : Ind (both Country Nation);
-
-  fun Turkmenistan : Ind (both Country Nation);
-
-  fun Tuvalu : Ind (both Country Nation);
-
-  fun Uganda : Ind (both Country Nation);
-
-  fun Ukraine : Ind (both Country Nation);
-
-  fun UnitedArabEmirates : Ind (both Country EuropeanNation);
-
-  fun UnitedKingdom : Ind (both Country Nation);
-
-  fun UnitedStates : Ind (both Country Nation);
-
-  fun Uruguay : Ind (both Country Nation);
-
-  fun Uzbekistan : Ind (both Country Nation);
-
-  fun Vanuatu : Ind (both Country Nation);
-
-  fun Venezuela : Ind (both Country Nation);
-
-  fun Vietnam : Ind (both Country Nation);
-
-  fun WesternSahara : Ind (both Country (both Nation GeopoliticalArea)) ;
-
-  fun WesternSamoa : Ind Country ;
-
-  fun Yemen : Ind (both Country Nation);
-
-  fun Zaire : Ind Country ;
-
-  fun Zambia : Ind (both Country Nation);
-
   fun flowsInto : El River -> El Sea -> Formula ;
 
   fun geographicalSubregion : El City -> El Province -> Formula ;

examples/SUMO/MondialRon.gf

@@ -1,195 +0,0 @@
-concrete MondialRon of Mondial = MidLevelOntologyRon ** open ParadigmsRon,NounRon  in {
-
-flags
-  coding = utf8 ;
-  
-lin
-  Andorra = UsePN (mkPN "Andorra" | mkPN "Andora") ;
-  UnitedArabEmirates = UsePN (mkPN "Emiratele Arabe Unite") ;
-  Afghanistan = UsePN (mkPN "Afghanistan" | mkPN "Afganistan") ;
-  AntiguaAndBarbuda = UsePN (mkPN "Antigua şi Barbuda") ;
-  Albania = UsePN (mkPN "Albania") ;
-  Armenia = UsePN (mkPN "Armenia") ;
-  Angola = UsePN (mkPN "Angola") ;
-  Argentina = UsePN (mkPN "Argentina") ;
-  Austria = UsePN (mkPN "Austria") ;
-  Australia = UsePN (mkPN "Australia") ;
-  Azerbaijan = UsePN (mkPN "Azerbaijan" | mkPN "Azerbaidjan") ;
-  BosniaAndHerzegovina = UsePN (mkPN "Bosnia şi Herzegovina" | mkPN "Bosnia şi Herţegovina") ;
-  Barbados = UsePN (mkPN "Barbados") ;
-  Bangladesh = UsePN (mkPN "Bangladeş" | mkPN "Bangladesh") ;
-  Belgium = UsePN (mkPN "Belgia") ;
-  BurkinaFaso = UsePN (mkPN "Burkina Fasso" | mkPN "Burkina Faso") ;
-  Bulgaria = UsePN (mkPN "Bulgaria") ;
-  Bahrain = UsePN (mkPN "Bahrain") ;
-  Burundi = UsePN (mkPN "Burundi") ;
-  Benin = UsePN (mkPN "Benin") ;
-  Brunei = UsePN (mkPN "Brunei") ;
-  Bolivia = UsePN (mkPN "Bolivia") ;
-  Brazil = UsePN (mkPN "Brazilia") ;
-  Bahamas = UsePN (mkPN "Bahamas") ;
-  Bhutan = UsePN (mkPN "Bhutan") ;
-  Botswana = UsePN (mkPN "Botswana") ;
-  Belarus = UsePN (mkPN "Belarus" | mkPN "Bielorusia") ;
-  Belize = UsePN (mkPN "Belize") ;
-  Canada = UsePN (mkPN "Canada") ;
-  CentralAfricanRepublic = UsePN (mkPN "Republica Central Africană" | mkPN "Republica Centrafricană") ;
-  Congo = UsePN (mkPN "Republica Congo" | mkPN "Congo") ;
-  Switzerland = UsePN (mkPN "Elveţia" | mkPN "Eleveţia") ;
-  Chile = UsePN (mkPN "Chile") ;
-  Cameroon = UsePN (mkPN "Camerun") ;
-  China = UsePN (mkPN "Republica Populară Chineză" | mkPN "China") ;
-  Colombia = UsePN (mkPN "Columbia") ;
-  CostaRica = UsePN (mkPN "Costa Rica") ;
-  Cuba = UsePN (mkPN "Cuba") ;
-  CapeVerde = UsePN (mkPN "Capul Verde") ;
-  Cyprus = UsePN (mkPN "Cipru") ;
-  CzechRepublic = UsePN (mkPN "Republica Cehă" | mkPN "Cehia") ;
-  Germany = UsePN (mkPN "Germania") ;
-  Djibouti = UsePN (mkPN "Djibouti") ;
-  Denmark = UsePN (mkPN "Danemarca") ;
-  Dominica = UsePN (mkPN "Dominica") ;
-  DominicanRepublic = UsePN (mkPN "Republica Dominicană") ;
-  Algeria = UsePN (mkPN "Algeria") ;
-  Ecuador = UsePN (mkPN "Ecuador") ;
-  Estonia = UsePN (mkPN "Estonia") ;
-  Egypt = UsePN (mkPN "Egipt") ;
-  WesternSahara = UsePN (mkPN "Sahara de Vest") ;
-  Eritrea = UsePN (mkPN "Eritreea" | mkPN "Eritrea") ;
-  Spain = UsePN (mkPN "Spania") ;
-  Ethiopia = UsePN (mkPN "Etiopia") ;
-  Finland = UsePN (mkPN "Finlanda") ;
-  Fiji = UsePN (mkPN "Fiji") ;
-  Micronesia = UsePN (mkPN "Micronezia, Republica Federală") ;
-  France = UsePN (mkPN "Franţa") ;
-  Gabon = UsePN (mkPN "Gabon") ;
-  UnitedKingdom = UsePN (mkPN "Regatul Unit" | mkPN "Marea Britanie") ;
-  Grenada = UsePN (mkPN "Grenada") ;
-  Georgia = UsePN (mkPN "Georgia") ;
-  FrenchGuiana = UsePN (mkPN "Guiana Franceză") ;
-  Ghana = UsePN (mkPN "Ghana") ;
-  Gambia = UsePN (mkPN "Gambia") ;
-  Guinea = UsePN (mkPN "Guinea" | mkPN "Guineea") ;
-  EquatorialGuinea = UsePN (mkPN "Guineea Ecuatorială") ;
-  Greece = UsePN (mkPN "Grecia") ;
-  Guatemala = UsePN (mkPN "Guatemala") ;
-  Guyana = UsePN (mkPN "Guiana" | mkPN "Guyana") ;
-  Honduras = UsePN (mkPN "Honduras") ;
-  Croatia = UsePN (mkPN "Croaţia") ;
-  Haiti = UsePN (mkPN "Haiti") ;
-  Hungary = UsePN (mkPN "Ungaria") ;
-  Indonesia = UsePN (mkPN "Indonezia") ;
-  Ireland = UsePN (mkPN "Republica Irlanda" | mkPN "Irlanda") ;
-  Israel = UsePN (mkPN "Israel") ;
-  India = UsePN (mkPN "India") ;
-  Iraq = UsePN (mkPN "Irak" | mkPN "Iraq") ;
-  Iran = UsePN (mkPN "Iran (Republica islamică)" | mkPN "Iran") ;
-  Iceland = UsePN (mkPN "Islanda") ;
-  Italy = UsePN (mkPN "Italia") ;
-  Jamaica = UsePN (mkPN "Jamaica") ;
-  Jordan = UsePN (mkPN "Iordania") ;
-  Japan = UsePN (mkPN "Japonia") ;
-  Kenya = UsePN (mkPN "Kenya") ;
-  Kyrgyzstan = UsePN (mkPN "Kârgâzstan" | mkPN "Kirghizia") ;
-  Cambodia = UsePN (mkPN "Cambodgia") ;
-  Kiribati = UsePN (mkPN "Kiribati") ;
-  Comoros = UsePN (mkPN "Comore" | mkPN "Comoros") ;
-  NorthKorea = UsePN (mkPN "Coreea de Nord") ;
-  SouthKorea = UsePN (mkPN "Coreea de Sud") ;
-  Kuwait = UsePN (mkPN "Kuweit") ;
-  Laos = UsePN (mkPN "Lao, Republica Democratică Populară" | mkPN "Laos") ;
-  Lebanon = UsePN (mkPN "Liban") ;
-  SaintLucia = UsePN (mkPN "Saint Lucia") ;
-  Liechtenstein = UsePN (mkPN "Liechtenstein") ;
-  SriLanka = UsePN (mkPN "Sri Lanka") ;
-  Liberia = UsePN (mkPN "Liberia") ;
-  Lesotho = UsePN (mkPN "Lesotho") ;
-  Lithuania = UsePN (mkPN "Lituania") ;
-  Luxembourg = UsePN (mkPN "Luxemburg") ;
-  Latvia = UsePN (mkPN "Letonia") ;
-  Libya = UsePN (mkPN "Libia, Jamahiriya Arabă" | mkPN "Libia") ;
-  Morocco = UsePN (mkPN "Maroc") ;
-  Monaco = UsePN (mkPN "Monaco") ;
-  Moldova = UsePN (mkPN "Moldova, Republica" | mkPN "Republica Moldova") ;
-  Madagascar = UsePN (mkPN "Madagascar") ;
-  MarshallIslands = UsePN (mkPN "Insulele Marshall") ;
-  Macedonia = UsePN (mkPN "Fosta Republică Iugoslavă Macedonia" | mkPN "Republica Macedonia" | mkPN "Macedonia") ;
-  Mali = UsePN (mkPN "Mali") ;
-  Mongolia = UsePN (mkPN "Mongolia") ;
-  Mauritania = UsePN (mkPN "Mauritania") ;
-  Malta = UsePN (mkPN "Insula Malta" | mkPN "Malta") ;
-  Mauritius = UsePN (mkPN "Mauriţius" | mkPN "Mauritius") ;
-  Maldives = UsePN (mkPN "Maldive") ;
-  Malawi = UsePN (mkPN "Malawi") ;
-  Mexico = UsePN (mkPN "Mexic") ;
-  Malaysia = UsePN (mkPN "Malaiezia" | mkPN "Malaysia" | mkPN "Malaezia") ;
-  Mozambique = UsePN (mkPN "Mozambic") ;
-  Namibia = UsePN (mkPN "Namibia") ;
-  NewCaledonia = UsePN (mkPN "Noua Caledonie") ;
-  Niger = UsePN (mkPN "Niger") ;
-  Nigeria = UsePN (mkPN "Nigeria") ;
-  Nicaragua = UsePN (mkPN "Nicaragua") ;
-  Netherlands = UsePN (mkPN "Ţările de Jos" | mkPN "Olanda") ;
-  Norway = UsePN (mkPN "Norvegia") ;
-  Nepal = UsePN (mkPN "Nepal") ;
-  Nauru = UsePN (mkPN "Nauru") ;
-  NewZealand = UsePN (mkPN "Noua Zeelandă") ;
-  Oman = UsePN (mkPN "Oman") ;
-  Panama = UsePN (mkPN "Panama") ;
-  Peru = UsePN (mkPN "Peru") ;
-  PapuaNewGuinea = UsePN (mkPN "Papua Noua Guinee") ;
-  Philippines = UsePN (mkPN "Filipine") ;
-  Pakistan = UsePN (mkPN "Pakistan") ;
-  Poland = UsePN (mkPN "Polonia") ;
-  Portugal = UsePN (mkPN "Portugalia") ;
-  Palau = UsePN (mkPN "Palau") ;
-  Paraguay = UsePN (mkPN "Paraguay") ;
-  Qatar = UsePN (mkPN "Qatar") ;
-  Romania = UsePN (mkPN "România") ;
-  Russia = UsePN (mkPN "Federația Rusă" | mkPN "Rusia") ;
-  Rwanda = UsePN (mkPN "Ruanda" | mkPN "Rwanda") ;
-  SaintKittsAndNevis = UsePN (mkPN "Sain Kitts şi Nevis" | mkPN "Saint Kitts şi Nevis" | mkPN "Sfântul Kitts şi Nevis") ;
-  SaintVincentAndTheGrenadines = UsePN (mkPN "Sfântul Vincenţiu şi Grenadine" | mkPN "Saint Vincent şi Grenadines" | mkPN "Sfântul Vincent şi Grenadine") ;
-  SaudiArabia = UsePN (mkPN "Arabia Saudită") ;
-  SaoTomeAndPrincipe = UsePN (mkPN "São Tomé şi Príncipe" | mkPN "Sao Tome şi Principe") ;
-  SolomonIslands = UsePN (mkPN "Insulele Solomon") ;
-  Seychelles = UsePN (mkPN "Seychelles") ;
-  Sudan = UsePN (mkPN "Sudan") ;
-  Sweden = UsePN (mkPN "Suedia") ;
-  Singapore = UsePN (mkPN "Singapore") ;
-  Slovenia = UsePN (mkPN "Slovenia") ;
-  Slovakia = UsePN (mkPN "Slovacia") ;
-  SierraLeone = UsePN (mkPN "Sierra Leone") ;
-  SanMarino = UsePN (mkPN "San Marino") ;
-  Senegal = UsePN (mkPN "Senegal") ;
-  Somalia = UsePN (mkPN "Somalia") ;
-  Suriname = UsePN (mkPN "Surinam") ;
-  ElSalvador = UsePN (mkPN "El Salvador") ;
-  Syria = UsePN (mkPN "Siria") ;
-  Swaziland = UsePN (mkPN "Swaziland") ;
-  Chad = UsePN (mkPN "Ciad") ;
-  Togo = UsePN (mkPN "Togo") ;
-  Thailand = UsePN (mkPN "Thailanda" | mkPN "Tailanda") ;
-  Tajikistan = UsePN (mkPN "Tajikistan" | mkPN "Tadjikistan") ;
-  Turkmenistan = UsePN (mkPN "Turkmenia" | mkPN "Turkmenistan") ;
-  Tunisia = UsePN (mkPN "Tunisia") ;
-  Tonga = UsePN (mkPN "Tonga") ;
-  Turkey = UsePN (mkPN "Turcia") ;
-  Tuvalu = UsePN (mkPN "Tuvalu") ;
-  Taiwan = UsePN (mkPN "Taiwan") ;
-  Tanzania = UsePN (mkPN "Tanzania") ;
-  Ukraine = UsePN (mkPN "Ucraina") ;
-  Uganda = UsePN (mkPN "Uganda") ;
-  UnitedStates = UsePN (mkPN "Statele Unite" | mkPN "Statele Unite ale Americii") ;
-  Uruguay = UsePN (mkPN "Uruguay") ;
-  Uzbekistan = UsePN (mkPN "Uzbekistan") ;
-  Venezuela = UsePN (mkPN "Venezuela") ;
-  Vietnam = UsePN (mkPN "Vietnam") ;
-  Vanuatu = UsePN (mkPN "Vanuatu") ;
-  Yemen = UsePN (mkPN "Yemen") ;
-  SouthAfrica = UsePN (mkPN "Africa de Sud") ;
-  Zambia = UsePN (mkPN "Zambia") ;
-  SerbiaAndMontenegro = UsePN (mkPN "Serbia şi Muntenegru") ;
-  TrinidadAndTobago = UsePN (mkPN "Trinidad şi Tobago" | mkPN "Trinidad-Tobago") ;
-
-}

examples/SUMO/SUMORon.gf

@@ -5,7 +5,6 @@ concrete SUMORon of SUMO =
         MidLevelOntologyRon,
         EconomyRon,
         EngineeringRon,
-        MondialRon,
         CountriesAndRegionsRon,
         QoSontologyRon