msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

Merge pull request #303 from lizazim/master

Browse Source 
Jpn: corrections of mkN paradigm, lexicon and AP conjunction
This commit is contained in:
Inari Listenmaa
2020-02-17 16:42:03 +01:00
committed by GitHub
parent b3c5d9b193 7b1587a735
commit 79c647cffa
3 changed files with 72 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/japanese/ConjunctionJpn.gf
View File

@@ -327,7 +327,22 @@ concrete ConjunctionJpn of Conjunction = CatJpn ** open ResJpn, Prelude in {
s2dropNaEnging = y.dropNaEnging ;
prepositive = \\st => x.prepositive ! st ++ y.prepositive ! st
} ;
ConsAP x xs = {
s1and = x.te ;
s1or = \\st => table {
Pos => x.dropNaEnging ! st ++ "か" ;
Neg => x.pred ! Plain ! TPres ! Neg ++ "か"
} ;
s2pred = \\st,t,p => xs.s1and ! st ! p ++ xs.s2pred ! st ! t ! p ;
s2attr = \\st => xs.s1and ! st ! Pos ++ xs.s2attr ! st ;
s2te = \\st,p => xs.s1and ! st ! p ++ xs.s2te ! st ! p ;
s2ba = \\st,p => xs.s1and ! st ! p ++ xs.s2ba ! st ! p ;
s2adv = \\st => xs.s1and ! st ! Pos ++ xs.s2adv ! st ;
s2dropNaEnging = xs.s2dropNaEnging ;
prepositive = \\st => x.prepositive ! st ++ xs.prepositive ! st
} ;
{-
ConsAP x xs = {
s1and = \\st,p => xs.s1and ! st ! p ++ xs.s2te ! st ! p ;
s1or = \\st => table {
@@ -342,7 +357,7 @@ concrete ConjunctionJpn of Conjunction = CatJpn ** open ResJpn, Prelude in {
s2dropNaEnging = x.dropNaEnging ;
prepositive = \\st => x.prepositive ! st ++ xs.prepositive ! st
} ;
-}
BaseIAdv x y = {
s = \\st => x.s ! st ++ x.particle ++ y.s ! st ;
particle = y.particle ;

102
src/japanese/LexiconJpn.gf
View File

@@ -5,13 +5,13 @@ flags coding = utf8 ;
lin
add_V3 = mkV3 "加える" "に" "を" Gr2 ; -- "kuwaeru"
airplane_N = mkN "飛行機" Inanim "機" False ; -- "hikouki" "ki"
airplane_N = mkN "飛行機" Inanim "機" ; -- "hikouki" "ki"
alas_Interj = ss "残念です" ; -- "zannendesu"
already_Adv = ResJpn.mkAdv "すでに" ; -- "sudeni"
animal_N = mkN "動物" Anim "疋" True ; -- "doubutsu" "hiki"
animal_N = mkN "動物" Anim ; -- "doubutsu"
answer_V2S = mkV "答える" Gr2 ; -- "kotaeru"
apartment_N = mkN "アパート" Inanim ; -- "apaato"
apple_N = mkN "リンゴ" Inanim "個" False ; -- "ringo" "ko"
apple_N = mkN "リンゴ" Inanim "個" ; -- "ringo" "ko"
art_N = mkN "芸術" Inanim ; -- "geijutsu"
ashes_N = mkN "灰" Inanim ; -- "hai"
ask_V2Q = mkV "聞く" Gr1 ; -- "kiku"
@@ -22,24 +22,24 @@ lin
bark_N = mkN "木皮" Inanim ; -- "kohada"
beautiful_A = mkA "美しい" ; -- "utsukushii"
become_VA = mkV "なる" Gr1 ; -- "naru"
beer_N = mkN "ビール" Inanim "杯" False ; -- "biiru" "hai"
beer_N = mkN "ビール" Inanim ; -- "biiru"
beg_V2V = mkV "請い願う" Gr1 ; -- "koinegau"
belly_N = mkN "お腹" "腹" Inanim ; -- "onaka" "hara"
big_A = mkA "大きな" ; -- "ookina"
bike_N = mkN "自転車" Inanim "台" False ; -- "jitensha" "dai"
bird_N = mkN "鳥" Anim "羽" False ; -- "tori" "wa"
bike_N = mkN "自転車" Inanim "台" ; -- "jitensha" "dai"
bird_N = mkN "鳥" Anim "羽" ; -- "tori" "wa"
bite_V2 = mkV2 "噛む" "を" Gr1 ; -- "kamu"
black_A = mkA "黒い" ; -- "kuroi" ;
blood_N = mkN "血液" Inanim ; -- "ketsueki"
blow_V = mkV "吹く" Gr1 ; -- "fuku"
blue_A = mkA "青い" ; -- "aoi" ;
boat_N = mkN "ボート" Inanim "艘" False ; -- "bouto" "sou"
boat_N = mkN "ボート" Inanim "艘" ; -- "bouto" "sou"
bone_N = mkN "骨" Inanim ; -- "hone"
book_N = mkN "本" Inanim "冊" False ; -- "hon" "satsu"
book_N = mkN "本" Inanim "冊" ; -- "hon" "satsu"
boot_N = mkN "ブート" Inanim ; -- "buuto"
boss_N = mkN "社長" Anim "人" False "社長たち" ; -- "shachou"
boy_N = mkN "男の子" Anim "人" False "男の子たち" ; -- "otokonoko"
bread_N = mkN "パン" Inanim "斤" False ; -- "pan" "kin"
bread_N = mkN "パン" Inanim "斤" ; -- "pan" "kin"
break_V2 = mkV2 "破る" "を" Gr1 ; -- "yaburu"
breast_N = mkN "胸" Inanim ; -- "mune"
breathe_V = mkV "息する" Suru ; -- "ikisuru"
@@ -51,20 +51,20 @@ lin
buy_V2 = mkV2 "買う" "を" Gr1 ; -- "kau"
camera_N = mkN "カメラ" Inanim ; -- "kamera"
cap_N = mkN "キャップ" Inanim ; -- "kyappu"
car_N = mkN "車" Inanim "車" True ; -- "kuruma" "sha"
car_N = mkN "車" Inanim "台" ; -- "kuruma" "dai"
carpet_N = mkN "絨毯" Inanim ; -- "juutan"
cat_N = mkN "猫" Anim "匹" False ; -- "neko" "hiki"
cat_N = mkN "猫" Anim "匹" ; -- "neko" "hiki"
ceiling_N = mkN "天井" Inanim ; -- "tenjou"
chair_N = mkN "椅子" Inanim "脚" False ; -- "isu" "kyaku"
chair_N = mkN "椅子" Inanim "脚" ; -- "isu" "kyaku"
cheese_N = mkN "チーズ" Inanim ; -- "chiizu"
child_N = mkN "子供" Anim "人" False ; -- "kodomo"
church_N = mkN "教会" Inanim "軒" False ; -- "kyoukai" "ken"
child_N = mkN "子供" Anim "人" ; -- "kodomo"
church_N = mkN "教会" Inanim ; -- "kyoukai"
city_N = mkN "都市" Inanim ; -- "toshi"
clean_A = mkA "奇麗な" ; -- "kireina" ;
clever_A = mkA "賢い" ; -- "kashikoi" ;
close_V2 = mkV2 "閉める" "を" Gr2 ; -- "shimeru"
cloud_N = mkN "雲" Inanim ; -- "kumo"
coat_N = mkN "コート" Inanim ; -- "kouto"
coat_N = mkN "コート" Inanim "着" False ; -- "kouto" "chaku"
cold_A = mkA "寒い" ; -- "samui" ;
come_V = mkV "来る" Kuru ; -- "ko" "ki" "kuru" "kita"
computer_N = mkN "コンピュータ" Inanim ; -- "konpyuuta"
@@ -72,15 +72,15 @@ lin
country_N = mkN "国" Inanim "ヶ国" True ; -- "kuni" "kakoku"
count_V2 = mkV2 "数える" "を" Gr2 ; -- "kazoeru"
cousin_N = mkN "いとこ" Anim "人" False "いとこたち" ; -- "itoko"
cow_N = mkN "牛" Anim "頭" False ; -- "ushi" "tou"
cow_N = mkN "牛" Anim "頭" ; -- "ushi" "tou"
cut_V2 = mkV2 "切る" "を" Gr1 ; -- "kiru"
day_N = mkN "日" Inanim "日" True ; -- "hi" "ka";
day_N = mkN "日" Inanim True ; -- "hi" "ka";
die_V = mkV "死ぬ" Gr1 ; -- "shinu"
dig_V = mkV "掘る" Gr1 ; -- "horu"
dirty_A = mkA "汚い" ; -- "kitanai" ;
distance_N3 = mkN3 "距離" "から" "まで" Inanim ; -- "kyori" "kara" "made"
doctor_N = mkN "医者" Anim "人" False "医者たち" ; -- "isha"
dog_N = mkN "犬" Anim "匹" False ; -- "inu" "hiki"
dog_N = mkN "犬" Anim "匹" ; -- "inu" "hiki"
door_N = mkN "ドア" Inanim ; -- "doa"
do_V2 = mkV2 "する" "を" Suru ; -- "suru"
drink_V2 = mkV2 "飲む" "を" Gr1 ; -- "nomu"
@@ -107,10 +107,10 @@ lin
find_V2 = mkV2 "拾う" "を" Gr1 ; -- "hirou"
fingernail_N = mkN "爪" Inanim ; -- "tsume"
fire_N = mkN "火" Inanim ; -- "hi"
fish_N = mkN "魚" Anim "匹" False ; -- "sakana" "hiki"
fish_N = mkN "魚" Anim "匹" ; -- "sakana" "hiki"
float_V = mkV "浮く" Gr1 ; -- "uku"
floor_N = mkN "床" Inanim ; -- "yuka"
flower_N = mkN "花" Inanim "輪" False ; -- "sakana" "rin"
flower_N = mkN "花" Inanim ; -- "sakana"
flow_V = mkV "流れる" Gr2 ; -- "nagareru"
fly_V = mkV "飛ぶ" Gr1 ; -- "tobu"
fog_N = mkN "霧" Inanim ; -- "kiri"
@@ -119,8 +119,8 @@ lin
forget_V2 = mkV2 "忘れる" "を" Gr2 ; -- "wasureru"
freeze_V = mkV "凍らす" Gr1 ; -- "kourasu"
fridge_N = mkN "冷蔵庫" Inanim ; -- "reizouko"
friend_N = mkN "友だち" Anim "人" False ; -- "tomodachi"
fruit_N = mkN "果物" Inanim "個" False ; -- "kudamono" "ko"
friend_N = mkN "友だち" Anim "人" ; -- "tomodachi"
fruit_N = mkN "果物" Inanim ; -- "kudamono"
full_A = mkA "一杯の" ; -- "ippaino" ;
fun_AV = mkA "可笑しい" ; -- "okashii" ;
garden_N = mkN "庭" Inanim ; -- "niwa"
@@ -147,10 +147,10 @@ lin
hit_V2 = mkV2 "打つ" "を" Gr1 ; -- "utsu"
hold_V2 = mkV2 "持つ" "を" Gr1 ; -- "motsu"
hope_VS = mkV2 "期待する" "ことを" Suru ; -- "kitaisuru"
horn_N = mkN "角" Inanim "本" False ; -- "tsuno" "hon"
horse_N = mkN "馬" Anim "頭" False ; -- "uma" "tou"
horn_N = mkN "角" Inanim "本" ; -- "tsuno" "hon"
horse_N = mkN "馬" Anim "頭" ; -- "uma" "tou"
hot_A = mkA "熱い" ; -- "atsui"
house_N = mkN "家" Inanim "軒" True ; -- "ie" "ken"
house_N = mkN "家" Inanim "軒" ; -- "ie" "ken"
hunt_V2 = mkV2 "狩る" "を" Gr1 ; -- "karu"
husband_N = mkN "夫" Anim "人" False "夫たち" ; -- "otto"
ice_N = mkN "氷" Inanim ; -- "kouri"
@@ -167,9 +167,9 @@ lin
know_VS = mkV2 "知る" "ことを" Gr1 ; -- "shiru"
lake_N = mkN "湖" Inanim ; -- "mizuumi"
lamp_N = mkN "電灯" Inanim ; -- "dentou"
language_N = mkN "言語" Inanim "語" True ; -- "gengo" "go"
language_N = mkN "言語" Inanim ; -- "gengo"
laugh_V = mkV "笑う" Gr1 ; -- "warau"
leaf_N = mkN "葉" Inanim "葉" True ; -- "ha" "ha"
leaf_N = mkN "葉" Inanim "枚" ; -- "ha" "mai"
learn_V2 = mkV2 "学ぶ" "を" Gr1 ; -- "manabu"
leather_N = mkN "皮革" Inanim ; -- "hikaku"
leave_V2 = mkV2 "残す" "を" Gr1 ; -- "nokosu"
@@ -182,7 +182,7 @@ lin
live_V = mkV "住む" Gr1 ; -- "sumu"
long_A = mkA "長い" ; -- "nagai"
lose_V2 = mkV2 "失う" "を" Gr1 ; -- "ushinau"
louse_N = mkN "虱" Anim "匹" False ; -- "shirami" "hiki"
louse_N = mkN "虱" Anim "匹" ; -- "shirami" "hiki"
love_N = mkN "愛" Inanim ; -- "ai"
love_V2 = mkV2 "愛する" "を" Suru ; -- "aisuru"
man_N = mkN "男" Anim "人" False "男たち" ; -- "otoko"
@@ -191,7 +191,7 @@ lin
milk_N = mkN "ミルク" Inanim ; -- "miruku"
moon_N = mkN "月" Inanim ; -- "tsuki"
mother_N2 = mkN2 "お母さん" Anim "人" False "お母さんたち" "の" ; -- "okaasan"
mountain_N = mkN "山" Inanim "座" False ; -- "yama" "za"
mountain_N = mkN "山" Inanim ; -- "yama"
mouth_N = mkN "口" Inanim ; -- "kuchi"
music_N = mkN "音楽" Inanim ; -- "ongaku"
name_N = mkN "名前" "お名前" Inanim ; -- "namae" "onamae"
@@ -199,19 +199,19 @@ lin
near_A = mkA "近い" ; -- "chikai"
neck_N = mkN "首" Inanim ; -- "kubi"
new_A = mkA "新しい" ; -- "atarashii"
newspaper_N = mkN "新聞" Inanim "部" False ; -- "shimbun" "bu"
night_N = mkN "夜" Inanim "夜" True ; -- "yoru" "ya"
newspaper_N = mkN "新聞" Inanim "紙" ; -- "shimbun" "shi"
night_N = mkN "夜" Inanim True ; -- "yoru" "ya"
nose_N = mkN "鼻" Inanim ; -- "hana"
now_Adv = ResJpn.mkAdv "今" ; -- "ima"
number_N = mkN "数" Inanim "数" True ; -- "kazu" "suu"
number_N = mkN "数" Inanim ; -- "kazu"
oil_N = mkN "油" Inanim ; -- "abura"
old_A = mkA "古い" ; -- "furui"
open_V2 = mkV2 "開く" "を" Gr1 ; -- "hiraku"
paint_V2A = mkV "塗る" Gr1 ; -- "nuru"
paper_N = mkN "紙" Inanim "葉" False ; -- "kami" "you"
paper_N = mkN "紙" Inanim "枚" ; -- "kami" "mai"
paris_PN = mkPN "パリ" ;
peace_N = mkN "平和" Inanim ; -- "heiwa"
pen_N = mkN "ペン" Inanim "本" False ; -- "pen" "hon"
pen_N = mkN "ペン" Inanim "本" ; -- "pen" "hon"
person_N = mkN "人" Anim "人" True "人たち" ; -- "hito"
planet_N = mkN "惑星" Inanim ; -- "wakusei"
plastic_N = mkN "プラスチック" Inanim ; -- "purasutikku"
@@ -224,7 +224,7 @@ lin
push_V2 = mkV2 "押す" "を" Gr1 ; -- "osu"
put_V2 = mkV2 "置く" "を" Gr1 ; -- "oku"
queen_N = mkN "女王" Anim "人" False "女王たち" ; -- "joou"
question_N = mkN "質問" Inanim "題" True ; -- "shitsumon" "dai"
question_N = mkN "質問" Inanim ; -- "shitsumon"
radio_N = mkN "ラジオ" Inanim ; -- "rajio"
rain_N = mkN "雨" Inanim ; -- "ame"
rain_V0 = mkRain ;
@@ -235,12 +235,12 @@ lin
religion_N = mkN "宗教" Inanim ; -- "shuukyou"
restaurant_N = mkN "レストラン" Inanim ; -- "resutoran"
right_Ord = mkA "右の" ; -- "migino"
river_N = mkN "川" Inanim "本" False ; -- "kawa" "hon"
road_N = mkN "道路" Inanim "本" False ; -- "douro" "hon"
river_N = mkN "川" Inanim "本" ; -- "kawa" "hon"
road_N = mkN "道路" Inanim "本" ; -- "douro" "hon"
rock_N = mkN "岩" Inanim ; -- "iwa"
roof_N = mkN "屋根" Inanim ; -- "yane"
root_N = mkN "根" Inanim ; -- "ne"
rope_N = mkN "縄" Inanim "本" False ; -- "nawa"
rope_N = mkN "縄" Inanim "本" ; -- "nawa"
rotten_A = mkA "腐っている" "腐った" ; -- "kusatteiru"
round_A = mkA "丸い" ; -- "marui"
rubber_N = mkN "ゴム" Inanim ; -- "gomu" - material
@@ -261,11 +261,11 @@ lin
send_V3 = mkV3 "送る" "に" "を" Gr1 ; -- "okuru"
sew_V = mkV "縫う" Gr1 ; -- "nuu"
sharp_A = mkA "鋭い" ; -- "surudoi"
sheep_N = mkN "羊" Anim "頭" False ; -- "hitsuji" "tou"
ship_N = mkN "船" Inanim "杯" False ; -- "fune" "hai"
shirt_N = mkN "シャツ" Inanim ; -- "shatsu"
sheep_N = mkN "羊" Anim "頭" ; -- "hitsuji" "tou"
ship_N = mkN "船" Inanim "隻" ; -- "fune" "seki"
shirt_N = mkN "シャツ" Inanim "枚" False ; -- "shatsu" "mai"
shoe_N = mkN "靴" Inanim ; -- "kutsu"
shop_N = mkN "店" Inanim "店" True ; -- "mise" "ten"
shop_N = mkN "店" Inanim ; -- "mise"
short_A = mkA "短い" ; -- "mijikai"
silver_N = mkN "銀" Inanim ; -- "gin"
sing_V = mkV "歌う" Gr1 ; -- "utau"
@@ -278,10 +278,10 @@ lin
smell_V = mkV "匂う" Gr1 ; -- "niou"
smoke_N = mkN "煙" Inanim ; -- "kemuri"
smooth_A = mkA "平滑な" ; -- "heikatsuna"
snake_N = mkN "蛇" Anim "匹" False ; -- "hebi" "hiki"
snake_N = mkN "蛇" Anim "匹" ; -- "hebi" "hiki"
snow_N = mkN "雪" Inanim ; -- "yuki"
sock_N = mkN "靴下" Inanim ; -- "kutsushita"
song_N = mkN "歌" Inanim "曲" False ; -- "uta" "kyoku"
song_N = mkN "曲" Inanim True ; -- "kyoku"
speak_V2 = mkV2 "話す" "を" Gr1 ; -- "hanasu"
spit_V = mkV "唾する" Suru ; -- "tsubakisuru"
split_V2 = mkV2 "分かつ" "を" Gr1 ; -- "wakatsu"
@@ -290,7 +290,7 @@ lin
stand_V = mkV "立つ" Gr1 ; -- "tatsu"
star_N = mkN "星" Inanim ; -- "hoshi"
steel_N = mkN "鋼" Inanim ; -- "hagane"
stick_N = mkN "棒" Inanim "本" False ; -- "bou" "hon"
stick_N = mkN "棒" Inanim "本" ; -- "bou" "hon"
stone_N = mkN "石" Inanim ; -- "ishi"
stop_V = mkV "止まる" Gr1 ; -- "tomaru"
stove_N = mkN "ストーブ" Inanim ; -- "sutobu"
@@ -303,7 +303,7 @@ lin
swim_V = mkV "泳ぐ" Gr1 ; -- "oyogu"
switch8off_V2 = mkV2 "スイッチを切る" "の" Gr1 ; -- "suitchiokiru"
switch8on_V2 = mkV2 "スイッチを入れる" "の" Gr2 ; -- "suitchioireru"
table_N = mkN "テーブル" Inanim "脚" False ; -- "teburu" "kyaku"
table_N = mkN "テーブル" Inanim ; -- "teburu"
tail_N = mkN "尾" Inanim ; -- "o"
talk_V3 = mkV3 "話す" "と" "について" Gr1 ; -- "hanasu"
teacher_N = mkN "先生" Anim "人" False "先生たち" ; -- "sensei"
@@ -317,15 +317,15 @@ lin
today_Adv = ResJpn.mkAdv "今日" ; -- "kyou" ;
tongue_N = mkN "舌" Inanim ; -- "shita"
tooth_N = mkN "歯" Inanim ; -- "ha"
train_N = mkN "電車" Inanim "列車" True ; -- "densha" "ressha"
train_N = mkN "列車" Inanim "本" ; -- "ressha" "hon"
travel_V = mkV "旅行する" Suru ; -- "ryokousuru"
tree_N = mkN "木" Inanim "樹" True ; -- "ki" "ju"
tree_N = mkN "木" Inanim "本" ; -- "ki" "hon"
turn_V = mkV "回る" Gr1 ; -- "mawaru"
ugly_A = mkA "醜い" ; -- "mnikui"
uncertain_A = mkA "危なっかしい" ; -- "abunakkashii"
understand_V2 = mkV2 "理解する" "を" Suru ; -- "rikaisuru"
university_N = mkN "大学" Inanim ; -- "daigaku"
village_N = mkN "村" Inanim "村" True ; -- "mura" "son"
village_N = mkN "村" Inanim ; -- "mura"
vomit_V = mkV "吐く" Gr1 ; -- "haku"
wait_V2 = mkV2 "待つ" "を" Gr1 ; -- "matsu"
walk_V = mkV "歩く" Gr1 ; -- "aruku"
@@ -347,9 +347,9 @@ lin
woman_N = mkN "女" Anim "人" False "女たち" ; -- "onna"
wonder_VQ = mkV2 "質問する" "を" Suru ; -- "shitsumonsuru"
wood_N = mkN "木材" Inanim ; -- "mokuzai"
worm_N = mkN "ワーム" Anim "匹" False ; -- "waamu" "hiki"
worm_N = mkN "ワーム" Anim "匹" ; -- "waamu" "hiki"
write_V2 = mkV2 "書く" "を" Gr1 ; -- "kaku"
year_N = mkN "年" Inanim "年" True ; -- "toshi" "nen"
year_N = mkN "年" Inanim True ; -- "toshi" "nen"
yellow_A = mkA "黄色の" ; -- "kiirono"
young_A = mkA "若い" ; -- "wakai"
}

4
src/japanese/ParadigmsJpn.gf
View File

@@ -24,6 +24,10 @@ oper
= \kane,okane,a -> lin N (styleNoun kane okane a "つ" False True) ;
mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- No style variation. Arguments are animacy, counter and whether counter replaces the noun.
= \n,a,c,b -> lin N (regNoun n a c b False) ;
mkN : (man : Str) -> (anim : Animacy) -> (counterReplace : Bool) -> N -- Liza 16/02/2020 No style variation. Arguments are animacy and whether counter replaces the noun (here they coincide).
= \n,a,b -> lin N (regNoun n a n b False) ;
mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> N -- Liza 16/02/2020 No style variation. Arguments are animacy and counter, which does not replace the noun.
= \n,a,c -> lin N (regNoun n a c False False) ;
mkN : (man : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> (men : Str) -> N -- Like previous, but unpredictable plural.
= \n,a,c,b,pl -> lin N (numberNoun n a c b pl False) ;
mkN : (kane,okane : Str) -> (anim : Animacy) -> (counter : Str) -> (counterReplace : Bool) -> N -- Style variation, animacy, counter and whether counter replaces the noun.