From: tomo Date: Thu, 2 Oct 2008 13:35:19 +0000 (+0000) Subject: Sync up with r21-4-21-chise-0_24-5. X-Git-Tag: r21-4-21-u2km-0_24-5 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=51061e3aca491995bae879d1fb2defe5228fe223;p=chise%2Fxemacs-chise.git- Sync up with r21-4-21-chise-0_24-5. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3ef843b..d8c121d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,30 @@ +2008-09-14 MORIOKA Tomohiko + + * mule/mule-conf.el (=jis-x0208@1978): New coded-charset [moved + from src/mule-charset.c]. + (=jis-x0208@1978/-4pr): Renamed from `=jis-x0208@1978/i-4'; + specify `final'. + (=jis-x0208@1978/1pr): Renamed from `=jis-x0208@1978/i1'; specify + `iso-ir' and `final', namely now it is used as ISO-IR-42. + (=jis-x0208@1978/4-pr): Renamed from `=jis-x0208@1978/i4-'. + (=jis-x0208@1978/i1): New alias for `=jis-x0208@1978/1pr'. + (=jis-x0208@1978/i-4): New alias for `=jis-x0208@1978/-4pr'. + (=jis-x0208@1978/i4-): New alias for `=jis-x0208@1978/4-pr'. + +2008-09-12 MORIOKA Tomohiko + + * mule/mule-conf.el (=jis-x0213-1-2000): Changed to the alias of + `=jis-x0213-1@2000' instead of `=jis-x0213-1'. + (=jis-x0208@1978/i-4): Specify `partial'. + (=jis-x0208@1978/i1): Likewise; use `=jis-x0208@1978/i-4' as the + mother coded-charset. + (=jis-x0208@1978/i4-): New coded-charset for XEmacs CHISE. + +2008-09-09 MORIOKA Tomohiko + + * mule/mule-coding.el (coded-charset-entity-reference-alist): Add + settings for `=jis-x0213-1@2004'. + 2008-09-03 MORIOKA Tomohiko * mule/mule-conf.el (=jis-x0213-1): New coded-charset for XEmacs diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el index 802f73a..26ab9db 100644 --- a/lisp/mule/mule-coding.el +++ b/lisp/mule/mule-coding.el @@ -202,6 +202,7 @@ ((japanese-jisx0208 . isolated) "I-J83-" 4 X) ((japanese-jisx0213-1 . isolated) "I-JX1-" 4 X) ((japanese-jisx0213-2 . isolated) "I-JX2-" 4 X) + ((=jis-x0213-1@2004 . isolated) "I-JX3-" 4 X) ((japanese-jisx0212 . isolated) "I-JSP-" 4 X) ((japanese-jisx0208-1978 . isolated) "I-J78-" 4 X) ((chinese-gb2312 . isolated) "I-G0-" 4 X) @@ -264,6 +265,7 @@ ( japanese-jisx0208 "J83-" 4 X) ( japanese-jisx0213-1 "JX1-" 4 X) ( japanese-jisx0213-2 "JX2-" 4 X) + ( =jis-x0213-1@2004 "JX3-" 4 X) ( japanese-jisx0212 "JSP-" 4 X) ( japanese-jisx0208-1978 "J78-" 4 X) ( chinese-cns11643-1 "C1-" 4 X) diff --git a/lisp/mule/mule-conf.el b/lisp/mule/mule-conf.el index ce6b22f..9ac3e73 100644 --- a/lisp/mule/mule-conf.el +++ b/lisp/mule/mule-conf.el @@ -25,6 +25,65 @@ ;;; Code: +(cond + ((featurep 'utf-2000) + (make-charset + '=jis-x0208@1978 + "JIS X 0208:1978, unchanged part." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208 + final ?@ + graphic 0 + partial t)) + (make-charset + '=jis-x0208@1978/-4pr + "JIS X 0208:1978, 1st - 3rd impressions." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978 + final ?@ + graphic 0 + partial t)) + (make-charset + '=jis-x0208@1978/1pr + "JIS X 0208:1978, 1st impression." + '(iso-ir 42 + registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978/-4pr + final ?@ + graphic 0)) + (make-charset + '=jis-x0208@1978/4-pr + "JIS X 0208:1978, 4th impression or later." + '(registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208@1978 + ;; final ?@ + graphic 0 + partial t)) + (define-charset-alias '=jis-x0208@1978/i1 '=jis-x0208@1978/1pr) + (define-charset-alias '=jis-x0208@1978/i-4 '=jis-x0208@1978/-4pr) + (define-charset-alias '=jis-x0208@1978/i4- '=jis-x0208@1978/4-pr) + ) + (t + (make-charset + '=jis-x0208@1978 + "JIS X0208:1978 Japanese Kanji (so called \"old JIS\")." + '(iso-ir 42 + registry "jisx0208\\.1978" + dimension 2 + chars 94 + mother =jis-x0208 + final ?@ + graphic 0)) + )) + (define-charset-alias '=jis-x0208-1978 '=jis-x0208@1978) (define-charset-alias 'japanese-jisx0208-1978 '=jis-x0208@1978) (define-charset-alias 'chinese-gb2312 '=gb2312) @@ -173,8 +232,7 @@ (define-charset-alias 'japanese-jisx0213-1 '=jis-x0213-1@2000) (define-charset-alias 'japanese-jisx0213-2 '=jis-x0213-2) - ;; (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1@2000) - (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1) + (define-charset-alias '=jis-x0213-1-2000 '=jis-x0213-1@2000) (define-charset-alias '=jis-x0213-2-2000 '=jis-x0213-2) ) (t @@ -209,24 +267,6 @@ mother =jis-x0208 ;; final ?B graphic 0)) - (make-charset - '=jis-x0208@1978/i1 - "The first impression of JIS X 0208:1978." - '(registry "jisx0208\\.1978" - dimension 2 - chars 94 - mother =jis-x0208@1978 - ;; final ?@ - graphic 0)) - (make-charset - '=jis-x0208@1978/i-4 - "The second and third impressions of JIS X 0208:1978." - '(registry "jisx0208\\.1978" - dimension 2 - chars 94 - mother =jis-x0208@1978 - ;; final ?@ - graphic 0)) (make-charset '=big5-cdp "Big5 with CDP extension" diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 4b4e594..bc54bf7 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,125 @@ +2008-09-30 MORIOKA Tomohiko + + * Ideograph-R130-Meat.el (B-BB4C): Moved to U+817F. + +2008-09-27 MORIOKA Tomohiko + + * Ideograph-R072-Sun.el (B-BCCA): Moved to U+66B1. + +2008-09-26 MORIOKA Tomohiko + + * Ideograph-R162-Walk.el (K0-5339): Unify JC3-67E0. + (U+905D): Use `->denotational'. + (K0-534F): Use `<-denotational' for U+905D; unify JC3-67E3. + +2008-09-19 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+82A7): Use `->denotational'. + (C2-2859): Use `<-denotational' for U+82A7; unify JC3-61C7. + (U-00026B18): Use `->subsumptive'. + (U+82A8): Use `->denotational'. + (C2-285F): Use `<-denotational' for U+82A8; unify JC3-61C8. + (U+449F): Use `->denotational' and `->subsumptive'. + (U+44A0): Use `->denotational' and `->subsumptive'. + (U+44A1): Use `->denotational'. + (U+82A9): Use `->denotational'. + (U+82AA): Use `->denotational'. + (U+82AB): Use `->denotational'. + (U+82AC): Use `->denotational' and `->subsumptive'. + (U+82AD): Use `->denotational'. + (U+82AE): Use `->denotational' and `->subsumptive'. + (M-30731): Use `<-subsumptive' and `<-denotational' for U+82AE; + unify JC3-61C9. + (U+82AF): Use `->denotational'. + (U+82B0): Use `->denotational'. + (C1-4F4A): Use `<-denotational' for U+82B0; unify M-30733 and + JC3-61CA. + +2008-09-14 MORIOKA Tomohiko + + * char-db-util.el (char-attribute-name<): Regard partial + coded-charset which has final-byte as ISO registered + coded-charset. + +2008-09-12 MORIOKA Tomohiko + + * Ideograph-R162-Walk.el (M-38724): Use `=jis-x0208@1978/i4-' + instead of `=jis-x0208@1978' for J78/4-i-4B78; unify JX3-4B78. + (J90-4B78): Use `=jis-x0208@1978/i-4' instead of + `=jis-x0208@1978/i1' for J78/-4i-4B78; use + `=jis-x0208@1978*sources' instead of `=jis-x0208@1978/i1*sources'; + add `=jis-x0208@1978*note'; use `=jis-x0213-1@2000' instead of + `=jis-x0213-1' for JX1-4B78. + (U+9022): Add J97-3029. + (K0-5C71): Use `=jis-x0208@1978/i4-' instead of `=jis-x0208@1978' + for J78/4-i-3029; delete `jisx0208-type'; unify JX3-3029. + (J90-3029): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for + JX1-3029; add J78/-4i-3029. + + * Ideograph-R086-Fire.el (K0-5C6C): Modify a char-spec in + `ideographic-structure' for JX3-3029. + + * Ideograph-R169-Gate.el (U-00028CDD): Add `<-denotational' for + J97-313C; add `sound@ja/on/{kan|go}/s=bolt' and + `sound@ja/on/kan/s=intercalary'. + (M-41243): Add `<-wrong@s=intercalary' for M-41244. + (C3-3F6D): Add `=jis-x0208@1978*note'; add `<-error@jis/x0208' for + J0-313C. + (J97-313C): New abstract character. + (U+958F): Add `<-denotational' for J97-313C; add + `sound@ja/on/{kan|go}'. + (U+49A3): Use `->subsumptive'. + (J78/i1-6F65): Add `=jis-x0208@1978*note'; add `<-error@jis/x0208' + for J0-6F65. + + * Ideograph-R156-Run.el (C1-5844): Add S2-7959; unify JC3-66BA. + + * Ideograph-R109-Eye.el (JX1-7877): Add `=jis-x0208@1978*note'; + use `jis-x0208/1978/errata' instead of `=jis-x0208/1978/errata' in + `<-error@jis/x0208*sources'; add `jis-x0208/1997' into + `<-error@jis/x0208*sources'. + +2008-09-12 MORIOKA Tomohiko + + * Ideograph-R140-Grass.el (U+82A6): Use `->denotational'. + (GT-39829): Use `<-denotational' for U+82A6; use + `=jis-x0208@1978/i-4', `=jis-x0208@1983' and `=jis-x0208@1990' + instead of `=jis-x0208' for J90-3032; fix `jisx0208-difference'; + add `=jis-x0208@1978*note'; use `=jis-x0213-1@2000' instead of + `=jis-x0213-1' for JX1-3032; unify JC3-61B3. + (K0-7B58): Use `<-denotational' for U+82A6; unify J78/4--3032 and + JX3-3032. + (U+8328): Use `->denotational' and `->subsumptive'. + (JC3-61B4): New character; use `<-denotational' for U+8328. + (K0-6D3C): Use `<-denotational' for U+8328; move B-AFFD to U+8328. + (JX3-3071): New character; use `<-denotational' for U+8328. + (J90-3071): Use `<-subsumptive' to separate G0-3444 and GT-40112; + use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for JX1-3071. + (U+8329): Use `->denotational'. + (U+832A): Likewise. + + * Ideograph-R085-Water.el (U+6EA2): Add J97-306E. + (J78-306E): Use `<-subsumptive' to separate K0-6C6E and GT-22899. + (K0-6C6E): Use `<-subsumptive' to separate J78-306E and M-17951; + unify JX3-306E. + (J90-306E): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for + JX1-306E; separate `<-simplified@JP' into + `<-simplified@JP/jis/1978' and `<-simplified@JP/jis/2004'. + + * Ideograph-R086-Fire.el (JX1-5F73): Use `=jis-x0208@1978/i4-', + `=jis-x0208@1983' and `=jis-x0208@1990 instead of `=jis-x0208' for + J90-5F73. + (J78/-4-5F73): Add `=jis-x0208@1978*note'. + + * maps-conf.el: Don't add `=gt-pj-1' for J90-3071. + +2008-09-10 MORIOKA Tomohiko + + * Ideograph-R184-Eat.el (U+98F4): Add J97-303B. + (J78-303B): Unify JX3-303B. + (J90-303B): Use `=jis-x0213-1@2000' instead of `=jis-x0213-1' for + JX1-303B. + 2008-09-05 MORIOKA Tomohiko * char-db-util.el (char-attribute-name<): Treat non-private final diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el index 3bdf815..8cde000 100644 --- a/lisp/utf-2000/Ideograph-R030-Mouth.el +++ b/lisp/utf-2000/Ideograph-R030-Mouth.el @@ -29312,7 +29312,8 @@ ) ((=ucs . #x53E3) ; 口 ) - ((=ucs@unicode . #x9054) ; >-52255; + ((=jis-x0208 . #x4323) ; >-52255; [35-03] + (=jis-x0213-1 . #x4323) ; &I-JX1-4323; [35-03] )) (=gb12345 . #x5F55) ; &UU+5660; [63-53] (=ucs@unicode . #x5660) ; &UU+5660; diff --git a/lisp/utf-2000/Ideograph-R072-Sun.el b/lisp/utf-2000/Ideograph-R072-Sun.el index 15b8468..d336d75 100644 --- a/lisp/utf-2000/Ideograph-R072-Sun.el +++ b/lisp/utf-2000/Ideograph-R072-Sun.el @@ -6418,6 +6418,7 @@ (define-char '((ideographic-radical . 72) ; ⽇ (=ucs . #x66B1) ; 暱 + (=big5 . #xBCCA) ; &I-B-BCCA; )) (define-char '((<-denotational @@ -6455,7 +6456,6 @@ (total-strokes . 14) (=jis-x0212 . #x425A) ; &JX2-2E30; [34-58] (=jis-x0213-2 . #x2E30) ; &I-JX2-2E30; [14-16] - (=big5 . #xBCCA) ; &I-B-BCCA; (=ucs@unicode . #x66B1) ; &JX2-2E30; )) (define-char diff --git a/lisp/utf-2000/Ideograph-R085-Water.el b/lisp/utf-2000/Ideograph-R085-Water.el index ee487e5..84f6bd1 100644 --- a/lisp/utf-2000/Ideograph-R085-Water.el +++ b/lisp/utf-2000/Ideograph-R085-Water.el @@ -13389,6 +13389,7 @@ (total-strokes . 13) (=ucs . #x6EA2) ; 溢 (=big5 . #xB7B8) ; &I-B-B7B8; + (=jis-x0208@1997 . #x306E) ; 溢 [16-78] )) (define-char '((<-denotational @@ -13397,11 +13398,15 @@ (ideographic-radical . 85) ; ⽔ (ideographic-strokes . 10) (total-strokes . 13) - (=jis-x0208@1978 . #x306E) ; >-22899; [16-78] - (=ks-x1001 . #x6C6E) ; &I-K0-6C6E; [76-78] - (=gt . 22899) ; &I-GT-22899; - (=gt-pj-4 . #x5146) ; &I-GT-22899; [49-38] - (=daikanwa . 17951) ; &I-M-17951; + (->subsumptive + ((=jis-x0208@1978 . #x306E) ; &M-17951; [16-78] + (=daikanwa . 17951) ; &I-M-17951; + ) + ((=ks-x1001 . #x6C6E) ; >-22899; [76-78] + (=jis-x0213-1@2004 . #x306E) ; &I-JX3-306E; [16-78] + (=gt . 22899) ; &I-GT-22899; + (=gt-pj-4 . #x5146) ; &I-GT-22899; [49-38] + )) )) (define-char '((<-denotational @@ -13413,16 +13418,19 @@ (->subsumptive ((=jis-x0208@1983 . #x306E) ; >-22900; [16-78] (=jis-x0208@1990 . #x306E) ; &I-J90-306E; [16-78] - (=jis-x0213-1 . #x306E) ; &I-JX1-306E; [16-78] + (=jis-x0213-1@2000 . #x306E) ; &I-JX1-306E; [16-78] (=gt . 22900) ; &I-GT-22900; (=gt-pj-1 . #x306E) ; &I-GT-22900; [16-78] (=jef-china3 . #x57C9) ; &I-JC3-57C9; (=ucs@jis . #x6EA2) ; >-22900; - (<-simplified@JP - ((=jis-x0208@1978 . #x306E) ; >-22899; [16-78] - (=ks-x1001 . #x6C6E) ; &I-K0-6C6E; [76-78] + (<-simplified@JP/jis/1978 + ((=jis-x0208@1978 . #x306E) ; &M-17951; [16-78] (=daikanwa . 17951) ; &I-M-17951; )) + (<-simplified@JP/jis/2004 + ((=ks-x1001 . #x6C6E) ; >-22899; [76-78] + (=jis-x0213-1@2004 . #x306E) ; &I-JX3-306E; [16-78] + )) ) ((=gb2312 . #x5267) ; &C1-645E; [50-71] (=cns11643-1 . #x645E) ; &I-C1-645E; [68-62] diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el index 2e0b0a7..9d66d67 100644 --- a/lisp/utf-2000/Ideograph-R086-Fire.el +++ b/lisp/utf-2000/Ideograph-R086-Fire.el @@ -5216,7 +5216,7 @@ (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] (=daikanwa . 18850) ; &I-M-18850; ) - ((=ucs@unicode . #x82AE) ; &UU+82AE; + ((=gb2312 . #x5C47) ; &G0-5C47; [60-39] )) (=ucs@unicode . #x712B) ; &UU+712B; )) @@ -9176,8 +9176,8 @@ (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] (=daikanwa . 18850) ; &I-M-18850; ) - ((=jis-x0208@1978 . #x3029) ; &M-38901; [16-09] - (=ks-x1001 . #x5C71) ; &I-K0-5C71; [60-81] + ((=ks-x1001 . #x5C71) ; &M-38901; [60-81] + (=jis-x0213-1@2004 . #x3029) ; &I-JX3-3029; [16-09] (=daikanwa . 38901) ; &I-M-38901; )) (=ks-x1001 . #x5C6C) ; &CB00201; [60-76] @@ -9201,7 +9201,10 @@ (=jis-x0213-1 . #x3250) ; &I-JX1-3250; [18-48] (=daikanwa . 18850) ; &I-M-18850; ) - ((=ucs@unicode . #x9022) ; >-52042; + ((=jis-x0208@1978/-4pr . #x3029) ; >-52042; [16-09] + (=gb2312 . #x376A) ; &I-G0-376A; [23-74] + (=jis-x0208@1983 . #x3029) ; &I-J83-3029; [16-09] + (=jis-x0213-1@2000 . #x3029) ; &I-JX1-3029; [16-09] )) (=ucs@unicode . #x71A2) ; &UU+71A2; )) @@ -11197,8 +11200,10 @@ ((=daikanwa . 19431) ; &M-19431; ) ((jisx0208-difference . -78/4) - (=jis-x0208 . #x5F73) ; >-24851; [63-83] + (=jis-x0208@1983 . #x5F73) ; >-24851; [63-83] + (=jis-x0208@1990 . #x5F73) ; &I-J90-5F73; [63-83] (=jis-x0213-1 . #x5F73) ; &I-JX1-5F73; [63-83] + (=jis-x0208@1978/4-pr . #x5F73) ; >-24851; [63-83] (=gt . 24851) ; &I-GT-24851; (=gt-pj-1 . #x5F73) ; &I-GT-24851; [63-83] (=jef-china3 . #x57FC) ; &I-JC3-57FC; @@ -11222,9 +11227,9 @@ (total-strokes . 16) (=ucs . #x243D0) ; 𤏐 (->subsumptive - ((=jis-x0208@1978/i1 . #x5F73) ; &CB10565; [63-83] - (=jis-x0208@1978/i-4 . #x5F73) ; &CB10565; [63-83] - (=cbeta . 10565) ; &CB10565; + ((=jis-x0208@1978*note . "ISO-IR-042 = 1978/i-4") + (=jis-x0208@1978/-4pr . #x5F73) ; &CB10565; [63-83] + (=cbeta . 10565) ; &I-CB10565; ) ((=ucs@iso . #x243D0) ; &U-000243D0; )) diff --git a/lisp/utf-2000/Ideograph-R109-Eye.el b/lisp/utf-2000/Ideograph-R109-Eye.el index 075e0f7..32c5cbf 100644 --- a/lisp/utf-2000/Ideograph-R109-Eye.el +++ b/lisp/utf-2000/Ideograph-R109-Eye.el @@ -4513,12 +4513,13 @@ (=ucs . #x7762) ; 睢 (=big5 . #xB846) ; &I-B-B846; (->subsumptive - ((=jis-x0212 . #x4E7E) ; &M-23450; [46-94] + ((=jis-x0208@1978*note . "ISO-IR-042 = 1978/i1") + (=jis-x0208@1978/1pr . #x7033) ; &I-J78-7033; [80-19] + (=jis-x0212 . #x4E7E) ; &I-JSP-4E7E; [46-94] (=jis-x0213-1 . #x7877) ; &I-JX1-7877; [88-87] - (=jis-x0208@1978/i1 . #x7033) ; &M-23450; [80-19] (=daikanwa . 23450) ; &I-M-23450; (=jef-china3 . #x5BD5) ; &I-JC3-5BD5; - (=ucs@jis . #x7762) ; &M-23450; + (=ucs@jis . #x7762) ; &I-J78-7033; (<-error@jis/x0208 ((=jis-x0208 . #x7033) ; >-56413; [80-19] (=ks-x1001 . #x6E51) ; &I-K0-6E51; [78-49] @@ -4527,7 +4528,7 @@ (=daikanwa . 42001) ; &I-M-42001; )) (<-error@jis/x0208*sources - =jis-x0208/1978/errata) + jis-x0208/1978/errata jis-x0208/1997) ) ((=gb2312 . #x6E21) ; &C1-654D; [78-01] (=cns11643-1 . #x654D) ; &I-C1-654D; [69-45] diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el index 2befcdc..a60c7dd 100644 --- a/lisp/utf-2000/Ideograph-R130-Meat.el +++ b/lisp/utf-2000/Ideograph-R130-Meat.el @@ -9762,6 +9762,7 @@ (define-char '((ideographic-radical . 130) ; ⾁ (=ucs . #x817F) ; 腿 + (=big5 . #xBB4C) ; &I-B-BB4C; )) (define-char '((<-denotational @@ -9798,7 +9799,6 @@ (ideographic-strokes . 10) (total-strokes . 14) (=cns11643-1 . #x6A54) ; &C1-6A54; [74-52] - (=big5 . #xBB4C) ; &I-B-BB4C; )) (define-char '((ideographic-radical . 130) ; ⾁ diff --git a/lisp/utf-2000/Ideograph-R140-Grass.el b/lisp/utf-2000/Ideograph-R140-Grass.el index df8ffe7..dd36cbf 100644 --- a/lisp/utf-2000/Ideograph-R140-Grass.el +++ b/lisp/utf-2000/Ideograph-R140-Grass.el @@ -1995,99 +1995,146 @@ (=gt-pj-1 . #x3329) ; &I-GT-39731; [19-09] )) (define-char - '((=>ucs . #x82A6) ; 芦 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=cns11643-3 . #x2A6B) ; &M-30716; [10-75] - (=daikanwa . 30716) ; &I-M-30716; + (=ucs . #x82A6) ; 芦 + (=jis-x0208@1997 . #x3032) ; 芦 [16-18] )) (define-char - '((=>ucs . #x82A6) ; 芦 - (morohashi-daikanwa 30716 0 1) + '((<-denotational + ((=ucs . #x82A6) ; 芦 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=ks-x1001 . #x7B58) ; &K0-7B58; [91-56] + (=cns11643-3 . #x2A6B) ; &M-30716; [10-75] + (=daikanwa . 30716) ; &I-M-30716; )) (define-char - '((=>ucs . #x82A6) ; 芦 - (morohashi-daikanwa 30716 0 3) + '((<-denotational + ((=ucs . #x82A6) ; 芦 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (jisx0208-difference . -78/4) - (=jis-x0208 . #x3032) ; >-39829; [16-18] - (=jis-x0213-1 . #x3032) ; &I-JX1-3032; [16-18] + (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i-4") + (jisx0208-difference . 78/4-) + (=jis-x0208@1978/-4pr . #x3032) ; >-39829; [16-18] + (=jis-x0208@1983 . #x3032) ; &I-J83-3032; [16-18] + (=jis-x0208@1990 . #x3032) ; &I-J90-3032; [16-18] + (=jis-x0213-1@2000 . #x3032) ; &I-JX1-3032; [16-18] (=gt . 39829) ; &I-GT-39829; (=gt-pj-1 . #x3032) ; &I-GT-39829; [16-18] (=shinjigen . 7065) ; >-39829; + (=jef-china3 . #x61B3) ; &I-JC3-61B3; (=ucs@jis . #x82A6) ; >-39829; )) (define-char - '((morohashi-daikanwa 30716 0 5) + '((<-denotational + ((=ucs . #x82A6) ; 芦 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) (hanyu-dazidian 5 3184 8) - (=ucs . #x82A6) ; 芦 - (=gb2312 . #x422B) ; &I-G0-422B; [34-11] + (=gb2312 . #x422B) ; &HZK08-E9C5; [34-11] (=hanziku-8 . #xE9C5) ; &I-HZK08-E9C5; + (=ucs@unicode . #x82A6) ; &HZK08-E9C5; + )) +(define-char + '((<-denotational + ((=ucs . #x82A6) ; 芦 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=ks-x1001 . #x7B58) ; &JX3-3032; [91-56] + (=jis-x0213-1@2004 . #x3032) ; &I-JX3-3032; [16-18] + (=jis-x0208@1978/4-pr . #x3032) ; &JX3-3032; [16-18] + )) +(define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (=ucs . #x82A7) ; 芧 + (=big5 . #xCDB9) ; &I-B-CDB9; )) (define-char - '((=>ucs . #x82A7) ; 芧 + '((<-denotational + ((=ucs . #x82A7) ; 芧 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) (=cns11643-2 . #x2859) ; &M-30717; [08-57] (=daikanwa . 30717) ; &I-M-30717; + (=jef-china3 . #x61C7) ; &I-JC3-61C7; )) (define-char - '((morohashi-daikanwa 30717 0 3) + '((<-denotational + ((=ucs . #x82A7) ; 芧 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82A7) ; 芧 - (=jis-x0212 . #x5741) ; &I-JSP-5741; [55-33] + (=jis-x0212 . #x5741) ; &JX2-757D; [55-33] (=iso-ir165 . #x7E39) ; &I-EGB-7E39; [94-25] (=jis-x0213-2 . #x757D) ; &I-JX2-757D; [85-93] - (=big5 . #xCDB9) ; &I-B-CDB9; + (=ucs@unicode . #x82A7) ; &JX2-757D; )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) (=ucs . #x26B18) ; 𦬘 - (=daikanwa . 30718) ; &I-M-30718; + (->subsumptive + ((=daikanwa . 30718) ; &M-30718; + ) + ((=ucs@iso . #x26B18) ; &U-00026B18; + ) + ((=cns11643-4 . #x277D) ; &C4-277D; [07-93] + ) + ((hanyu-dazidian 5 3183 2) + (=hanziku-8 . #xE97D) ; &HZK08-E97D; + )) )) (define-char - '((=>ucs . #x26B18) ; 𦬘 - (morohashi-daikanwa 30718 0 0) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 8) - (hanyu-dazidian 5 3183 2) - (=cns11643-4 . #x277D) ; &HZK08-E97D; [07-93] - (=hanziku-8 . #xE97D) ; &I-HZK08-E97D; + (=ucs . #x82A8) ; 芨 + (=big5 . #xCDBF) ; &I-B-CDBF; )) (define-char - '((=>ucs . #x82A8) ; 芨 + '((<-denotational + ((=ucs . #x82A8) ; 芨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) (=cns11643-2 . #x285F) ; &M-30719; [08-63] (=daikanwa . 30719) ; &I-M-30719; + (=jef-china3 . #x61C8) ; &I-JC3-61C8; )) (define-char - '((morohashi-daikanwa 30719 0 2) + '((<-denotational + ((=ucs . #x82A8) ; 芨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82A8) ; 芨 - (=gb2312 . #x5C38) ; &I-G0-5C38; [60-24] - (=jis-x0212 . #x5742) ; &I-JSP-5742; [55-34] + (=gb2312 . #x5C38) ; &G0-5C38; [60-24] + (=ucs@unicode . #x82A8) ; &G0-5C38; + )) +(define-char + '((<-denotational + ((=ucs . #x82A8) ; 芨 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=jis-x0212 . #x5742) ; &JX2-757E; [55-34] (=jis-x0213-2 . #x757E) ; &I-JX2-757E; [85-94] - (=big5 . #xCDBF) ; &I-B-CDBF; + (=ucs@jis . #x82A8) ; &JX2-757E; )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -2102,29 +2149,91 @@ (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 8) (=ucs . #x449F) ; 䒟 - (=cns11643-3 . #x2A62) ; &I-C3-2A62; [10-66] - (=daikanwa . 30721) ; &I-M-30721; )) (define-char - '((ideographic-radical . 140) ; ⾋ + '((<-denotational + ((=ucs . #x449F) ; 䒟 + )) + (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=ucs . #x44A0) ; 䒠 - (=cns11643-4 . #x2821) ; &I-C4-2821; [08-01] - (=daikanwa . 30722) ; &I-M-30722; + (->subsumptive + ((=daikanwa . 30721) ; &M-30721; + ) + ((=cns11643-3 . #x2A62) ; &C3-2A62; [10-66] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x449F) ; 䒟 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=ucs@unicode . #x449F) ; &UU+449F; )) (define-char '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) + (=ucs . #x44A0) ; 䒠 + )) +(define-char + '((<-denotational + ((=ucs . #x44A0) ; 䒠 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) (total-strokes . 8) + (->subsumptive + ((=daikanwa . 30722) ; &M-30722; + ) + ((=cns11643-4 . #x2821) ; &C4-2821; [08-01] + )) + )) +(define-char + '((<-denotational + ((=ucs . #x44A0) ; 䒠 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=ucs@unicode . #x44A0) ; &UU+44A0; + )) +(define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) (=ucs . #x44A1) ; 䒡 - (=cns11643-4 . #x2773) ; &I-C4-2773; [07-83] + )) +(define-char + '((<-denotational + ((=ucs . #x44A1) ; 䒡 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 8) + (=cns11643-4 . #x2773) ; &M-30723; [07-83] (=daikanwa . 30723) ; &I-M-30723; )) (define-char - '((=>ucs . #x82A9) ; 芩 + '((<-denotational + ((=ucs . #x44A1) ; 䒡 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=ucs@unicode . #x44A1) ; &UU+44A1; + )) +(define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (=ucs . #x82A9) ; 芩 + (=big5 . #xCDC1) ; &I-B-CDC1; + )) +(define-char + '((<-denotational + ((=ucs . #x82A9) ; 芩 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) @@ -2134,28 +2243,37 @@ (mojikyo . 030724) ; &MCS-60007804; )) (define-char - '((=>ucs . #x82A9) ; 芩 - (morohashi-daikanwa 30724 0 1) + '((<-denotational + ((=ucs . #x82A9) ; 芩 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (total-strokes . 7) + (=gb2312 . #x5C4B) ; &G0-5C4B; [60-43] + (=ucs@unicode . #x82A9) ; &G0-5C4B; + )) +(define-char + '((<-denotational + ((=ucs . #x82A9) ; 芩 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) (=ks-x1001 . #x5059) ; &JX1-7A62; [48-57] (=jis-x0212 . #x5743) ; &I-JSP-5743; [55-35] (=jis-x0213-1 . #x7A62) ; &I-JX1-7A62; [90-66] - (=big5 . #xCDC1) ; &I-B-CDC1; (=ucs@jis . #x82A9) ; &JX1-7A62; (=ucs@ks . #x82A9) ; &JX1-7A62; )) (define-char - '((morohashi-daikanwa 30724 0 2) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 7) - (=ucs . #x82A9) ; 芩 - (=gb2312 . #x5C4B) ; &I-G0-5C4B; [60-43] + (=ucs . #x82AA) ; 芪 )) (define-char - '((=>ucs . #x82AA) ; 芪 + '((<-denotational + ((=ucs . #x82AA) ; 芪 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) @@ -2163,15 +2281,17 @@ (=daikanwa . 30725) ; &I-M-30725; )) (define-char - '((morohashi-daikanwa 30725 0 2) + '((<-denotational + ((=ucs . #x82AA) ; 芪 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) (hanyu-dazidian 5 3183 6) - (=ucs . #x82AA) ; 芪 - (=gb2312 . #x5C4E) ; &I-G0-5C4E; [60-46] + (=gb2312 . #x5C4E) ; &HZK08-E9A3; [60-46] (=jis-x0212 . #x5744) ; &I-JSP-5744; [55-36] (=hanziku-8 . #xE9A3) ; &I-HZK08-E9A3; + (=ucs@unicode . #x82AA) ; &HZK08-E9A3; )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -2184,7 +2304,15 @@ (=hanziku-8 . #xE8DB) ; &I-HZK08-E8DB; )) (define-char - '((=>ucs . #x82AB) ; 芫 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (=ucs . #x82AB) ; 芫 + (=big5 . #xCDB4) ; &I-B-CDB4; + )) +(define-char + '((<-denotational + ((=ucs . #x82AB) ; 芫 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) @@ -2192,55 +2320,57 @@ (=daikanwa . 30727) ; &I-M-30727; )) (define-char - '((morohashi-daikanwa 30727 0 2) + '((<-denotational + ((=ucs . #x82AB) ; 芫 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82AB) ; 芫 - (=jis-x0208 . #x676B) ; &I-J90-676B; [71-75] + (=jis-x0208 . #x676B) ; >-39736; [71-75] (=gb2312 . #x5C3E) ; &I-G0-5C3E; [60-30] (=jis-x0213-1 . #x676B) ; &I-JX1-676B; [71-75] - (=big5 . #xCDB4) ; &I-B-CDB4; (=gt . 39736) ; &I-GT-39736; (=gt-pj-1 . #x676B) ; &I-GT-39736; [71-75] + (=ucs@unicode . #x82AB) ; >-39736; )) (define-char - '((=>ucs . #x82AC) ; 芬 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 8) - (=daikanwa . 30728) ; &M-30728; + (=ucs . #x82AC) ; 芬 + (=big5 . #xAAE2) ; &I-B-AAE2; )) (define-char - '((=>ucs . #x82AC) ; 芬 - (morohashi-daikanwa 30728 0 0) + '((<-denotational + ((=ucs . #x82AC) ; 芬 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=cns11643-1 . #x4F45) ; &C1-4F45; [47-37] - )) -(define-char - '((=>ucs . #x82AC) ; 芬 - (morohashi-daikanwa 30728 0 1) - (ideographic-radical . 140) ; ⾋ - (ideographic-strokes . 4) - (total-strokes . 7) - (=jis-x0208 . #x676E) ; >-39810; [71-78] - (=ks-x1001 . #x5D52) ; &I-K0-5D52; [61-50] - (=jis-x0213-1 . #x676E) ; &I-JX1-676E; [71-78] - (=big5 . #xAAE2) ; &I-B-AAE2; - (=gt . 39810) ; &I-GT-39810; - (=gt-k . 02728) ; &I-GT-K02728; - (=gt-pj-1 . #x676E) ; &I-GT-39810; [71-78] - (=ucs@jis . #x82AC) ; >-39810; + (->subsumptive + ((=daikanwa . 30728) ; &M-30728; + ) + ((=cns11643-1 . #x4F45) ; &C1-4F45; [47-37] + )) )) (define-char - '((morohashi-daikanwa 30728 0 4) + '((<-denotational + ((=ucs . #x82AC) ; 芬 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82AC) ; 芬 - (=gb2312 . #x3752) ; &I-G0-3752; [23-50] + (->subsumptive + ((=jis-x0208 . #x676E) ; >-39810; [71-78] + (=ks-x1001 . #x5D52) ; &I-K0-5D52; [61-50] + (=jis-x0213-1 . #x676E) ; &I-JX1-676E; [71-78] + (=gt . 39810) ; &I-GT-39810; + (=gt-k . 02728) ; &I-GT-K02728; + (=gt-pj-1 . #x676E) ; &I-GT-39810; [71-78] + (=ucs@jis . #x82AC) ; >-39810; + ) + ((=gb2312 . #x3752) ; &G0-3752; [23-50] + (=ucs@unicode . #x82AC) ; &G0-3752; + )) )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -2253,7 +2383,15 @@ (=hanziku-8 . #xE8BB) ; &I-HZK08-E8BB; )) (define-char - '((=>ucs . #x82AD) ; 芭 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (=ucs . #x82AD) ; 芭 + (=big5 . #xAADD) ; &I-B-AADD; + )) +(define-char + '((<-denotational + ((=ucs . #x82AD) ; 芭 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) @@ -2261,56 +2399,72 @@ (=daikanwa . 30730) ; &I-M-30730; )) (define-char - '((morohashi-daikanwa 30730 0 3) + '((<-denotational + ((=ucs . #x82AD) ; 芭 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82AD) ; 芭 - (=jis-x0208 . #x474E) ; &I-J90-474E; [39-46] + (=jis-x0208 . #x474E) ; >-39800; [39-46] (=gb2312 . #x3045) ; &I-G0-3045; [16-37] (=ks-x1001 . #x7774) ; &I-K0-7774; [87-84] (=jis-x0213-1 . #x474E) ; &I-JX1-474E; [39-46] - (=big5 . #xAADD) ; &I-B-AADD; (=gt . 39800) ; &I-GT-39800; (=gt-pj-1 . #x474E) ; &I-GT-39800; [39-46] + (=ucs@unicode . #x82AD) ; >-39800; + )) +(define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 4) + (=ucs . #x82AE) ; 芮 + (=big5 . #xCDBA) ; &I-B-CDBA; )) (define-char - '((=>ucs . #x82AE) ; 芮 + '((<-denotational + ((=ucs . #x82AE) ; 芮 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=daikanwa . 30731) ; &M-30731; + (->subsumptive + ((=daikanwa . 30731) ; &M-30731; + (=jef-china3 . #x61C9) ; &I-JC3-61C9; + ) + ((=cns11643-2 . #x285A) ; &C2-285A; [08-58] + )) )) (define-char - '((=>ucs . #x82AE) ; 芮 - (morohashi-daikanwa 30731 0 0) + '((<-denotational + ((=ucs . #x82AE) ; 芮 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 8) - (=cns11643-2 . #x285A) ; &C2-285A; [08-58] + (total-strokes . 7) + (=gb2312 . #x5C47) ; &G0-5C47; [60-39] + (=ucs@unicode . #x82AE) ; &G0-5C47; )) (define-char - '((=>ucs . #x82AE) ; 芮 - (morohashi-daikanwa 30731 0 1) + '((<-denotational + ((=ucs . #x82AE) ; 芮 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) (=ks-x1001 . #x675C) ; &JX1-7A63; [71-60] (=jis-x0212 . #x5745) ; &I-JSP-5745; [55-37] (=jis-x0213-1 . #x7A63) ; &I-JX1-7A63; [90-67] - (=big5 . #xCDBA) ; &I-B-CDBA; (=ucs@jis . #x82AE) ; &JX1-7A63; )) (define-char - '((morohashi-daikanwa 30731 0 2) - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 7) - (=ucs . #x82AE) ; 芮 - (=gb2312 . #x5C47) ; &I-G0-5C47; [60-39] + (=ucs . #x82AF) ; 芯 + (=big5 . #xAAE4) ; &I-B-AAE4; )) (define-char - '((=>ucs . #x82AF) ; 芯 + '((<-denotational + ((=ucs . #x82AF) ; 芯 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) @@ -2318,44 +2472,48 @@ (=daikanwa . 30732) ; &I-M-30732; )) (define-char - '((morohashi-daikanwa 30732 0 2) + '((<-denotational + ((=ucs . #x82AF) ; 芯 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82AF) ; 芯 - (=jis-x0208 . #x3F44) ; &I-J90-3F44; [31-36] + (=jis-x0208 . #x3F44) ; >-39782; [31-36] (=gb2312 . #x503E) ; &I-G0-503E; [48-30] (=ks-x1001 . #x6425) ; &I-K0-6425; [68-05] (=jis-x0213-1 . #x3F44) ; &I-JX1-3F44; [31-36] - (=big5 . #xAAE4) ; &I-B-AAE4; (=gt . 39782) ; &I-GT-39782; (=gt-k . 02582) ; &I-GT-K02582; (=gt-pj-1 . #x3F44) ; &I-GT-39782; [31-36] + (=ucs@unicode . #x82AF) ; >-39782; )) (define-char - '((=>ucs . #x82B0) ; 芰 - (ideographic-radical . 140) ; ⾋ + '((ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) - (total-strokes . 8) - (=daikanwa . 30733) ; &M-30733; + (=ucs . #x82B0) ; 芰 + (=big5 . #xAAE7) ; &I-B-AAE7; )) (define-char - '((=>ucs . #x82B0) ; 芰 - (morohashi-daikanwa 30733 0 0) + '((<-denotational + ((=ucs . #x82B0) ; 芰 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 8) - (=cns11643-1 . #x4F4A) ; &C1-4F4A; [47-42] + (=cns11643-1 . #x4F4A) ; &M-30733; [47-42] + (=daikanwa . 30733) ; &I-M-30733; + (=jef-china3 . #x61CA) ; &I-JC3-61CA; )) (define-char - '((morohashi-daikanwa 30733 0 2) + '((<-denotational + ((=ucs . #x82B0) ; 芰 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 4) (total-strokes . 7) - (=ucs . #x82B0) ; 芰 - (=gb2312 . #x5C41) ; &I-G0-5C41; [60-33] + (=gb2312 . #x5C41) ; &JSP-5746; [60-33] (=jis-x0212 . #x5746) ; &I-JSP-5746; [55-38] - (=big5 . #xAAE7) ; &I-B-AAE7; + (=ucs@unicode . #x82B0) ; &JSP-5746; )) (define-char '((ideographic-radical . 140) ; ⾋ @@ -6034,43 +6192,85 @@ (=big5 . #xD3B5) ; &I-B-D3B5; )) (define-char - '((=>ucs . #x8328) ; 茨 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 6) + (=ucs . #x8328) ; 茨 + (=big5 . #xAFFD) ; &I-B-AFFD; + )) +(define-char + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 10) (=daikanwa . 30896) ; &M-30896; )) (define-char - '((=>ucs . #x8328) ; 茨 - (morohashi-daikanwa 30896 0 1) + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 10) - (=cns11643-1 . #x5823) ; &C1-5823; [56-03] + (=jef-china3 . #x61B4) ; &JC3-61B4; )) (define-char - '((=>ucs . #x8328) ; 茨 - (morohashi-daikanwa 30896 0 2) + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 9) (=ks-x1001 . #x6D3C) ; &K0-6D3C; [77-28] - (=big5 . #xAFFD) ; &I-B-AFFD; )) (define-char - '((morohashi-daikanwa 30896 0 3) + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 6) + (total-strokes . 10) + (=cns11643-1 . #x5823) ; &C1-5823; [56-03] + )) +(define-char + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 9) - (=ucs . #x8328) ; 茨 - (=jis-x0208 . #x3071) ; &I-J90-3071; [16-81] - (=gb2312 . #x3444) ; &I-G0-3444; [20-36] - (=jis-x0213-1 . #x3071) ; &I-JX1-3071; [16-81] - (=gt . 40112) ; &I-GT-40112; - (=gt-pj-1 . #x3071) ; &I-GT-40112; [16-81] + (=jis-x0213-1@2004 . #x3071) ; &JX3-3071; [16-81] )) (define-char - '((=>ucs . #x8329) ; 茩 + '((<-denotational + ((=ucs . #x8328) ; 茨 + )) + (ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 6) + (total-strokes . 9) + (->subsumptive + ((=jis-x0208 . #x3071) ; &J90-3071; [16-81] + (=jis-x0213-1@2000 . #x3071) ; &I-JX1-3071; [16-81] + (=ucs@jis . #x8328) ; &J90-3071; + ) + ((=gt . 40112) ; >-40112; + (=gt-pj-1 . #x3071) ; >-40112; [16-81] + ) + ((=gb2312 . #x3444) ; &G0-3444; [20-36] + (=ucs@unicode . #x8328) ; &G0-3444; + )) + )) +(define-char + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 6) + (=ucs . #x8329) ; 茩 + (=big5 . #xD3AD) ; &I-B-D3AD; + )) +(define-char + '((<-denotational + ((=ucs . #x8329) ; 茩 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 10) @@ -6078,15 +6278,24 @@ (=daikanwa . 30897) ; &I-M-30897; )) (define-char - '((morohashi-daikanwa 30897 0 1) + '((<-denotational + ((=ucs . #x8329) ; 茩 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 9) - (=ucs . #x8329) ; 茩 - (=big5 . #xD3AD) ; &I-B-D3AD; + (=ucs@unicode . #x8329) ; &UU+8329; )) (define-char - '((=>ucs . #x832A) ; 茪 + '((ideographic-radical . 140) ; ⾋ + (ideographic-strokes . 6) + (=ucs . #x832A) ; 茪 + (=big5 . #xD3A4) ; &I-B-D3A4; + )) +(define-char + '((<-denotational + ((=ucs . #x832A) ; 茪 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 10) @@ -6094,12 +6303,13 @@ (=daikanwa . 30898) ; &I-M-30898; )) (define-char - '((morohashi-daikanwa 30898 0 1) + '((<-denotational + ((=ucs . #x832A) ; 茪 + )) (ideographic-radical . 140) ; ⾋ (ideographic-strokes . 6) (total-strokes . 9) - (=ucs . #x832A) ; 茪 - (=big5 . #xD3A4) ; &I-B-D3A4; + (=ucs@unicode . #x832A) ; &UU+832A; )) (define-char '((ideographic-radical . 140) ; ⾋ diff --git a/lisp/utf-2000/Ideograph-R156-Run.el b/lisp/utf-2000/Ideograph-R156-Run.el index 1ca5f0b..e9d6c30 100644 --- a/lisp/utf-2000/Ideograph-R156-Run.el +++ b/lisp/utf-2000/Ideograph-R156-Run.el @@ -248,6 +248,8 @@ (=gt . 49592) ; &I-GT-49592; (=gt-pj-7 . #x4441) ; &I-GT-49592; [36-33] (=shinjigen@1ed . 7960) ; >-49592; + (=shinjigen@rev . 7959) ; >-49592; + (=jef-china3 . #x66BA) ; &I-JC3-66BA; (=ucs@cns . #x8D77) ; >-49592; )) (define-char diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index 3e1fedc..a36a38b 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -270,7 +270,7 @@ (total-strokes . 6) (=daikanwa . 38706) ; &M-38706; (<-same - ((=jis-x0208@1978 . #x4B78) ; &M-38724; [43-88] + ((=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] (=daikanwa . 38724) ; &I-M-38724; )) (<-same*sources @@ -933,7 +933,8 @@ (ideographic-strokes . 3) (total-strokes . 7) (=jis-x0208@1978*sources jis-x0208@1978/i4- jis-x0208@1997) - (=jis-x0208@1978 . #x4B78) ; &M-38724; [43-88] + (=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] + (=jis-x0208@1978/4-pr . #x4B78) ; &M-38724; [43-88] (=daikanwa . 38724) ; &I-M-38724; )) (define-char @@ -943,12 +944,13 @@ (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 3) (total-strokes . 6) - (=jis-x0208@1978/i1*sources jis-x0208@1978/i-3 jis-x0208@1997) - (=gb2312 . #x4679) ; >-51666; [38-89] + (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i-4") + (=jis-x0208@1978*sources jis-x0208@1978/i-4 jis-x0208@1997) + (=jis-x0208@1978/-4pr . #x4B78) ; >-51666; [43-88] + (=gb2312 . #x4679) ; &I-G0-4679; [38-89] (=jis-x0208@1983 . #x4B78) ; &I-J83-4B78; [43-88] (=jis-x0208@1990 . #x4B78) ; &I-J90-4B78; [43-88] - (=jis-x0213-1 . #x4B78) ; &I-JX1-4B78; [43-88] - (=jis-x0208@1978/i1 . #x4B78) ; >-51666; [43-88] + (=jis-x0213-1@2000 . #x4B78) ; &I-JX1-4B78; [43-88] (=gt . 51666) ; &I-GT-51666; (=gt-k . 01691) ; &I-GT-K01691; (=gt-pj-1 . #x4B78) ; &I-GT-51666; [43-88] @@ -2371,7 +2373,7 @@ (total-strokes . 8) (=daikanwa . 38768) ; &M-38768; (<-same - ((=jis-x0208@1978 . #x4B78) ; &M-38724; [43-88] + ((=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] (=daikanwa . 38724) ; &I-M-38724; )) (<-same*sources @@ -2700,7 +2702,7 @@ (=daikanwa . 38777) ; &I-M-38777; (=ucs@jis . #x8FE0) ; &M-38777; (<-wrong@JP - ((=jis-x0208@1978 . #x4B78) ; &M-38724; [43-88] + ((=jis-x0213-1@2004 . #x4B78) ; &M-38724; [43-88] (=daikanwa . 38724) ; &I-M-38724; )) (<-wrong@JP*sources @@ -5282,8 +5284,8 @@ (=daikanwa . 38847) ; &I-M-38847; (=ucs@jis . #x9004) ; &M-38847; (->mistakable - ((=jis-x0208@1978 . #x3029) ; &M-38901; [16-09] - (=ks-x1001 . #x5C71) ; &I-K0-5C71; [60-81] + ((=ks-x1001 . #x5C71) ; &M-38901; [60-81] + (=jis-x0213-1@2004 . #x3029) ; &I-JX3-3029; [16-09] (=daikanwa . 38901) ; &I-M-38901; )) (->mistakable*sources @@ -7444,6 +7446,7 @@ (ideographic-strokes . 7) (=ucs . #x9022) ; 逢 (=big5 . #xB37B) ; &I-B-B37B; + (=jis-x0208@1997 . #x3029) ; 逢 [16-09] )) (define-char '((<-denotational @@ -7452,9 +7455,9 @@ (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 7) (total-strokes . 11) - (jisx0208-type . 78/4-) - (=jis-x0208@1978 . #x3029) ; &M-38901; [16-09] - (=ks-x1001 . #x5C71) ; &I-K0-5C71; [60-81] + (=ks-x1001 . #x5C71) ; &M-38901; [60-81] + (=jis-x0213-1@2004 . #x3029) ; &I-JX3-3029; [16-09] + (=jis-x0208@1978/4-pr . #x3029) ; &M-38901; [16-09] (=daikanwa . 38901) ; &I-M-38901; (=jef-china3 . #x67CA) ; &I-JC3-67CA; (<-synonyms @@ -7472,10 +7475,11 @@ (ideographic-strokes . 7) (total-strokes . 10) (jisx0208-difference . 78/4-) - (=gb2312 . #x376A) ; >-52042; [23-74] + (=jis-x0208@1978/-4pr . #x3029) ; >-52042; [16-09] + (=gb2312 . #x376A) ; &I-G0-376A; [23-74] (=jis-x0208@1983 . #x3029) ; &I-J83-3029; [16-09] (=jis-x0208@1990 . #x3029) ; &I-J90-3029; [16-09] - (=jis-x0213-1 . #x3029) ; &I-JX1-3029; [16-09] + (=jis-x0213-1@2000 . #x3029) ; &I-JX1-3029; [16-09] (=gt . 52042) ; &I-GT-52042; (=gt-k . 06727) ; &I-GT-K06727; (=gt-pj-1 . #x3029) ; &I-GT-52042; [16-09] @@ -11493,6 +11497,7 @@ (total-strokes . 13) (=ks-x1001 . #x5339) ; &M-39011; [51-25] (=daikanwa . 39011) ; &I-M-39011; + (=jef-china3 . #x67E0) ; &I-JC3-67E0; (<-same ((=daikanwa . 01179) ; &M-01179; )) @@ -12716,27 +12721,38 @@ (=cns11643-6 . #x6336) ; &C6-6336; [67-22] )) (define-char - '((=>ucs . #x905D) ; 遝 + '((ideographic-radical . 162) ; ⾡ + (ideographic-strokes . 10) + (=ucs . #x905D) ; 遝 + (=big5 . #xBBBE) ; &I-B-BBBE; + )) +(define-char + '((<-denotational + ((=ucs . #x905D) ; 遝 + )) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 10) (total-strokes . 14) (=ks-x1001 . #x534F) ; &M-39044; [51-47] (=jis-x0212 . #x615F) ; &I-JSP-615F; [65-63] (=jis-x0213-2 . #x797D) ; &I-JX2-797D; [89-93] - (=big5 . #xBBBE) ; &I-B-BBBE; (=daikanwa . 39044) ; &I-M-39044; + (=jef-china3 . #x67E3) ; &I-JC3-67E3; (=ucs@jis . #x905D) ; &M-39044; )) (define-char - '((morohashi-daikanwa 39044 0 2) + '((<-denotational + ((=ucs . #x905D) ; 遝 + )) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 10) (total-strokes . 13) - (=ucs . #x905D) ; 遝 + (=ucs@unicode . #x905D) ; &UU+905D; )) (define-char - '((=>ucs . #x905D) ; 遝 - (morohashi-daikanwa 39044 0 4) + '((<-denotational + ((=ucs . #x905D) ; 遝 + )) (ideographic-radical . 162) ; ⾡ (ideographic-strokes . 10) (total-strokes . 14) diff --git a/lisp/utf-2000/Ideograph-R169-Gate.el b/lisp/utf-2000/Ideograph-R169-Gate.el index e4f04bc..1acc470 100644 --- a/lisp/utf-2000/Ideograph-R169-Gate.el +++ b/lisp/utf-2000/Ideograph-R169-Gate.el @@ -601,17 +601,37 @@ )) )) (define-char - '((ideographic-radical . 169) ; ⾨ + '((<-denotational + ((=jis-x0208@1997 . #x313C) ; &J97-313C; [17-28] + )) + (ideographic-radical . 169) ; ⾨ (ideographic-strokes . 4) (total-strokes . 12) + (sound@ja/on/go/s=bolt "tyAu") + (sound@ja/on/kan/s=bolt "tei") + (sound@ja/on/kan/s=intercalary "zyuN") (=ucs . #x28CDD) ; 𨳝 (->subsumptive ((=daikanwa . 41243) ; &M-41243; + (<-wrong@s=intercalary + ((=daikanwa . 41244) ; &M-41244; + )) + (<-wrong@s=intercalary*sources + zhengzitong daikanwa) ) - ((=cns11643-3 . #x3F6D) ; >-55472; [31-77] - (=jis-x0208@1978/i1 . #x313C) ; >-55472; [17-28] + ((=jis-x0208@1978*note . "ISO-IR-042 = 1978/i1") + (=jis-x0208@1978/1pr . #x313C) ; &I-J78-313C; [17-28] + (=cns11643-3 . #x3F6D) ; &I-C3-3F6D; [31-77] (=gt . 55472) ; &I-GT-55472; (=gt-pj-7 . #x6E48) ; &I-GT-55472; [78-40] + (<-error@jis/x0208 + ((=jis-x0208 . #x313C) ; >-55468; [17-28] + (=ks-x1001 . #x6B4E) ; &I-K0-6B4E; [75-46] + (=cns11643-1 . #x6263) ; &I-C1-6263; [66-67] + (=jis-x0213-1 . #x313C) ; &I-JX1-313C; [17-28] + )) + (<-error@jis/x0208*sources + jis-x0208/1978/errata jis-x0208/1997) ) ((=jef-china3 . #x6BE0) ; &JC3-6BE0; ) @@ -622,6 +642,17 @@ '((ideographic-radical . 169) ; ⾨ (ideographic-strokes . 4) (total-strokes . 12) + (=jis-x0208@1997 . #x313C) ; &J97-313C; [17-28] + )) +(define-char + '((<-denotational + ((=jis-x0208@1997 . #x313C) ; &J97-313C; [17-28] + )) + (ideographic-radical . 169) ; ⾨ + (ideographic-strokes . 4) + (total-strokes . 12) + (sound@ja/on/go "niN") + (sound@ja/on/kan "zyuN") (=ucs . #x958F) ; 閏 (->subsumptive ((=daikanwa . 41244) ; &M-41244; @@ -2483,8 +2514,12 @@ (ideographic-strokes . 8) (total-strokes . 16) (=ucs . #x49A3) ; 䦣 - (=cns11643-4 . #x544C) ; &I-C4-544C; [52-44] - (=daikanwa . 41376) ; &I-M-41376; + (->subsumptive + ((=daikanwa . 41376) ; &M-41376; + ) + ((=cns11643-4 . #x544C) ; &C4-544C; [52-44] + (=ucs@unicode . #x49A3) ; &C4-544C; + )) )) (define-char '((ideographic-radical . 169) ; ⾨ @@ -2550,7 +2585,15 @@ (ideographic-radical . 169) ; ⾨ (ideographic-strokes . 8) (total-strokes . 16) - (=jis-x0208@1978/i1 . #x6F65) ; &J78i1-6F65; [79-69] + (=jis-x0208@1978*note . "ISO-IR-042 = 1978/i1") + (=jis-x0208@1978/1pr . #x6F65) ; &I-J78-6F65; [79-69] + (<-error@jis/x0208 + ((=jis-x0208 . #x6F65) ; >-55612; [79-69] + (=ks-x1001 . #x6722) ; &I-K0-6722; [71-02] + (=jis-x0213-1 . #x6F65) ; &I-JX1-6F65; [79-69] + )) + (<-error@jis/x0208*sources + jis-x0208/1978/errata jis-x0208/1997) )) (define-char '((ideographic-radical . 169) ; ⾨ diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el index 0097bf8..9ccd42d 100644 --- a/lisp/utf-2000/Ideograph-R184-Eat.el +++ b/lisp/utf-2000/Ideograph-R184-Eat.el @@ -1900,6 +1900,7 @@ '((ideographic-radical . 184) ; ⾷ (ideographic-strokes . 5) (=ucs . #x98F4) ; 飴 + (=jis-x0208@1997 . #x303B) ; 飴 [16-27] )) (define-char '((<-denotational @@ -1910,6 +1911,7 @@ (total-strokes . 14) (=jis-x0208@1978 . #x303B) ; &M-44080; [16-27] (=ks-x1001 . #x6C47) ; &I-K0-6C47; [76-39] + (=jis-x0213-1@2004 . #x303B) ; &I-JX3-303B; [16-27] (=daikanwa . 44080) ; &I-M-44080; (=shinjigen . 9250) ; &M-44080; )) @@ -1925,13 +1927,14 @@ ) ((=jis-x0208@1983 . #x303B) ; >-59108; [16-27] (=jis-x0208@1990 . #x303B) ; &I-J90-303B; [16-27] - (=jis-x0213-1 . #x303B) ; &I-JX1-303B; [16-27] + (=jis-x0213-1@2000 . #x303B) ; &I-JX1-303B; [16-27] (=gt . 59108) ; &I-GT-59108; (=gt-pj-1 . #x303B) ; &I-GT-59108; [16-27] (=ucs@jis . #x98F4) ; >-59108; (<-simplified@JP/jis ((=jis-x0208@1978 . #x303B) ; &M-44080; [16-27] (=ks-x1001 . #x6C47) ; &I-K0-6C47; [76-39] + (=jis-x0213-1@2004 . #x303B) ; &I-JX3-303B; [16-27] (=daikanwa . 44080) ; &I-M-44080; )) ) diff --git a/lisp/utf-2000/char-db-util.el b/lisp/utf-2000/char-db-util.el index 9a7e22b..b50c2ff 100644 --- a/lisp/utf-2000/char-db-util.el +++ b/lisp/utf-2000/char-db-util.el @@ -155,31 +155,58 @@ ) ((find-charset ka) (if (find-charset kb) - (if (<= (charset-id ka) 1) - (if (<= (charset-id kb) 1) + (if (or (<= (charset-id ka) 1) + (and (charset-final ka) + (>= (charset-final ka) ?@))) + (if (or (<= (charset-id kb) 1) + (and (charset-final kb) + (>= (charset-final kb) ?@))) (cond ((= (charset-dimension ka) (charset-dimension kb)) - (> (charset-id ka)(charset-id kb))) + (if (and (<= (charset-id ka) 1) + (<= (charset-id kb) 1)) + (> (charset-id ka)(charset-id kb)) + (if (and (charset-final ka) + (charset-final kb)) + (cond + ((= (charset-final ka)(charset-final kb)) + (if (<= (charset-id ka) 1) + (if (<= (charset-id kb) 1) + (> (charset-id ka)(charset-id kb)) + t) + (if (<= (charset-id kb) 1) + nil + (< (charset-id ka)(charset-id kb)))) + ) + ((< (charset-final ka)(charset-final kb)) + )) + (if (<= (charset-id ka) 1) + (if (<= (charset-id kb) 1) + (> (charset-id ka)(charset-id kb)) + t) + (if (<= (charset-id kb) 1) + nil + (cond ((and (charset-final ka) + (>= (charset-final ka) ?@)) + t) + ((and (charset-final kb) + (>= (charset-final kb) ?@)) + nil) + (t + (< (charset-id ka)(charset-id kb)) + )))))) + ) (t (> (charset-dimension ka) (charset-dimension kb)) )) t) - (if (<= (charset-id kb) 1) + (if (or (<= (charset-id kb) 1) + (and (charset-final kb) + (>= (charset-final kb) ?@))) nil - (cond - ((and (charset-final ka) - (>= (charset-final ka) ?@)) - (if (and (charset-final kb) - (>= (charset-final kb) ?@)) - (< (charset-final ka)(charset-final kb)) - t)) - ((and (charset-final kb) - (>= (charset-final kb) ?@)) - nil) - (t - (< (charset-id ka)(charset-id kb)))))) + (< (charset-id ka)(charset-id kb)))) nil)) ((find-charset kb) t) diff --git a/lisp/utf-2000/maps-conf.el b/lisp/utf-2000/maps-conf.el index 9aba83e..03d16ed 100644 --- a/lisp/utf-2000/maps-conf.el +++ b/lisp/utf-2000/maps-conf.el @@ -60,7 +60,8 @@ ;; #x4337 #x492D #x3F6C #x6E4D #x4F3F ;; #x353D #x4324 #x475B #x6E47 #x4371 ;; #x3F5D #x6E49 #x4D6F #x3C72 #x3D37 -;; #x6E4C #x3B44 #x734E #x5567 #x545A)) +;; #x6E4C #x3B44 #x734E #x5567 #x545A +;; #x3071)) ;; (put-char-attribute (decode-char 'japanese-jisx0208-1990 v) ;; '=gt-pj-1 v)) ;; nil) diff --git a/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el b/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el index 5d96830..34c6ac7 100644 --- a/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el +++ b/lisp/utf-2000/u00300-Combining-Diacritical-Marks.el @@ -6,8 +6,8 @@ (mirrored . nil) (iso-10646-comment . "Varia") (=ucs . #x0300) ; ̀ - (latin-tcvn5712 . #xB0) ; &I-VSCII2-30; (=jis-x0213-1 . #x2B5C) ; &I-JX1-2B5C; [11-60] + (latin-tcvn5712 . #xB0) ; &I-VSCII2-30; )) (define-char '((name . "COMBINING ACUTE ACCENT") @@ -16,8 +16,8 @@ (mirrored . nil) (iso-10646-comment . "Oxia") (=ucs . #x0301) ; ́ - (latin-tcvn5712 . #xB3) ; &I-VSCII2-33; (=jis-x0213-1 . #x2B5A) ; &I-JX1-2B5A; [11-58] + (latin-tcvn5712 . #xB3) ; &I-VSCII2-33; )) (define-char '((name . "COMBINING CIRCUMFLEX ACCENT") @@ -33,8 +33,8 @@ (bidi-category . "NSM") (mirrored . nil) (=ucs . #x0303) ; ̃ - (latin-tcvn5712 . #xB2) ; &I-VSCII2-32; (=jis-x0213-1 . #x2B7D) ; &I-JX1-2B7D; [11-93] + (latin-tcvn5712 . #xB2) ; &I-VSCII2-32; )) (define-char '((name . "COMBINING MACRON") diff --git a/src/ChangeLog b/src/ChangeLog index 566f329..4bb5829 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +2008-09-27 MORIOKA Tomohiko + + * concord.c (func_for_each_object): Fix bug about GC-protection. + +2008-09-03 MORIOKA Tomohiko + + * concord.c (Fconcord_object_put): Check argument FEATURE is a + symbol. + +2008-09-18 MORIOKA Tomohiko + + * text-coding.c (struct decoding_stream): Add new member + `bom_flag' in XEmacs CHISE. + (reset_decoding_stream): Ignore U+FEFF in the beginning of stream + in XEmacs CHISE. + +2008-09-14 MORIOKA Tomohiko + + * mule-charset.c: Move definition of `=jis-x0208@1978' to + lisp/mule/mule-conf.el. + 2008-09-03 MORIOKA Tomohiko * mule-charset.c (Qpartial): New variable in XEmacs CHISE. diff --git a/src/concord.c b/src/concord.c index 06dc3b5..73b6047 100644 --- a/src/concord.c +++ b/src/concord.c @@ -1,5 +1,5 @@ /* XEmacs routines to deal with CONCORD. - Copyright (C) 2005,2006 MORIOKA Tomohiko + Copyright (C) 2005,2006,2008 MORIOKA Tomohiko This file is part of XEmacs. @@ -718,6 +718,7 @@ Store a VALUE of OBJECT's FEATURE. Bufbyte *name_str; CHECK_CONCORD_OBJECT (object); + CHECK_SYMBOL (feature); name = symbol_name (XSYMBOL (feature)); name_str = string_data (name); if ( NILP (concord_object_put (object, feature, value)) ) @@ -894,7 +895,7 @@ func_for_each_object (CONCORD_String object_id, CONCORD_Feature feature, CONCORD_String value) { - struct gcpro gcpro1, gcpro2, gcpro3; + struct gcpro gcpro1, gcpro2; Lisp_Object obj, val, ret; #if 0 @@ -911,7 +912,6 @@ func_for_each_object (CONCORD_String object_id, obj = Fconcord_make_object (for_each_object_closure->genre, obj, for_each_object_closure->ds); - UNGCPRO; #if 0 val = read_from_c_string (CONCORD_String_data (value), CONCORD_String_size (value) ); @@ -922,7 +922,8 @@ func_for_each_object (CONCORD_String object_id, Qfile_name), Qnil, Qnil)); #endif - GCPRO3 (obj, val, ret); + UNGCPRO; + GCPRO2 (obj, val); ret = call2 (for_each_object_closure->function, obj, val); UNGCPRO; for_each_object_closure->ret = ret; diff --git a/src/mule-charset.c b/src/mule-charset.c index e039037..e7127a7 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -57,7 +57,7 @@ Lisp_Object Vcharset_katakana_jisx0201; Lisp_Object Vcharset_latin_jisx0201; Lisp_Object Vcharset_cyrillic_iso8859_5; Lisp_Object Vcharset_latin_iso8859_9; -Lisp_Object Vcharset_japanese_jisx0208_1978; +/* Lisp_Object Vcharset_japanese_jisx0208_1978; */ Lisp_Object Vcharset_chinese_gb2312; Lisp_Object Vcharset_chinese_gb12345; Lisp_Object Vcharset_japanese_jisx0208; @@ -387,7 +387,7 @@ Lisp_Object Qascii, Qlatin_jisx0201, Qcyrillic_iso8859_5, Qlatin_iso8859_9, - Qrep_jis_x0208_1978, +/* Qrep_jis_x0208_1978, */ Qrep_gb2312, Qrep_gb12345, Qrep_jis_x0208_1983, @@ -3083,7 +3083,7 @@ syms_of_mule_charset (void) defsymbol (&Qlatin_jisx0201, "latin-jisx0201"); defsymbol (&Qcyrillic_iso8859_5, "cyrillic-iso8859-5"); defsymbol (&Qlatin_iso8859_9, "latin-iso8859-9"); - defsymbol (&Qrep_jis_x0208_1978, "=jis-x0208@1978"); + /* defsymbol (&Qrep_jis_x0208_1978, "=jis-x0208@1978"); */ defsymbol (&Qrep_gb2312, "=gb2312"); defsymbol (&Qrep_gb12345, "=gb12345"); defsymbol (&Qrep_jis_x0208_1983, "=jis-x0208@1983"); @@ -3408,6 +3408,7 @@ complex_vars_of_mule_charset (void) Qnil, CONVERSION_94x94, 1); #endif +#if 0 staticpro (&Vcharset_japanese_jisx0208_1978); Vcharset_japanese_jisx0208_1978 = make_charset (LEADING_BYTE_JAPANESE_JISX0208_1978, @@ -3426,6 +3427,7 @@ complex_vars_of_mule_charset (void) #endif CONVERSION_IDENTICAL, 0); +#endif staticpro (&Vcharset_chinese_gb2312); Vcharset_chinese_gb2312 = make_charset (LEADING_BYTE_CHINESE_GB2312, Qrep_gb2312, 94, 2, diff --git a/src/text-coding.c b/src/text-coding.c index b28c2d7..79c9dcb 100644 --- a/src/text-coding.c +++ b/src/text-coding.c @@ -2320,6 +2320,7 @@ struct decoding_stream unsigned char counter; #endif #ifdef UTF2000 + char bom_flag; unsigned char er_counter; unsigned char er_buf[ER_BUF_SIZE]; @@ -2464,6 +2465,7 @@ reset_decoding_stream (struct decoding_stream *str) str->counter = 0; #endif /* MULE */ #ifdef UTF2000 + str->bom_flag = 0; str->er_counter = 0; str->combined_char_count = 0; str->combining_table = Qnil; @@ -4504,6 +4506,7 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, eol_type_t eol_type = str->eol_type; unsigned char counter = str->counter; #ifdef UTF2000 + int bom_flag = str->bom_flag; Lisp_Object ccs = CODING_SYSTEM_ISO2022_INITIAL_CHARSET (DECODING_STREAM_DATA (decoding)->codesys, 0); @@ -4519,11 +4522,20 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, COMPOSE_FLUSH_CHARS (str, dst); decode_flush_er_chars (str, dst); DECODE_HANDLE_EOL_TYPE (eol_type, c, flags, dst); + + if ( bom_flag == 0 ) + bom_flag = -1; + DECODE_ADD_UCS_CHAR (c, dst); } else if ( c < 0xC0 ) - /* decode_add_er_char (str, c, dst); */ - COMPOSE_ADD_CHAR (str, c, dst); + { + if ( bom_flag == 0 ) + bom_flag = -1; + + /* decode_add_er_char (str, c, dst); */ + COMPOSE_ADD_CHAR (str, c, dst); + } else { /* decode_flush_er_chars (str, dst); */ @@ -4561,6 +4573,17 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, { Emchar char_id; + if ( bom_flag == 0 ) + { + if ( cpos == 0xFEFF ) + { + bom_flag = 1; + goto decoded; + } + else + bom_flag = -1; + } + if (!NILP (ccs)) { char_id = decode_defined_char (ccs, cpos, 0); @@ -4571,6 +4594,7 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, else char_id = cpos; COMPOSE_ADD_CHAR (str, char_id, dst); + decoded: cpos = 0; counter = 0; } @@ -4603,6 +4627,9 @@ decode_coding_utf8 (Lstream *decoding, const Extbyte *src, str->flags = flags; str->cpos = cpos; str->counter = counter; +#ifdef UTF2000 + str->bom_flag = bom_flag; +#endif } void