diff --git a/output_word.lua b/output_word.lua index f38e809..a787c66 100644 --- a/output_word.lua +++ b/output_word.lua @@ -20,25 +20,28 @@ return function(tbl) print(text) if show_all then - text = "" - if this_word[4] ~= "" then - text = text .. colorText(COLOR.HighCyan,"\tCanon origin: ") - text = text .. colorText(COLOR.HighCyan,this_word[4]) - print(text) + if this_word[4] ~= "" + or this_word[5] ~= "" + or this_word[6] ~= "" then + text = "" + if this_word[4] ~= "" then + text = text .. colorText(COLOR.HighCyan,"\tCanon origin: ") + text = text .. colorText(COLOR.HighCyan,this_word[4]) + print(text) + end + text = "" + if this_word[5] ~= "" then + text = text .. colorText(COLOR.HighPurple,"\tMeta origin: ") + text = text .. colorText(COLOR.HighPurple,this_word[5]) + print(text) + end + text = "" + if this_word[6] ~= "" then + text = text .. colorText(COLOR.HighYellow,"\tNotes: ") + text = text .. colorText(COLOR.HighYellow,this_word[6]) + print(text) + end end - text = "" - if this_word[5] ~= "" then - text = text .. colorText(COLOR.HighPurple,"\tMeta origin: ") - text = text .. colorText(COLOR.HighPurple,this_word[5]) - print(text) - end - text = "" - if this_word[6] ~= "" then - text = text .. colorText(COLOR.HighYellow,"\tNotes: ") - text = text .. colorText(COLOR.HighYellow,this_word[6]) - print(text) - end - print("") end end end diff --git a/words.lua b/words.lua index 9f07613..5598675 100644 --- a/words.lua +++ b/words.lua @@ -138,6 +138,7 @@ table.insert(t,{"ma.chun","examination","noun","","",""}) table.insert(t,{"ma.ra","day","noun","","",""}) table.insert(t,{"ma.ya.ri","smooth","modifier","","",""}) table.insert(t,{"maa.me","if","marker","","",""}) +table.insert(t,{"me","past form to be (informal)","verb","from ko.me","",""}) table.insert(t,{"me.ku","to dig","verb","","",""}) table.insert(t,{"me.lu","blood","noun","","",""}) table.insert(t,{"me.lu","blood","noun","","",""}) @@ -164,6 +165,7 @@ table.insert(t,{"mya","preceeds subordinate clause","marker","","","marker after table.insert(t,{"nao.mi","dream","noun","","",""}) table.insert(t,{"nao.mi.min.ku","to dream","verb","","",""}) table.insert(t,{"nya","hi (informal)","expression","from nyan.pash hello","",""}) +table.insert(t,{"nya","present form to be (informal)","verb","from ka.nya","",""}) table.insert(t,{"nya.ba.ku","to tie","verb","","",""}) table.insert(t,{"nya.ku","to ask for","verb","","",""}) table.insert(t,{"nya.wa","rope","noun","","",""}) @@ -286,7 +288,7 @@ table.insert(t,{"wo.k.ku","to fall","verb","","",""}) table.insert(t,{"wuu.ga","fog","noun","","",""}) table.insert(t,{"ya.ku","to give","verb","","",""}) table.insert(t,{"yan","name","noun","","from toki pona \"jan\"",""}) -table.insert(t,{"yan.wa","ocean","noun","","",""}) +table.insert(t,{"yan.kuch.wa","ocean","noun","","",""}) table.insert(t,{"yea.mat","area","noun","","",""}) table.insert(t,{"yesh","adorable","modifier","","",""}) table.insert(t,{"yi.ma","year","noun","","",""})