From 08e27cd56e58606ba61332df32fde00c0a12fabc Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 18 Jun 2014 09:27:57 +0000 Subject: [PATCH] moved Names to Construction, to make the structure simpler ; use months and weeks as PN's as well --- lib/src/abstract/Construction.gf | 65 +++++++++++++++++++++++++ lib/src/chinese/ConstructionChi.gf | 64 +++++++++++++++++++++++++ lib/src/english/ConstructionEng.gf | 67 ++++++++++++++++++++++++++ lib/src/finnish/ConstructionFin.gf | 71 ++++++++++++++++++++++++++++ lib/src/french/ConstructionFre.gf | 66 +++++++++++++++++++++++++- lib/src/french/ParadigmsFre.gf | 6 ++- lib/src/german/ConstructionGer.gf | 65 +++++++++++++++++++++++++ lib/src/german/ParadigmsGer.gf | 8 +++- lib/src/swedish/ConstructionSwe.gf | 66 ++++++++++++++++++++++++++ lib/src/swedish/ParadigmsSwe.gf | 3 ++ lib/src/translator/Names.gf | 61 ------------------------ lib/src/translator/NamesChi.gf | 64 ------------------------- lib/src/translator/NamesEng.gf | 65 ------------------------- lib/src/translator/NamesFin.gf | 76 ------------------------------ lib/src/translator/NamesFre.gf | 66 -------------------------- lib/src/translator/NamesGer.gf | 66 -------------------------- lib/src/translator/NamesSwe.gf | 66 -------------------------- lib/src/translator/Translate.gf | 1 - lib/src/translator/TranslateChi.gf | 1 - lib/src/translator/TranslateEng.gf | 1 - lib/src/translator/TranslateFin.gf | 1 - lib/src/translator/TranslateFre.gf | 1 - lib/src/translator/TranslateGer.gf | 1 - lib/src/translator/TranslateSwe.gf | 1 - 24 files changed, 477 insertions(+), 475 deletions(-) delete mode 100644 lib/src/translator/Names.gf delete mode 100644 lib/src/translator/NamesChi.gf delete mode 100644 lib/src/translator/NamesEng.gf delete mode 100644 lib/src/translator/NamesFin.gf delete mode 100644 lib/src/translator/NamesFre.gf delete mode 100644 lib/src/translator/NamesGer.gf delete mode 100644 lib/src/translator/NamesSwe.gf diff --git a/lib/src/abstract/Construction.gf b/lib/src/abstract/Construction.gf index 10b85da48..4ae91f231 100644 --- a/lib/src/abstract/Construction.gf +++ b/lib/src/abstract/Construction.gf @@ -94,6 +94,71 @@ fun weekdayN : Weekday -> N ; monthN : Month -> N ; + + weekdayPN : Weekday -> PN ; + monthPN : Month -> PN ; + languagePN : Language -> PN ; +---------------------------------------------- +---- lexicon of special names + +fun monday_Weekday : Weekday ; +fun tuesday_Weekday : Weekday ; +fun wednesday_Weekday : Weekday ; +fun thursday_Weekday : Weekday ; +fun friday_Weekday : Weekday ; +fun saturday_Weekday : Weekday ; +fun sunday_Weekday : Weekday ; + +fun january_Month : Month ; +fun february_Month : Month ; +fun march_Month : Month ; +fun april_Month : Month ; +fun may_Month : Month ; +fun june_Month : Month ; +fun july_Month : Month ; +fun august_Month : Month ; +fun september_Month : Month ; +fun october_Month : Month ; +fun november_Month : Month ; +fun december_Month : Month ; + + +fun afrikaans_Language : Language ; +fun amharic_Language : Language ; +fun arabic_Language : Language ; +fun bulgarian_Language : Language ; +fun catalan_Language : Language ; +fun chinese_Language : Language ; +fun danish_Language : Language ; +fun dutch_Language : Language ; +fun english_Language : Language ; +fun estonian_Language : Language ; +fun finnish_Language : Language ; +fun french_Language : Language ; +fun german_Language : Language ; +fun greek_Language : Language ; +fun hebrew_Language : Language ; +fun hindi_Language : Language ; +fun japanese_Language : Language ; +fun italian_Language : Language ; +fun latin_Language : Language ; +fun latvian_Language : Language ; +fun maltese_Language : Language ; +fun nepali_Language : Language ; +fun norwegian_Language : Language ; +fun persian_Language : Language ; +fun polish_Language : Language ; +fun punjabi_Language : Language ; +fun romanian_Language : Language ; +fun russian_Language : Language ; +fun sindhi_Language : Language ; +fun spanish_Language : Language ; +fun swahili_Language : Language ; +fun swedish_Language : Language ; +fun thai_Language : Language ; +fun turkish_Language : Language ; +fun urdu_Language : Language ; + } diff --git a/lib/src/chinese/ConstructionChi.gf b/lib/src/chinese/ConstructionChi.gf index f2d3c7ac3..fc87c1364 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -48,9 +48,73 @@ lincat Language = PN ; lin InLanguage l = SyntaxChi.mkAdv (mkPrep "在") (mkNP l) ; +oper mkLanguage : Str -> PN = \s -> mkPN s ; + lin weekdayN w = w ; monthN m = m ; + + weekdayPN w = ss w.s ; + monthPN m = ss m.s ; + languagePN l = l ; +lin monday_Weekday = mkN "星期一" ; +lin tuesday_Weekday = mkN "星期二" ; +lin wednesday_Weekday = mkN "星期三" ; +lin thursday_Weekday = mkN "星期四" ; +lin friday_Weekday = mkN "星期五" ; +lin saturday_Weekday = mkN "星期六" ; +lin sunday_Weekday = mkN "星期日" ; + +lin january_Month = mkN "一月" ; +lin february_Month = mkN "二月" ; +lin march_Month = mkN "三月" ; +lin april_Month = mkN "四月" ; +lin may_Month = mkN "五月" ; +lin june_Month = mkN "六月" ; +lin july_Month = mkN "七月" ; +lin august_Month = mkN "八月t" ; +lin september_Month = mkN "九月" ; +lin october_Month = mkN "十月" ; +lin november_Month = mkN "十一月" ; +lin december_Month = mkN "十二月" ; + +lin afrikaans_Language = mkLanguage "南非語" ; +lin amharic_Language = mkLanguage "阿姆哈拉语" ; +lin arabic_Language = mkLanguage "阿拉伯语" ; +lin bulgarian_Language = mkLanguage "保加利亚语" ; +--lin catalan_Language = mkLanguage "Catalan" ; +lin chinese_Language = mkLanguage "中文" ; +--lin danish_Language = mkLanguage "Danish" ; +lin dutch_Language = mkLanguage "荷蘭語" ; +lin english_Language = mkLanguage "英语" ; +--lin estonian_Language = mkLanguage "Estonian" ; +lin finnish_Language = mkLanguage "芬兰语" ; +lin french_Language = mkLanguage "法语" ; +lin german_Language = mkLanguage "德语" ; +--lin greek_Language = mkLanguage "Greek" ; +--lin hebrew_Language = mkLanguage "Hebrew" ; +lin hindi_Language = mkLanguage "印地语" ; +lin japanese_Language = mkLanguage "日语" ; +lin italian_Language = mkLanguage "意大利语" ; +--lin latin_Language = mkLanguage "Latin" ; +--lin latvian_Language = mkLanguage "Latvian" ; +--lin maltese_Language = mkLanguage "Maltese" ; +--lin nepali_Language = mkLanguage "Nepali" ; +--lin norwegian_Language = mkLanguage "Norwegian" ; +--lin persian_Language = mkLanguage "Persian" ; +--lin polish_Language = mkLanguage "Polish" ; +--lin punjabi_Language = mkLanguage "Punjabi" ; +--lin romanian_Language = mkLanguage "罗马尼亚" ; +lin russian_Language = mkLanguage "俄语" ; +--lin sindhi_Language = mkLanguage "Sindhi" ; +lin spanish_Language = mkLanguage "西班牙语" ; +--lin swahili_Language = mkLanguage "Swahili" ; +lin swedish_Language = mkLanguage "瑞典文" ; +--lin thai_Language = mkLanguage "Thai" ; +--lin turkish_Language = mkLanguage "Turkish" ; +--lin urdu_Language = mkLanguage "Urdu" ; + + } diff --git a/lib/src/english/ConstructionEng.gf b/lib/src/english/ConstructionEng.gf index b95eb4a5c..9e9d211cf 100644 --- a/lib/src/english/ConstructionEng.gf +++ b/lib/src/english/ConstructionEng.gf @@ -76,6 +76,73 @@ lin InLanguage l = SyntaxEng.mkAdv in_Prep (mkNP l) ; lin weekdayN w = w ; monthN m = m ; + + weekdayPN w = mkPN w ; + monthPN m = mkPN m ; + languagePN l = l ; +oper mkLanguage : Str -> PN = \s -> mkPN s ; + +---------------------------------------------- +---- lexicon of special names + +lin monday_Weekday = mkN "Monday" ; +lin tuesday_Weekday = mkN "Tuesday" ; +lin wednesday_Weekday = mkN "Wednesday" ; +lin thursday_Weekday = mkN "Thursday" ; +lin friday_Weekday = mkN "Friday" ; +lin saturday_Weekday = mkN "Saturday" ; +lin sunday_Weekday = mkN "Sunday" ; + +lin january_Month = mkN "January" ; +lin february_Month = mkN "February" ; +lin march_Month = mkN "March" ; +lin april_Month = mkN "April" ; +lin may_Month = mkN "May" ; +lin june_Month = mkN "June" ; +lin july_Month = mkN "July" ; +lin august_Month = mkN "August" ; +lin september_Month = mkN "September" ; +lin october_Month = mkN "October" ; +lin november_Month = mkN "November" ; +lin december_Month = mkN "December" ; + +lin afrikaans_Language = mkLanguage "Afrikaans" ; +lin amharic_Language = mkLanguage "Amharic" ; +lin arabic_Language = mkLanguage "Arabic" ; +lin bulgarian_Language = mkLanguage "Bulgarian" ; +lin catalan_Language = mkLanguage "Catalan" ; +lin chinese_Language = mkLanguage "Chinese" ; +lin danish_Language = mkLanguage "Danish" ; +lin dutch_Language = mkLanguage "Dutch" ; +lin english_Language = mkLanguage "English" ; +lin estonian_Language = mkLanguage "Estonian" ; +lin finnish_Language = mkLanguage "Finnish" ; +lin french_Language = mkLanguage "French" ; +lin german_Language = mkLanguage "German" ; +lin greek_Language = mkLanguage "Greek" ; +lin hebrew_Language = mkLanguage "Hebrew" ; +lin hindi_Language = mkLanguage "Hindi" ; +lin japanese_Language = mkLanguage "Japanese" ; +lin italian_Language = mkLanguage "Italian" ; +lin latin_Language = mkLanguage "Latin" ; +lin latvian_Language = mkLanguage "Latvian" ; +lin maltese_Language = mkLanguage "Maltese" ; +lin nepali_Language = mkLanguage "Nepali" ; +lin norwegian_Language = mkLanguage "Norwegian" ; +lin persian_Language = mkLanguage "Persian" ; +lin polish_Language = mkLanguage "Polish" ; +lin punjabi_Language = mkLanguage "Punjabi" ; +lin romanian_Language = mkLanguage "Romanian" ; +lin russian_Language = mkLanguage "Russian" ; +lin sindhi_Language = mkLanguage "Sindhi" ; +lin spanish_Language = mkLanguage "Spanish" ; +lin swahili_Language = mkLanguage "Swahili" ; +lin swedish_Language = mkLanguage "Swedish" ; +lin thai_Language = mkLanguage "Thai" ; +lin turkish_Language = mkLanguage "Turkish" ; +lin urdu_Language = mkLanguage "Urdu" ; + + } diff --git a/lib/src/finnish/ConstructionFin.gf b/lib/src/finnish/ConstructionFin.gf index cab5761c6..629e0dddb 100644 --- a/lib/src/finnish/ConstructionFin.gf +++ b/lib/src/finnish/ConstructionFin.gf @@ -74,5 +74,76 @@ lin monthN m = m ; languagePN l = l ; +--------------- lexicon of special names + +oper mkLanguage : Str -> PN = \s -> mkPN s ; + +oper mkWeekday : Str -> Weekday = \d -> + lin Weekday { + noun = mkN d ; + habitual = case d of { + _ + "i" => ParadigmsFin.mkAdv (d + "sin") ; -- tiistaisin + _ => ParadigmsFin.mkAdv (d + "isin") -- keskiviikkoisin + } + } ; + + +lin monday_Weekday = mkWeekday "maanantai" ; +lin tuesday_Weekday = mkWeekday "tiistai" ; +lin wednesday_Weekday = mkWeekday "keskiviikko" ; +lin thursday_Weekday = mkWeekday "torstai" ; +lin friday_Weekday = mkWeekday "perjantai" ; +lin saturday_Weekday = mkWeekday"lauantai" ; +lin sunday_Weekday = mkWeekday "sunnuntai" ; + +lin january_Month = mkN "tammikuu" ; +lin february_Month = mkN "helmikuu" ; +lin march_Month = mkN "maaliskuu" ; +lin april_Month = mkN "huhtikuu" ; +lin may_Month = mkN "toukokuu" ; +lin june_Month = mkN "kesäkuu" ; +lin july_Month = mkN "heinäkuu" ; +lin august_Month = mkN "elokuu" ; +lin september_Month = mkN "syyskuu" ; +lin october_Month = mkN "lokakuu" ; +lin november_Month = mkN "marraskuu" ; +lin december_Month = mkN "joulukuu" ; + +lin afrikaans_Language = mkLanguage "afrikaans" ; +lin amharic_Language = mkLanguage "amhara" ; +lin arabic_Language = mkLanguage "arabia" ; +lin bulgarian_Language = mkLanguage "bulgaria" ; +lin catalan_Language = mkLanguage "katalaani" ; +lin chinese_Language = mkLanguage "kiina" ; +lin danish_Language = mkLanguage "tanska" ; +lin dutch_Language = mkLanguage "hollanti" ; +lin english_Language = mkLanguage "englanti" ; +lin estonian_Language = mkLanguage "viro" ; +lin finnish_Language = mkPN (mkN "suomi" "suomia") ; +lin french_Language = mkLanguage "ranska" ; +lin german_Language = mkLanguage "saksa" ; +lin greek_Language = mkLanguage "kreikka" ; +lin hebrew_Language = mkLanguage "heprea" ; +lin hindi_Language = mkLanguage "hindi" ; +lin japanese_Language = mkLanguage "japani" ; +lin italian_Language = mkLanguage "italia" ; +lin latin_Language = mkLanguage "latina" ; +lin latvian_Language = mkLanguage "latvia" ; +lin maltese_Language = mkLanguage "malta" ; +lin nepali_Language = mkLanguage "nepali" ; +lin norwegian_Language = mkLanguage "norja" ; +lin persian_Language = mkLanguage "persia" ; +lin polish_Language = mkLanguage "puola" ; +lin punjabi_Language = mkLanguage "punjabi" ; +lin romanian_Language = mkLanguage "romania" ; +lin russian_Language = mkLanguage "venäjä" ; +lin sindhi_Language = mkLanguage "sindhi" ; +lin spanish_Language = mkLanguage "espanja" ; +lin swahili_Language = mkLanguage "swahili" ; +lin swedish_Language = mkLanguage "ruotsi" ; +lin thai_Language = mkLanguage "thai" ; +lin turkish_Language = mkLanguage "turkki" ; +lin urdu_Language = mkLanguage "urdu" ; + } diff --git a/lib/src/french/ConstructionFre.gf b/lib/src/french/ConstructionFre.gf index e288b223b..c3cfb7971 100644 --- a/lib/src/french/ConstructionFre.gf +++ b/lib/src/french/ConstructionFre.gf @@ -75,8 +75,72 @@ lin InLanguage l = SyntaxFre.mkAdv (mkPrep "en") (mkNP l) ; lin weekdayN w = w ; - monthN m = m ; + + weekdayPN w = mkPN w ; + monthPN m = mkPN m ; + languagePN l = l ; +oper mkLanguage : Str -> PN = \s -> mkPN s ; + +---------------------------------------------- +---- lexicon of special names + +lin monday_Weekday = mkN "lundi" ; +lin tuesday_Weekday = mkN "mardi" ; +lin wednesday_Weekday = mkN "mercredi" ; +lin thursday_Weekday = mkN "jeudi" ; +lin friday_Weekday = mkN "vendredi" ; +lin saturday_Weekday = mkN "samedi" ; +lin sunday_Weekday = mkN "dimanche" masculine ; + +lin january_Month = mkN "janvier" ; +lin february_Month = mkN "février" ; +lin march_Month = mkN "mars" ; +lin april_Month = mkN "avril" ; +lin may_Month = mkN "mai" ; +lin june_Month = mkN "juin" ; +lin july_Month = mkN "juillet" ; +lin august_Month = mkN "août" ; +lin september_Month = mkN "septembre" ; +lin october_Month = mkN "octobre" ; +lin november_Month = mkN "novembre" ; +lin december_Month = mkN "décembre" ; + +lin afrikaans_Language = mkLanguage "afrikaans" ; +lin amharic_Language = mkLanguage "amharique" ; ---- +lin arabic_Language = mkLanguage "arabe" ; +lin bulgarian_Language = mkLanguage "bulgare" ; +lin catalan_Language = mkLanguage "catalan" ; +lin chinese_Language = mkLanguage "chinois" ; +lin danish_Language = mkLanguage "danois" ; +lin dutch_Language = mkLanguage "hollandais" ; +lin english_Language = mkLanguage "anglais" ; +lin estonian_Language = mkLanguage "estonien" ; +lin finnish_Language = mkLanguage "finnois" ; +lin french_Language = mkLanguage "francais" ; +lin german_Language = mkLanguage "allemand" ; +lin greek_Language = mkLanguage "grècque" ; +lin hebrew_Language = mkLanguage "hebreu" ; +lin hindi_Language = mkLanguage "hindi" ; +lin japanese_Language = mkLanguage "japonais" ; +lin italian_Language = mkLanguage "italien" ; +lin latin_Language = mkLanguage "latin" ; +lin latvian_Language = mkLanguage "letton" ; +lin maltese_Language = mkLanguage "maltais" ; +lin nepali_Language = mkLanguage "nepali" ; +lin norwegian_Language = mkLanguage "norvégien" ; +lin persian_Language = mkLanguage "persien" ; +lin polish_Language = mkLanguage "polonais" ; +lin punjabi_Language = mkLanguage "punjabi" ; +lin romanian_Language = mkLanguage "roumain" ; +lin russian_Language = mkLanguage "russe" ; +lin sindhi_Language = mkLanguage "sindhi" ; +lin spanish_Language = mkLanguage "espagnol" ; +lin swahili_Language = mkLanguage "swahili" ; +lin swedish_Language = mkLanguage "suédois" ; +lin thai_Language = mkLanguage "thaï" ; +lin turkish_Language = mkLanguage "turque" ; +lin urdu_Language = mkLanguage "urdu" ; } diff --git a/lib/src/french/ParadigmsFre.gf b/lib/src/french/ParadigmsFre.gf index 388841557..3c628a481 100644 --- a/lib/src/french/ParadigmsFre.gf +++ b/lib/src/french/ParadigmsFre.gf @@ -134,7 +134,8 @@ oper mkPN : overload { mkPN : Str -> PN ; -- feminine if ends with "e", otherwise masculine - mkPN : Str -> Gender -> PN -- gender deviant from the simple rule + mkPN : Str -> Gender -> PN ; -- gender deviant from the simple rule + mkPN : N -> PN ; -- gender inherited from noun } ; @@ -382,7 +383,8 @@ oper mkPN = overload { mkPN : Str -> PN = regPN ; - mkPN : Str -> Gender -> PN = \x,g -> {s = x ; g = g} ** {lock_PN = <>} ; + mkPN : Str -> Gender -> PN = \x,g -> lin PN {s = x ; g = g} ; + mkPN : N -> PN = \x -> lin PN {s = x.s ! Sg ; g = x.g} ; } ; mk4A a b c d = compADeg {s = \\_ => (mkAdj a c b d).s ; isPre = False ; lock_A = <>} ; diff --git a/lib/src/german/ConstructionGer.gf b/lib/src/german/ConstructionGer.gf index c7d7c5e6e..751162435 100644 --- a/lib/src/german/ConstructionGer.gf +++ b/lib/src/german/ConstructionGer.gf @@ -70,7 +70,72 @@ lin InLanguage l = SyntaxGer.mkAdv on_Prep (mkNP l) ; lin weekdayN w = w ; monthN m = m ; + + weekdayPN w = mkPN w ; + monthPN m = mkPN m ; + languagePN l = l ; +oper mkLanguage : Str -> PN = \s -> mkPN s ; + +---------------------------------------------- +---- lexicon of special names + +lin monday_Weekday = mkN "Montag" ; +lin tuesday_Weekday = mkN "Dienstag" ; +lin wednesday_Weekday = mkN "Mittwoch" ; +lin thursday_Weekday = mkN "Donnerstag" ; +lin friday_Weekday = mkN "Freitag" ; +lin saturday_Weekday = mkN "Samstag" ; +lin sunday_Weekday = mkN "Sonntag" ; + +lin january_Month = mkN "Januar" ; +lin february_Month = mkN "Februar" ; +lin march_Month = mkN "März" ; +lin april_Month = mkN "April" ; +lin may_Month = mkN "Mai" ; +lin june_Month = mkN "Juni" ; +lin july_Month = mkN "Juli" ; +lin august_Month = mkN "August" ; +lin september_Month = mkN "September" ; +lin october_Month = mkN "Oktober" ; +lin november_Month = mkN "November" ; +lin december_Month = mkN "Dezember" ; + +lin afrikaans_Language = mkLanguage "Afrikaans" ; +lin amharic_Language = mkLanguage "Amharisch" ; +lin arabic_Language = mkLanguage "Arabisch" ; +lin bulgarian_Language = mkLanguage "Bulgarisch" ; +lin catalan_Language = mkLanguage "Katalanish" ; +lin chinese_Language = mkLanguage "Chinesisch" ; +lin danish_Language = mkLanguage "Dänisch" ; +lin dutch_Language = mkLanguage "Holländisch" ; +lin english_Language = mkLanguage "Englisch" ; +lin estonian_Language = mkLanguage "Estnisch" ; +lin finnish_Language = mkLanguage "Finnisch" ; +lin french_Language = mkLanguage "Französisch" ; +lin german_Language = mkLanguage "Deutsch" ; +lin greek_Language = mkLanguage "Griechisch" ; +lin hebrew_Language = mkLanguage "Hebräisch" ; +lin hindi_Language = mkLanguage "Hindi" ; +lin japanese_Language = mkLanguage "Japanisch" ; +lin italian_Language = mkLanguage "Italienisch" ; +lin latin_Language = mkLanguage "Latein" ; +lin latvian_Language = mkLanguage "Lettisch" ; +lin maltese_Language = mkLanguage "Maltesisch" ; +lin nepali_Language = mkLanguage "Nepali" ; +lin norwegian_Language = mkLanguage "Norwegisch" ; +lin persian_Language = mkLanguage "Persisch" ; +lin polish_Language = mkLanguage "Polnisch" ; +lin punjabi_Language = mkLanguage "Punjabi" ; +lin romanian_Language = mkLanguage "Rumänisch" ; +lin russian_Language = mkLanguage "Russisch" ; +lin sindhi_Language = mkLanguage "Sindhi" ; +lin spanish_Language = mkLanguage "Spanisch" ; +lin swahili_Language = mkLanguage "Swahili" ; +lin swedish_Language = mkLanguage "Schwedisch" ; +lin thai_Language = mkLanguage "Thai" ; +lin turkish_Language = mkLanguage "Türkisch" ; +lin urdu_Language = mkLanguage "Urdu" ; } diff --git a/lib/src/german/ParadigmsGer.gf b/lib/src/german/ParadigmsGer.gf index b74a82b4d..63091ca99 100644 --- a/lib/src/german/ParadigmsGer.gf +++ b/lib/src/german/ParadigmsGer.gf @@ -135,7 +135,12 @@ mkN : overload { -- In the worst case, all four forms are needed. - mkPN : (nom,acc,dat,gen : Str) -> PN -- name with all case forms + mkPN : (nom,acc,dat,gen : Str) -> PN ; -- name with all case forms + +-- Inflection can also be inherited from the singular forms of a common noun. + + mkPN : N -> PN ; -- use the singular forms of a noun + } ; @@ -452,6 +457,7 @@ mkV2 : overload { mkPN = overload { mkPN : Str -> PN = regPN ; + mkPN : N -> PN = \n -> lin PN {s = n.s ! Sg} ; mkPN : (nom,gen : Str) -> PN = mk2PN ; mkPN : (nom,acc,dat,gen : Str) -> PN = \nom,acc,dat,gen -> {s = table {Nom => nom ; Acc => acc ; Dat => dat ; Gen => gen} ; lock_PN = <>} diff --git a/lib/src/swedish/ConstructionSwe.gf b/lib/src/swedish/ConstructionSwe.gf index eef05bbc4..500df5880 100644 --- a/lib/src/swedish/ConstructionSwe.gf +++ b/lib/src/swedish/ConstructionSwe.gf @@ -71,6 +71,72 @@ lin InLanguage l = SyntaxSwe.mkAdv on_Prep (mkNP l) ; lin weekdayN w = w ; monthN m = m ; + + weekdayPN w = mkPN w ; + monthPN m = mkPN m ; + languagePN l = l ; +oper mkLanguage : Str -> PN = \s -> mkPN s ; + +---------------------------------------------- +---- lexicon of special names + +lin monday_Weekday = mkN "måndag" ; +lin tuesday_Weekday = mkN "tisdag" ; +lin wednesday_Weekday = mkN "onsdag" ; +lin thursday_Weekday = mkN "torsdag" ; +lin friday_Weekday = mkN "fredag" ; +lin saturday_Weekday = mkN "lördag" ; +lin sunday_Weekday = mkN "söndag" ; + +lin january_Month = mkN "januari" ; +lin february_Month = mkN "februari" ; +lin march_Month = mkN "mars" ; +lin april_Month = mkN "april" ; +lin may_Month = mkN "maj" ; +lin june_Month = mkN "juni" ; +lin july_Month = mkN "juli" ; +lin august_Month = mkN "augusti" ; +lin september_Month = mkN "september" ; +lin october_Month = mkN "oktober" ; +lin november_Month = mkN "november" ; +lin december_Month = mkN "december" ; + +lin afrikaans_Language = mkLanguage "afrikaans" ; +lin amharic_Language = mkLanguage "amhariska" ; +lin arabic_Language = mkLanguage "arabiska" ; +lin bulgarian_Language = mkLanguage "bulgariska" ; +lin catalan_Language = mkLanguage "catalanska" ; +lin chinese_Language = mkLanguage "kinesiska" ; +lin danish_Language = mkLanguage "danska" ; +lin dutch_Language = mkLanguage "holländska" ; +lin english_Language = mkLanguage "engelska" ; +lin estonian_Language = mkLanguage "estniska" ; +lin finnish_Language = mkLanguage "finska" ; +lin french_Language = mkLanguage "franska" ; +lin german_Language = mkLanguage "tyska" ; +lin greek_Language = mkLanguage "grekiska" ; +lin hebrew_Language = mkLanguage "hebreiska" ; +lin hindi_Language = mkLanguage "hindi" ; +lin japanese_Language = mkLanguage "japanska" ; +lin italian_Language = mkLanguage "italienska" ; +lin latin_Language = mkLanguage "latin" ; +lin latvian_Language = mkLanguage "lettiska" ; +lin maltese_Language = mkLanguage "maltesiska" ; +lin nepali_Language = mkLanguage "nepali" ; +lin norwegian_Language = mkLanguage "norska" ; +lin persian_Language = mkLanguage "persiska" ; +lin polish_Language = mkLanguage "polska" ; +lin punjabi_Language = mkLanguage "punjabi" ; +lin romanian_Language = mkLanguage "rumänska" ; +lin russian_Language = mkLanguage "ryska" ; +lin sindhi_Language = mkLanguage "sindhi" ; +lin spanish_Language = mkLanguage "spanska" ; +lin swahili_Language = mkLanguage "swahili" ; +lin swedish_Language = mkLanguage "svenska" ; +lin thai_Language = mkLanguage "thai" ; +lin turkish_Language = mkLanguage "turkiska" ; +lin urdu_Language = mkLanguage "urdu" ; + } diff --git a/lib/src/swedish/ParadigmsSwe.gf b/lib/src/swedish/ParadigmsSwe.gf index 7dec9994e..2e38f03d3 100644 --- a/lib/src/swedish/ParadigmsSwe.gf +++ b/lib/src/swedish/ParadigmsSwe.gf @@ -142,6 +142,7 @@ oper mkPN : overload { mkPN : Str -> PN ; -- default gender utrum mkPN : Str -> Gender -> PN ; -- set other gender + mkPN : N -> PN ; -- get inflection and gender from a noun -- In the worst case, the genitive form is irregular. @@ -505,6 +506,8 @@ oper mkPN = overload { mkPN : Str -> PN = regPN ; mkPN : Str -> Gender -> PN = regGenPN ; + mkPN : N -> PN = \n -> + {s = n.s ! Sg ! Indef ; g = n.g ; lock_PN = <>} ; mkPN : (jesus,jesu : Str) -> Gender -> PN = \jesus,jesu,g -> {s = table {Nom => jesus ; Gen => jesu} ; g = g ; lock_PN = <>} ; } ; diff --git a/lib/src/translator/Names.gf b/lib/src/translator/Names.gf deleted file mode 100644 index b93007639..000000000 --- a/lib/src/translator/Names.gf +++ /dev/null @@ -1,61 +0,0 @@ -abstract Names = Construction ** { - -fun monday_Weekday : Weekday ; -fun tuesday_Weekday : Weekday ; -fun wednesday_Weekday : Weekday ; -fun thursday_Weekday : Weekday ; -fun friday_Weekday : Weekday ; -fun saturday_Weekday : Weekday ; -fun sunday_Weekday : Weekday ; - -fun january_Month : Month ; -fun february_Month : Month ; -fun march_Month : Month ; -fun april_Month : Month ; -fun may_Month : Month ; -fun june_Month : Month ; -fun july_Month : Month ; -fun august_Month : Month ; -fun september_Month : Month ; -fun october_Month : Month ; -fun november_Month : Month ; -fun december_Month : Month ; - - -fun afrikaans_Language : Language ; -fun amharic_Language : Language ; -fun arabic_Language : Language ; -fun bulgarian_Language : Language ; -fun catalan_Language : Language ; -fun chinese_Language : Language ; -fun danish_Language : Language ; -fun dutch_Language : Language ; -fun english_Language : Language ; -fun estonian_Language : Language ; -fun finnish_Language : Language ; -fun french_Language : Language ; -fun german_Language : Language ; -fun greek_Language : Language ; -fun hebrew_Language : Language ; -fun hindi_Language : Language ; -fun japanese_Language : Language ; -fun italian_Language : Language ; -fun latin_Language : Language ; -fun latvian_Language : Language ; -fun maltese_Language : Language ; -fun nepali_Language : Language ; -fun norwegian_Language : Language ; -fun persian_Language : Language ; -fun polish_Language : Language ; -fun punjabi_Language : Language ; -fun romanian_Language : Language ; -fun russian_Language : Language ; -fun sindhi_Language : Language ; -fun spanish_Language : Language ; -fun swahili_Language : Language ; -fun swedish_Language : Language ; -fun thai_Language : Language ; -fun turkish_Language : Language ; -fun urdu_Language : Language ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesChi.gf b/lib/src/translator/NamesChi.gf deleted file mode 100644 index 611080811..000000000 --- a/lib/src/translator/NamesChi.gf +++ /dev/null @@ -1,64 +0,0 @@ -concrete NamesChi of Names = ConstructionChi ** - - open ParadigmsChi in { - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -lin monday_Weekday = mkN "星期一" ; -lin tuesday_Weekday = mkN "星期二" ; -lin wednesday_Weekday = mkN "星期三" ; -lin thursday_Weekday = mkN "星期四" ; -lin friday_Weekday = mkN "星期五" ; -lin saturday_Weekday = mkN "星期六" ; -lin sunday_Weekday = mkN "星期日" ; - -lin january_Month = mkN "一月" ; -lin february_Month = mkN "二月" ; -lin march_Month = mkN "三月" ; -lin april_Month = mkN "四月" ; -lin may_Month = mkN "五月" ; -lin june_Month = mkN "六月" ; -lin july_Month = mkN "七月" ; -lin august_Month = mkN "八月t" ; -lin september_Month = mkN "九月" ; -lin october_Month = mkN "十月" ; -lin november_Month = mkN "十一月" ; -lin december_Month = mkN "十二月" ; - -lin afrikaans_Language = mkLanguage "南非語" ; -lin amharic_Language = mkLanguage "阿姆哈拉语" ; -lin arabic_Language = mkLanguage "阿拉伯语" ; -lin bulgarian_Language = mkLanguage "保加利亚语" ; ---lin catalan_Language = mkLanguage "Catalan" ; -lin chinese_Language = mkLanguage "中文" ; ---lin danish_Language = mkLanguage "Danish" ; -lin dutch_Language = mkLanguage "荷蘭語" ; -lin english_Language = mkLanguage "英语" ; ---lin estonian_Language = mkLanguage "Estonian" ; -lin finnish_Language = mkLanguage "芬兰语" ; -lin french_Language = mkLanguage "法语" ; -lin german_Language = mkLanguage "德语" ; ---lin greek_Language = mkLanguage "Greek" ; ---lin hebrew_Language = mkLanguage "Hebrew" ; -lin hindi_Language = mkLanguage "印地语" ; -lin japanese_Language = mkLanguage "日语" ; -lin italian_Language = mkLanguage "意大利语" ; ---lin latin_Language = mkLanguage "Latin" ; ---lin latvian_Language = mkLanguage "Latvian" ; ---lin maltese_Language = mkLanguage "Maltese" ; ---lin nepali_Language = mkLanguage "Nepali" ; ---lin norwegian_Language = mkLanguage "Norwegian" ; ---lin persian_Language = mkLanguage "Persian" ; ---lin polish_Language = mkLanguage "Polish" ; ---lin punjabi_Language = mkLanguage "Punjabi" ; ---lin romanian_Language = mkLanguage "罗马尼亚" ; -lin russian_Language = mkLanguage "俄语" ; ---lin sindhi_Language = mkLanguage "Sindhi" ; -lin spanish_Language = mkLanguage "西班牙语" ; ---lin swahili_Language = mkLanguage "Swahili" ; -lin swedish_Language = mkLanguage "瑞典文" ; ---lin thai_Language = mkLanguage "Thai" ; ---lin turkish_Language = mkLanguage "Turkish" ; ---lin urdu_Language = mkLanguage "Urdu" ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesEng.gf b/lib/src/translator/NamesEng.gf deleted file mode 100644 index 74109f1a5..000000000 --- a/lib/src/translator/NamesEng.gf +++ /dev/null @@ -1,65 +0,0 @@ -concrete NamesEng of Names = ConstructionEng ** - - open ParadigmsEng in { - -lin monday_Weekday = mkN "Monday" ; -lin tuesday_Weekday = mkN "Tuesday" ; -lin wednesday_Weekday = mkN "Wednesday" ; -lin thursday_Weekday = mkN "Thursday" ; -lin friday_Weekday = mkN "Friday" ; -lin saturday_Weekday = mkN "Saturday" ; -lin sunday_Weekday = mkN "Sunday" ; - -lin january_Month = mkN "January" ; -lin february_Month = mkN "February" ; -lin march_Month = mkN "March" ; -lin april_Month = mkN "April" ; -lin may_Month = mkN "May" ; -lin june_Month = mkN "June" ; -lin july_Month = mkN "July" ; -lin august_Month = mkN "August" ; -lin september_Month = mkN "September" ; -lin october_Month = mkN "October" ; -lin november_Month = mkN "November" ; -lin december_Month = mkN "December" ; - - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -lin afrikaans_Language = mkLanguage "Afrikaans" ; -lin amharic_Language = mkLanguage "Amharic" ; -lin arabic_Language = mkLanguage "Arabic" ; -lin bulgarian_Language = mkLanguage "Bulgarian" ; -lin catalan_Language = mkLanguage "Catalan" ; -lin chinese_Language = mkLanguage "Chinese" ; -lin danish_Language = mkLanguage "Danish" ; -lin dutch_Language = mkLanguage "Dutch" ; -lin english_Language = mkLanguage "English" ; -lin estonian_Language = mkLanguage "Estonian" ; -lin finnish_Language = mkLanguage "Finnish" ; -lin french_Language = mkLanguage "French" ; -lin german_Language = mkLanguage "German" ; -lin greek_Language = mkLanguage "Greek" ; -lin hebrew_Language = mkLanguage "Hebrew" ; -lin hindi_Language = mkLanguage "Hindi" ; -lin japanese_Language = mkLanguage "Japanese" ; -lin italian_Language = mkLanguage "Italian" ; -lin latin_Language = mkLanguage "Latin" ; -lin latvian_Language = mkLanguage "Latvian" ; -lin maltese_Language = mkLanguage "Maltese" ; -lin nepali_Language = mkLanguage "Nepali" ; -lin norwegian_Language = mkLanguage "Norwegian" ; -lin persian_Language = mkLanguage "Persian" ; -lin polish_Language = mkLanguage "Polish" ; -lin punjabi_Language = mkLanguage "Punjabi" ; -lin romanian_Language = mkLanguage "Romanian" ; -lin russian_Language = mkLanguage "Russian" ; -lin sindhi_Language = mkLanguage "Sindhi" ; -lin spanish_Language = mkLanguage "Spanish" ; -lin swahili_Language = mkLanguage "Swahili" ; -lin swedish_Language = mkLanguage "Swedish" ; -lin thai_Language = mkLanguage "Thai" ; -lin turkish_Language = mkLanguage "Turkish" ; -lin urdu_Language = mkLanguage "Urdu" ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesFin.gf b/lib/src/translator/NamesFin.gf deleted file mode 100644 index eeebc24da..000000000 --- a/lib/src/translator/NamesFin.gf +++ /dev/null @@ -1,76 +0,0 @@ ---# -path=.:../chunk:../finnish/stemmed:../finnish:../api - -concrete NamesFin of Names = ConstructionFin ** - - open ParadigmsFin in { - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -oper mkWeekday : Str -> Weekday = \d -> - lin Weekday { - noun = mkN d ; - habitual = case d of { - _ + "i" => ParadigmsFin.mkAdv (d + "sin") ; -- tiistaisin - _ => ParadigmsFin.mkAdv (d + "isin") -- keskiviikkoisin - } - } ; - - -lin monday_Weekday = mkWeekday "maanantai" ; -lin tuesday_Weekday = mkWeekday "tiistai" ; -lin wednesday_Weekday = mkWeekday "keskiviikko" ; -lin thursday_Weekday = mkWeekday "torstai" ; -lin friday_Weekday = mkWeekday "perjantai" ; -lin saturday_Weekday = mkWeekday"lauantai" ; -lin sunday_Weekday = mkWeekday "sunnuntai" ; - -lin january_Month = mkN "tammikuu" ; -lin february_Month = mkN "helmikuu" ; -lin march_Month = mkN "maaliskuu" ; -lin april_Month = mkN "huhtikuu" ; -lin may_Month = mkN "toukokuu" ; -lin june_Month = mkN "kesäkuu" ; -lin july_Month = mkN "heinäkuu" ; -lin august_Month = mkN "elokuu" ; -lin september_Month = mkN "syyskuu" ; -lin october_Month = mkN "lokakuu" ; -lin november_Month = mkN "marraskuu" ; -lin december_Month = mkN "joulukuu" ; - -lin afrikaans_Language = mkLanguage "afrikaans" ; -lin amharic_Language = mkLanguage "amhara" ; -lin arabic_Language = mkLanguage "arabia" ; -lin bulgarian_Language = mkLanguage "bulgaria" ; -lin catalan_Language = mkLanguage "katalaani" ; -lin chinese_Language = mkLanguage "kiina" ; -lin danish_Language = mkLanguage "tanska" ; -lin dutch_Language = mkLanguage "hollanti" ; -lin english_Language = mkLanguage "englanti" ; -lin estonian_Language = mkLanguage "viro" ; -lin finnish_Language = mkPN (mkN "suomi" "suomia") ; -lin french_Language = mkLanguage "ranska" ; -lin german_Language = mkLanguage "saksa" ; -lin greek_Language = mkLanguage "kreikka" ; -lin hebrew_Language = mkLanguage "heprea" ; -lin hindi_Language = mkLanguage "hindi" ; -lin japanese_Language = mkLanguage "japani" ; -lin italian_Language = mkLanguage "italia" ; -lin latin_Language = mkLanguage "latina" ; -lin latvian_Language = mkLanguage "latvia" ; -lin maltese_Language = mkLanguage "malta" ; -lin nepali_Language = mkLanguage "nepali" ; -lin norwegian_Language = mkLanguage "norja" ; -lin persian_Language = mkLanguage "persia" ; -lin polish_Language = mkLanguage "puola" ; -lin punjabi_Language = mkLanguage "punjabi" ; -lin romanian_Language = mkLanguage "romania" ; -lin russian_Language = mkLanguage "venäjä" ; -lin sindhi_Language = mkLanguage "sindhi" ; -lin spanish_Language = mkLanguage "espanja" ; -lin swahili_Language = mkLanguage "swahili" ; -lin swedish_Language = mkLanguage "ruotsi" ; -lin thai_Language = mkLanguage "thai" ; -lin turkish_Language = mkLanguage "turkki" ; -lin urdu_Language = mkLanguage "urdu" ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesFre.gf b/lib/src/translator/NamesFre.gf deleted file mode 100644 index 9a858de4f..000000000 --- a/lib/src/translator/NamesFre.gf +++ /dev/null @@ -1,66 +0,0 @@ -concrete NamesFre of Names = ConstructionFre ** - - open ParadigmsFre in { - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -lin monday_Weekday = mkN "lundi" ; -lin tuesday_Weekday = mkN "mardi" ; -lin wednesday_Weekday = mkN "mercredi" ; -lin thursday_Weekday = mkN "jeudi" ; -lin friday_Weekday = mkN "vendredi" ; -lin saturday_Weekday = mkN "samedi" ; -lin sunday_Weekday = mkN "dimanche" masculine ; - -lin january_Month = mkN "janvier" ; -lin february_Month = mkN "février" ; -lin march_Month = mkN "mars" ; -lin april_Month = mkN "avril" ; -lin may_Month = mkN "mai" ; -lin june_Month = mkN "juin" ; -lin july_Month = mkN "juillet" ; -lin august_Month = mkN "août" ; -lin september_Month = mkN "septembre" ; -lin october_Month = mkN "octobre" ; -lin november_Month = mkN "novembre" ; -lin december_Month = mkN "décembre" ; - - - -lin afrikaans_Language = mkLanguage "afrikaans" ; -lin amharic_Language = mkLanguage "amharique" ; ---- -lin arabic_Language = mkLanguage "arabe" ; -lin bulgarian_Language = mkLanguage "bulgare" ; -lin catalan_Language = mkLanguage "catalan" ; -lin chinese_Language = mkLanguage "chinois" ; -lin danish_Language = mkLanguage "danois" ; -lin dutch_Language = mkLanguage "hollandais" ; -lin english_Language = mkLanguage "anglais" ; -lin estonian_Language = mkLanguage "estonien" ; -lin finnish_Language = mkLanguage "finnois" ; -lin french_Language = mkLanguage "francais" ; -lin german_Language = mkLanguage "allemand" ; -lin greek_Language = mkLanguage "grècque" ; -lin hebrew_Language = mkLanguage "hebreu" ; -lin hindi_Language = mkLanguage "hindi" ; -lin japanese_Language = mkLanguage "japonais" ; -lin italian_Language = mkLanguage "italien" ; -lin latin_Language = mkLanguage "latin" ; -lin latvian_Language = mkLanguage "letton" ; -lin maltese_Language = mkLanguage "maltais" ; -lin nepali_Language = mkLanguage "nepali" ; -lin norwegian_Language = mkLanguage "norvégien" ; -lin persian_Language = mkLanguage "persien" ; -lin polish_Language = mkLanguage "polonais" ; -lin punjabi_Language = mkLanguage "punjabi" ; -lin romanian_Language = mkLanguage "roumain" ; -lin russian_Language = mkLanguage "russe" ; -lin sindhi_Language = mkLanguage "sindhi" ; -lin spanish_Language = mkLanguage "espagnol" ; -lin swahili_Language = mkLanguage "swahili" ; -lin swedish_Language = mkLanguage "suédois" ; -lin thai_Language = mkLanguage "thaï" ; -lin turkish_Language = mkLanguage "turque" ; -lin urdu_Language = mkLanguage "urdu" ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesGer.gf b/lib/src/translator/NamesGer.gf deleted file mode 100644 index 0a547fd8a..000000000 --- a/lib/src/translator/NamesGer.gf +++ /dev/null @@ -1,66 +0,0 @@ -concrete NamesGer of Names = ConstructionGer ** - - open ParadigmsGer in { - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -lin monday_Weekday = mkN "Montag" ; -lin tuesday_Weekday = mkN "Dienstag" ; -lin wednesday_Weekday = mkN "Mittwoch" ; -lin thursday_Weekday = mkN "Donnerstag" ; -lin friday_Weekday = mkN "Freitag" ; -lin saturday_Weekday = mkN "Samstag" ; -lin sunday_Weekday = mkN "Sonntag" ; - -lin january_Month = mkN "Januar" ; -lin february_Month = mkN "Februar" ; -lin march_Month = mkN "März" ; -lin april_Month = mkN "April" ; -lin may_Month = mkN "Mai" ; -lin june_Month = mkN "Juni" ; -lin july_Month = mkN "Juli" ; -lin august_Month = mkN "August" ; -lin september_Month = mkN "September" ; -lin october_Month = mkN "Oktober" ; -lin november_Month = mkN "November" ; -lin december_Month = mkN "Dezember" ; - - - -lin afrikaans_Language = mkLanguage "Afrikaans" ; -lin amharic_Language = mkLanguage "Amharisch" ; -lin arabic_Language = mkLanguage "Arabisch" ; -lin bulgarian_Language = mkLanguage "Bulgarisch" ; -lin catalan_Language = mkLanguage "Katalanish" ; -lin chinese_Language = mkLanguage "Chinesisch" ; -lin danish_Language = mkLanguage "Dänisch" ; -lin dutch_Language = mkLanguage "Holländisch" ; -lin english_Language = mkLanguage "Englisch" ; -lin estonian_Language = mkLanguage "Estnisch" ; -lin finnish_Language = mkLanguage "Finnisch" ; -lin french_Language = mkLanguage "Französisch" ; -lin german_Language = mkLanguage "Deutsch" ; -lin greek_Language = mkLanguage "Griechisch" ; -lin hebrew_Language = mkLanguage "Hebräisch" ; -lin hindi_Language = mkLanguage "Hindi" ; -lin japanese_Language = mkLanguage "Japanisch" ; -lin italian_Language = mkLanguage "Italienisch" ; -lin latin_Language = mkLanguage "Latein" ; -lin latvian_Language = mkLanguage "Lettisch" ; -lin maltese_Language = mkLanguage "Maltesisch" ; -lin nepali_Language = mkLanguage "Nepali" ; -lin norwegian_Language = mkLanguage "Norwegisch" ; -lin persian_Language = mkLanguage "Persisch" ; -lin polish_Language = mkLanguage "Polnisch" ; -lin punjabi_Language = mkLanguage "Punjabi" ; -lin romanian_Language = mkLanguage "Rumänisch" ; -lin russian_Language = mkLanguage "Russisch" ; -lin sindhi_Language = mkLanguage "Sindhi" ; -lin spanish_Language = mkLanguage "Spanisch" ; -lin swahili_Language = mkLanguage "Swahili" ; -lin swedish_Language = mkLanguage "Schwedisch" ; -lin thai_Language = mkLanguage "Thai" ; -lin turkish_Language = mkLanguage "Türkisch" ; -lin urdu_Language = mkLanguage "Urdu" ; - -} \ No newline at end of file diff --git a/lib/src/translator/NamesSwe.gf b/lib/src/translator/NamesSwe.gf deleted file mode 100644 index a64ac3561..000000000 --- a/lib/src/translator/NamesSwe.gf +++ /dev/null @@ -1,66 +0,0 @@ -concrete NamesSwe of Names = ConstructionSwe ** - - open ParadigmsSwe in { - -oper mkLanguage : Str -> PN = \s -> mkPN s ; - -lin monday_Weekday = mkN "måndag" ; -lin tuesday_Weekday = mkN "tisdag" ; -lin wednesday_Weekday = mkN "onsdag" ; -lin thursday_Weekday = mkN "torsdag" ; -lin friday_Weekday = mkN "fredag" ; -lin saturday_Weekday = mkN "lördag" ; -lin sunday_Weekday = mkN "söndag" ; - -lin january_Month = mkN "januari" ; -lin february_Month = mkN "februari" ; -lin march_Month = mkN "mars" ; -lin april_Month = mkN "april" ; -lin may_Month = mkN "maj" ; -lin june_Month = mkN "juni" ; -lin july_Month = mkN "juli" ; -lin august_Month = mkN "augusti" ; -lin september_Month = mkN "september" ; -lin october_Month = mkN "oktober" ; -lin november_Month = mkN "november" ; -lin december_Month = mkN "december" ; - -lin afrikaans_Language = mkLanguage "afrikaans" ; -lin amharic_Language = mkLanguage "amhariska" ; -lin arabic_Language = mkLanguage "arabiska" ; -lin bulgarian_Language = mkLanguage "bulgariska" ; -lin catalan_Language = mkLanguage "catalanska" ; -lin chinese_Language = mkLanguage "kinesiska" ; -lin danish_Language = mkLanguage "danska" ; -lin dutch_Language = mkLanguage "holländska" ; -lin english_Language = mkLanguage "engelska" ; -lin estonian_Language = mkLanguage "estniska" ; -lin finnish_Language = mkLanguage "finska" ; -lin french_Language = mkLanguage "franska" ; -lin german_Language = mkLanguage "tyska" ; -lin greek_Language = mkLanguage "grekiska" ; -lin hebrew_Language = mkLanguage "hebreiska" ; -lin hindi_Language = mkLanguage "hindi" ; -lin japanese_Language = mkLanguage "japanska" ; -lin italian_Language = mkLanguage "italienska" ; -lin latin_Language = mkLanguage "latin" ; -lin latvian_Language = mkLanguage "lettiska" ; -lin maltese_Language = mkLanguage "maltesiska" ; -lin nepali_Language = mkLanguage "nepali" ; -lin norwegian_Language = mkLanguage "norska" ; -lin persian_Language = mkLanguage "persiska" ; -lin polish_Language = mkLanguage "polska" ; -lin punjabi_Language = mkLanguage "punjabi" ; -lin romanian_Language = mkLanguage "rumänska" ; -lin russian_Language = mkLanguage "ryska" ; -lin sindhi_Language = mkLanguage "sindhi" ; -lin spanish_Language = mkLanguage "spanska" ; -lin swahili_Language = mkLanguage "swahili" ; -lin swedish_Language = mkLanguage "svenska" ; -lin thai_Language = mkLanguage "thai" ; -lin turkish_Language = mkLanguage "turkiska" ; -lin urdu_Language = mkLanguage "urdu" ; - - - -} \ No newline at end of file diff --git a/lib/src/translator/Translate.gf b/lib/src/translator/Translate.gf index 982c8b2be..2c5665420 100644 --- a/lib/src/translator/Translate.gf +++ b/lib/src/translator/Translate.gf @@ -23,7 +23,6 @@ abstract Translate = Chunk, Construction, - Names, Extensions [ CompoundN,AdAdV,UttAdV,ApposNP,MkVPI, MkVPS, PredVPS, PassVPSlash, PassAgentVPSlash, CompoundAP, DirectComplVS, DirectComplVQ, FocusObjS diff --git a/lib/src/translator/TranslateChi.gf b/lib/src/translator/TranslateChi.gf index 7fe4ae3f8..7c10f498c 100644 --- a/lib/src/translator/TranslateChi.gf +++ b/lib/src/translator/TranslateChi.gf @@ -24,7 +24,6 @@ concrete TranslateChi of Translate = RelativeChi, IdiomChi, ConstructionChi, - NamesChi, DocumentationChi, ChunkChi, diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf index c3ae86748..c7795e2e5 100644 --- a/lib/src/translator/TranslateEng.gf +++ b/lib/src/translator/TranslateEng.gf @@ -28,7 +28,6 @@ concrete TranslateEng of Translate = RelativeEng - [IdRP], IdiomEng, ConstructionEng, - NamesEng, DocumentationEng, ChunkEng, diff --git a/lib/src/translator/TranslateFin.gf b/lib/src/translator/TranslateFin.gf index b771f3551..00a5d5de7 100644 --- a/lib/src/translator/TranslateFin.gf +++ b/lib/src/translator/TranslateFin.gf @@ -23,7 +23,6 @@ concrete TranslateFin of Translate = RelativeFin, IdiomFin, ConstructionFin, - NamesFin, DocumentationFin, ChunkFin, diff --git a/lib/src/translator/TranslateFre.gf b/lib/src/translator/TranslateFre.gf index e136f16a6..c8834c193 100644 --- a/lib/src/translator/TranslateFre.gf +++ b/lib/src/translator/TranslateFre.gf @@ -22,7 +22,6 @@ concrete TranslateFre of Translate = RelativeFre, IdiomFre, ConstructionFre, - NamesFre, DocumentationFre, ChunkFre, diff --git a/lib/src/translator/TranslateGer.gf b/lib/src/translator/TranslateGer.gf index 511edda02..5d37b2d38 100644 --- a/lib/src/translator/TranslateGer.gf +++ b/lib/src/translator/TranslateGer.gf @@ -20,7 +20,6 @@ concrete TranslateGer of Translate = RelativeGer, IdiomGer, ConstructionGer, - NamesGer, DocumentationGer, ChunkGer, diff --git a/lib/src/translator/TranslateSwe.gf b/lib/src/translator/TranslateSwe.gf index 37644f9a7..7c516f668 100644 --- a/lib/src/translator/TranslateSwe.gf +++ b/lib/src/translator/TranslateSwe.gf @@ -20,7 +20,6 @@ concrete TranslateSwe of Translate = RelativeSwe, IdiomSwe, ConstructionSwe, - NamesSwe, DocumentationSwe, ChunkSwe,