Jpn19.01.15

This commit is contained in:
lizazim
2015-01-19 09:51:31 +00:00
parent 993014699f
commit eab989c1d7
6 changed files with 737 additions and 72 deletions

View File

@@ -8132,7 +8132,7 @@ lin neutrality_N = mkN "中立" ;
lin neutralization_N = mkN "中和" ;
lin neutrino_N = mkN "中性微子" | mkN "ニュートリノ" ;
lin neutron_N = mkN "中性子" ;
lin never_Adv = mkAdv "決して" | mkAdv "何時でも" | mkAdv "曾て" | mkAdv "万々" ;
lin never_Adv = mkAdv "決して" | mkAdv "何時でも" | mkAdv "曾て" | mkAdv "万々" | mkAdv "絶対に" ;
lin nevertheless_Adv = mkAdv "それでも" | mkAdv "やはり" | mkAdv "それにもかかわらず" | mkAdv "しかも" ;
lin new_A = L.new_A | mkA "新しい" ;
lin newfangled_A = mkA "新しもの好きの" ;
@@ -8370,10 +8370,12 @@ lin official_A = mkA "公式" | mkA "公の" ;
lin offline_A = mkA "オフライン" ;
lin offshore_A = mkA "オフショア" ;
lin offspring_N = mkN "胤" ;
lin often_Adv = mkAdv "よく" | mkAdv "度々" | mkAdv "頻繁に" | mkAdv "しばしば" ;
lin often_Adv = mkAdv "よく" | mkAdv "度々" | mkAdv "頻繁に" |
mkAdv "しばしば" | mkAdv "くらい" ; -- "くらい" for "how often"
lin ogre_N = mkN "鬼" ;
lin ogress_N = mkN "鬼女" ;
lin oh_Interj = mkInterj "あら" | mkInterj "おや" | mkInterj "まあ" | mkInterj "ああ" | mkInterj "へえ" | mkInterj "お" | mkInterj "あ" ;
lin oh_Interj = mkInterj "あら" | mkInterj "おや" | mkInterj "まあ" | mkInterj "ああ" |
mkInterj "へえ" | mkInterj "お" | mkInterj "あ" ;
lin ohm_N = mkN "オーム" ;
lin oil_N = L.oil_N | mkN "石油" | mkN "油" ;
lin oil_V2 = mkV2 "油を塗る" ;
@@ -9186,7 +9188,7 @@ lin plead_V = mkV "嘆願する" ;
lin plead_V2 = mkV2 "嘆願する" ;
lin plead_VS = mkVS "嘆願する" ;
lin pleasant_A = mkA "愉快な" ;
lin please_Adv = mkAdv "...ください" | mkAdv "どうぞ" | mkAdv "お願いします" | mkAdv "...をください" | mkAdv "please]" ;
lin please_Adv = mkAdv "ください" | mkAdv "どうぞ" | mkAdv "お願いします" | mkAdv "をください" ;
lin please_V = mkV "喜ばす" ;
lin please_V2 = mkV2 "喜ばす" ;
lin please_V2V = mkV2V "喜ばす" ;

View File

@@ -3,34 +3,65 @@
concrete ExtensionsJpn of Extensions =
CatJpn ** open ResJpn, ParadigmsJpn, SyntaxJpn, (G = GrammarJpn), (E = ExtraJpn), Prelude in {
{-
---- TODO: everything. But consult TranslateJpn.gf to see what is not needed
lincat
VPI = E.VPI ;
VPS = E.VPS ;
[VPS] = {verbAnd, verbOr, verbIf, a_stemAnd, a_stemOr, a_stemIf,
i_stemAnd, i_stemOr, i_stemIf, teAnd, teOr, teIf,
baAnd, baOr, baIf : Speaker => Animateness => Style => Str ;
prep : Str ; obj, prepositive : Style => Str} ;
[VPI] = {verbAnd, verbOr : Speaker => Animateness => Str ;
a_stemAnd, a_stemOr, i_stemAnd, i_stemOr : Speaker => Animateness => Style => Str ;
teAnd, teOr, baAnd, baOr : Speaker => Animateness => Style => Polarity => Str ;
prep : Str ; obj, prepositive : Style => Str} ;
lin
MkVPI = E.MkVPI ;
MkVPS = E.MkVPS ;
ComplVPIVV = E.ComplVPIVV ;
PredVPS = E.PredVPS ;
ConjVPS = E.ConjVPS ;
ConjVPI = E.ConjVPI ;
BaseVPS = E.BaseVPS ;
ConsVPS = E.ConsVPS ;
BaseVPI = E.BaseVPI ;
ConsVPI = E.ConsVPI ;
GenNP = E.GenNP ;
GenIP = E.GenIP ;
GenRP = E.GenRP ;
CompoundN n1 n2 = {
s = \\n,st => n1.s ! n ! st ++ n2.s ! n ! st ;
anim = n2.anim ;
counter = n2.counter ;
counterReplace = n2.counterReplace ;
counterTsu = n2.counterTsu
} ;
CompoundAP n a = {
pred = \\st,t,p => n.s ! Sg ! st ++ "に" ++ a.pred ! st ! t ! p ;
attr = \\st => n.s ! Sg ! st ++ "に" ++ a.attr ;
adv = \\st => n.s ! Sg ! st ++ "に" ++ a.adv ! Pos ;
dropNaEnging = \\st => n.s ! Sg ! st ++ "に" ++ a.dropNaEnging ;
prepositive = \\st => "" ;
te = \\st,p => n.s ! Sg ! st ++ "に" ++ a.te ! p ;
ba = \\st,p => n.s ! Sg ! st ++ "に" ++ a.ba ! p ;
needSubject = True
} ;
{-
---- TODO: everything. But consult TranslateJpn.gf to see what is not needed
ListVPI = E.ListVPI ;
ListVPS = E.ListVPS ;
lin
MkVPI = E.MkVPI ;
ConjVPI = E.ConjVPI ;
---- ComplVPIVV = E.ComplVPIVV ;
MkVPS = E.MkVPS ;
ConjVPS = E.ConjVPS ;
PredVPS = E.PredVPS ;
BaseVPI = E.BaseVPI ;
ConsVPI = E.ConsVPI ;
BaseVPS = E.BaseVPS ;
ConsVPS = E.ConsVPS ;
GenNP = E.GenNP ;
---- GenIP = E.GenIP ;
GenRP = E.GenRP ;
PassVPSlash = E.PassVPSlash ;
PassAgentVPSlash = E.PassAgentVPSlash ;