diff --git a/japgram.tdl b/japgram.tdl index a41c2e8..f8af9b5 100644 --- a/japgram.tdl +++ b/japgram.tdl @@ -441,13 +441,16 @@ head-complement2-rule := head-complement2-type & [SYNSEM.LOCAL.BAR +]. ; (ERB 2002-01-02) [NUCL -] on mother - see notes at ; head-adjunct-rule-type. +; took out +; FCB 2017-11-29 changed ADJ to bool +;;; to allow its use to distinguish adverbs dervied from adjectives hf-adj-i-rule := hadj-final-i & [SYNSEM.LOCAL.BAR +, C-CONT [RELS , HCONS ], ARGS <[SYNSEM.LOCAL [CAT [HEAD [J-POSTHEAD left, - ADJ -, + ADJ bool, MAIN-PRD -], VAL saturated], BAR +]], diff --git a/letypes.tdl b/letypes.tdl index b074a07..9b4f625 100644 --- a/letypes.tdl +++ b/letypes.tdl @@ -1047,7 +1047,8 @@ adv_head := adj-or-adv_head & adv_head-avm := adv_head & [KEYS.KEY adv_rel, MOD < [LOCAL [CAT.HEAD sentence-valid]] >, - H-TENSE present]. + H-TENSE present, + ADJ -]. ;;; making MOD.LOCAL.CAT.HEAD.ADJ + stops us from modifying adverbs ;;; FIXME: now we over generate by modifying past tense normal verbs @@ -1063,8 +1064,12 @@ adv_deg_num_head-avm := adv_head & MOD < [LOCAL [CAT.HEAD num-cl_head]] >, H-TENSE present]. -case-adv_head := adv_head & - [MOD < >]. +adv_adj_head-avm := adv_head & +"used for adverbs made from adjectives (na or i)" + [KEYS.KEY adv_rel, + MOD < [LOCAL [CAT.HEAD sentence-valid]] >, + H-TENSE present, + ADJ +]. hes_head := final_head. @@ -2268,8 +2273,8 @@ nounmod-p-ncomp-relmod-lex := nounmod-p-ncomp-lex & ; ; nounmod-p-exc-ncomp-lex := nounmod-p-lex & - [SYNSEM.LOCAL.CAT [HEAD.PTYPE nattr, - VAL.COMPS.FIRST synsem & [LOCAL.CAT.HEAD exceptional_noun_head]]]. + [SYNSEM.LOCAL.CAT [HEAD.PTYPE nattr, + VAL.COMPS.FIRST synsem & [LOCAL.CAT.HEAD exceptional_noun_head]]]. nounmod-p-ncomp-plusbar-lex := nounmod-p-lex & @@ -2822,9 +2827,6 @@ adv-p-lex-vp-inf := adv-p-lex & -adv-p-lex-naadj := adv-p-lex & - [SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD na-adj_head]. - adv-p-lex-parent := adv-p-lex & [SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD parent-end_head]. @@ -4237,7 +4239,7 @@ temp_numeral-basic-lex := n-lex & [SPR.FIRST #spr, COMPS #comps & [FIRST.LOCAL [CONT.HOOK [LTOP #hand, XARG #i], - CAT.HEAD.KEYS.KEY 'temp_loc]]]], + CAT.HEAD.KEYS.KEY "temp_loc"]]]], CONT common-noun-sem-type & [HOOK [INDEX #i, LTOP #hand]], @@ -7200,32 +7202,33 @@ na-naarg-end-lex := na-end-lex & ; (since 2005)v-soc-adv-stem-lexやv2a-c-stem-lexのように、adverbを格として取る動詞に対して使う。 ; 部屋 を きれい に する ; 桜 が 有名 に なる -; 部屋 を きれい に 掃除 する -; 確か に 鐘 が なっ た +; 部屋 を きれい に 掃除 する +; 確か に 鐘 が なっ た ; (TK 07-04-11)「そうに+V」(lkb::do-parse-tty "寒 そう に 振る舞う")や「na-adj-lex+に+助詞」 ; (lkb::do-parse-tty "簡単 に は 譲ら ない")の場合にもこのtypeを選ぶかどうかの選択肢が出てしまう。 ; (TK 07-04-11)また、「na-adj-lex+に+助詞」の場合、このtypeを選ぶことは可能だが、格にはなれない ; (lkb::do-parse-tty "きれい に は し ない")。 ; -naadj2adv-end-lex := lexical_sign-word & +naadj2adv-end-lex := lexical_sign-aword & [J-NEEDS-AFFIX -, SYNSEM synsem & - [LOCAL [CAT [HEAD case-adv_head & [J-POSTHEAD left], + [LOCAL [CAT [HEAD adv_adj_head-avm & + [J-POSTHEAD left, + MOD < [LOCAL intersective-mod & + [CONT.HOOK [LTOP #h, + INDEX #e ]]] > ], VAL obj-arg & - [COMPS #comps & [FIRST [OPT - , - LOCAL [CAT [HEAD na-adj_head, - VAL.UNSAT +], - CONT [RELS , - HOOK [LTOP #tophand, - INDEX #ind]]]]]]], + [COMPS #comps + & [FIRST [OPT - , + LOCAL [CAT [HEAD na-adj_head, + VAL.UNSAT +], + CONT.HOOK #hook ]]]]], ARG-S #comps, - CONT [HOOK [LTOP #tophand, - XARG #xarg, - INDEX #ind], + CONT [HOOK #hook & + [LTOP #h, + XARG #e ], RELS , HCONS ]], - LKEYS.KEYREL #key & [ LBL #tophand], NON-LOCAL [QUE , AFFIX ]], INFLECTED +]. diff --git a/lexicon.tdl b/lexicon.tdl index 03b21e7..200f704 100644 --- a/lexicon.tdl +++ b/lexicon.tdl @@ -152381,12 +152381,6 @@ ni-end := naadj2adv-end-lex & [ STEM < "に" >, TRAITS native_token_list ]. -ni-naarg := adv-p-lex-naadj & - [ STEM < "に" >, - SYNSEM [ LKEYS.KEYREL.PRED "_ni_p_rel", - LOCAL.CAT.HEAD.PTYPE ni ], - TRAITS native_token_list ]. - ni-narg := adv-p-lex-np & [ STEM < "に" >, SYNSEM [ LKEYS.KEYREL.PRED "_ni_p_rel", diff --git a/rule-types.tdl b/rule-types.tdl index e5a10b4..8ba5940 100644 --- a/rule-types.tdl +++ b/rule-types.tdl @@ -1103,9 +1103,9 @@ conditional-lexeme-to-word-rule := lex-rule & v-lex & c-cont-1 & ; (FCB 2005-09-22) Don't copy up hook as the modified verb's hook ; should be the hook (from isect-adv-lex) -adj2adv-rule := isect-adv-lex & lex-rule & +adj2adv-rule := isect-mod-lex & lex-rule & adv-super-lex & [SYNSEM [LKEYS.KEYREL [ PRED #rel ], - LOCAL [CAT.HEAD adv_head, + LOCAL [CAT.HEAD adv_adj_head-avm, CTXT #ctxt], NON-LOCAL #nonloc], J-NEEDS-AFFIX -,