From 83dc988fcc54971435576e732723d1d3d0c9c6c9 Mon Sep 17 00:00:00 2001 From: tomo Date: Tue, 26 Aug 2003 03:43:03 +0000 Subject: [PATCH] Sync up with r21-4-12-chise-0_21-pre6. --- lisp/utf-2000/ChangeLog | 25 ++++++++ lisp/utf-2000/Ideograph-R162-Walk.el | 1 + lisp/utf-2000/Ideograph-R163-City.el | 1 + lisp/utf-2000/Ideograph-R167-Gold.el | 73 +++++++++++++++++---- lisp/utf-2000/Ideograph-R170-Mound.el | 23 ++++++- lisp/utf-2000/Ideograph-R184-Eat.el | 13 +++- lock/.precious | 1 - src/s/cygwin.sc | 112 --------------------------------- 8 files changed, 120 insertions(+), 129 deletions(-) delete mode 100644 lock/.precious delete mode 100755 src/s/cygwin.sc diff --git a/lisp/utf-2000/ChangeLog b/lisp/utf-2000/ChangeLog index 5409aa7..5d96e24 100644 --- a/lisp/utf-2000/ChangeLog +++ b/lisp/utf-2000/ChangeLog @@ -1,3 +1,28 @@ +2003-08-23 MORIOKA Tomohiko + + * Ideograph-R167-Gold.el (M-40693): Separate J0-3379, C2-637E and + U+938C. + (C2-6430): Separate U+938D. + (U+938E): Separate C2-6427. + (JX2-7B3A): Separate G0-764C, C2-602A and U+938F; fix + `total-strokes'. + (M-40698): Separate C3-5940 and U+9390. + +2003-08-22 MORIOKA Tomohiko + + * Ideograph-R184-Eat.el (M-44237): Unify JC3-6DBE. + (J0-345B): Separate G1-395D and U+9928. + + * Ideograph-R170-Mound.el (J0-3E63): Separate G0-554F, C1-6B62 and + U+969C. + (JC3-68D3): New character. + + * Ideograph-R163-City.el (U+FA26): Unify JC3-68A8. + +2003-08-22 MORIOKA Tomohiko + + * Ideograph-R162-Walk.el (M-38727): Unify JC3-67A8. + 2003-08-21 MORIOKA Tomohiko * Ideograph-R154-Shell.el (M-36750): Unify JC3-65F3. diff --git a/lisp/utf-2000/Ideograph-R162-Walk.el b/lisp/utf-2000/Ideograph-R162-Walk.el index 5404060..79ad09f 100644 --- a/lisp/utf-2000/Ideograph-R162-Walk.el +++ b/lisp/utf-2000/Ideograph-R162-Walk.el @@ -538,6 +538,7 @@ (ideographic-strokes . 3) (total-strokes . 7) (=daikanwa . 38727) ; ø¸‰‡ + (=jef-china3 . #x67A8) ; øº†ž¨ )) (define-char '((=>ucs . #x8FC5) ; 迅 diff --git a/lisp/utf-2000/Ideograph-R163-City.el b/lisp/utf-2000/Ideograph-R163-City.el index 4d618cc..6a6de9b 100644 --- a/lisp/utf-2000/Ideograph-R163-City.el +++ b/lisp/utf-2000/Ideograph-R163-City.el @@ -2631,6 +2631,7 @@ (=ks-x1001 . #x5434) ; ø»‰¥™ (=jis-x0213-1-2000 . #x7C6A) ; ø»¤™¯ (=daikanwa . 39509) ; ø¸‰©• + (=jef-china3 . #x68A8) ; øº†¢¨ (=ucs@ks . #x90FD) ; 都 (=ucs . #xFA26) ; 都 )) diff --git a/lisp/utf-2000/Ideograph-R167-Gold.el b/lisp/utf-2000/Ideograph-R167-Gold.el index 1cdcc98..abe26ec 100644 --- a/lisp/utf-2000/Ideograph-R167-Gold.el +++ b/lisp/utf-2000/Ideograph-R167-Gold.el @@ -7032,41 +7032,78 @@ (=ucs . #x938B) ; 鎋 )) (define-char - '((ideographic-radical . 167) ; ⾦ + '((=>ucs . #x938C) ; 鎌 + (ideographic-radical . 167) ; ⾦ (ideographic-strokes . 10) (total-strokes . 18) - (=jis-x0208 . #x3379) ; ø½Š‘° (=ks-x1001 . #x4C47) ; ø»‰™¼ - (=cns11643-2 . #x637E) ; ø»”®¹ (=daikanwa . 40693) ; ø¸‰»µ + )) +(define-char + '((morohashi-daikanwa 40693 0 0) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) + (=jis-x0208 . #x3379) ; ø½Š‘° + (=cns11643-2 . #x637E) ; ø»”®¹ (=ucs . #x938C) ; 鎌 )) (define-char - '((ideographic-radical . 167) ; ⾦ + '((=>ucs . #x938D) ; 鎍 + (ideographic-radical . 167) ; ⾦ (ideographic-strokes . 10) (total-strokes . 18) (=jis-x0212 . #x652A) ; ø»Œˆ‘ (=cns11643-2 . #x6430) ; ø»”¯‰ (=daikanwa . 40694) ; ø¸‰»¶ + (=ucs@jis . #x938D) ; ø»Œˆ‘ + )) +(define-char + '((morohashi-daikanwa 40694 0 0) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) (=ucs . #x938D) ; 鎍 )) (define-char '((ideographic-radical . 167) ; ⾦ (ideographic-strokes . 10) (total-strokes . 18) - (=cns11643-2 . #x6427) ; ø»”¯€ (=daikanwa . 40695) ; ø¸‰»· (=ucs . #x938E) ; 鎎 )) (define-char - '((ideographic-radical . 167) ; ⾦ + '((=>ucs . #x938E) ; 鎎 + (morohashi-daikanwa 40695 0 0) + (ideographic-radical . 167) ; ⾦ (ideographic-strokes . 10) - (total-strokes . 17) - (=gb2312 . #x764C) ; ø»†ƒ¥ + (total-strokes . 18) + (=cns11643-2 . #x6427) ; ø»”¯€ + )) +(define-char + '((=>ucs . #x938F) ; 鎏 + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) (=jis-x0212 . #x652B) ; ø»Œˆ’ - (=cns11643-2 . #x602A) ; ø»”©‹ (=jis-x0213-2-2000 . #x7B3A) ; ø»¦¡¥ (=daikanwa . 40696) ; ø¸‰»¸ + (=ucs@jis . #x938F) ; ø»Œˆ’ + )) +(define-char + '((=>ucs . #x938F) ; 鎏 + (morohashi-daikanwa 40696 0 0) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 9) + (total-strokes . 17) + (=cns11643-2 . #x602A) ; ø»”©‹ + )) +(define-char + '((morohashi-daikanwa 40696 0 1) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) + (=gb2312 . #x764C) ; ø»†ƒ¥ (=ucs . #x938F) ; 鎏 )) (define-char @@ -7077,11 +7114,25 @@ (=daikanwa . 40697) ; ø¸‰»¹ )) (define-char - '((ideographic-radical . 167) ; ⾦ + '((=>ucs . #x9390) ; 鎐 + (ideographic-radical . 167) ; ⾦ (ideographic-strokes . 10) (total-strokes . 18) - (=cns11643-3 . #x5940) ; ø»–©“ (=daikanwa . 40698) ; ø¸‰»º + )) +(define-char + '((=>ucs . #x9390) ; 鎐 + (morohashi-daikanwa 40698 0 0) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) + (=cns11643-3 . #x5940) ; ø»–©“ + )) +(define-char + '((morohashi-daikanwa 40698 0 5) + (ideographic-radical . 167) ; ⾦ + (ideographic-strokes . 10) + (total-strokes . 18) (=ucs . #x9390) ; 鎐 )) (define-char diff --git a/lisp/utf-2000/Ideograph-R170-Mound.el b/lisp/utf-2000/Ideograph-R170-Mound.el index 3d765e4..3d4fed2 100644 --- a/lisp/utf-2000/Ideograph-R170-Mound.el +++ b/lisp/utf-2000/Ideograph-R170-Mound.el @@ -3103,18 +3103,35 @@ (=cns11643-1 . #x6B63) ; ø»’°Š )) (define-char - '((ideographic-radical . 170) ; ⾩ + '((=>ucs . #x969C) ; 障 + (ideographic-radical . 170) ; ⾩ (ideographic-strokes . 11) (total-strokes . 14) (shinjigen-2 . 8926) - (=gb2312 . #x554F) ; ø»…“Š (=jis-x0208 . #x3E63) ; ø½Š¡¤ (=ks-x1001 . #x6E21) ; ø»Š‹’ - (=cns11643-1 . #x6B62) ; ø»’°‰ (=daikanwa . 41821) ; ø¸Š + (=ucs@jis . #x969C) ; ø½Š¡¤ + )) +(define-char + '((morohashi-daikanwa 41821 0 0) + (ideographic-radical . 170) ; ⾩ + (ideographic-strokes . 11) + (total-strokes . 14) + (shinjigen-2 . 8926) + (=gb2312 . #x554F) ; ø»…“Š + (=cns11643-1 . #x6B62) ; ø»’°‰ (=ucs . #x969C) ; 障 )) (define-char + '((=>ucs . #x969C) ; 障 + (morohashi-daikanwa 41821 0 1) + (ideographic-radical . 170) ; ⾩ + (ideographic-strokes . 11) + (total-strokes . 14) + (=jef-china3 . #x68D3) ; øº†£“ + )) +(define-char '((=>ucs . #x28EFA) ; 𨻺 (ideographic-radical . 170) ; ⾩ (ideographic-strokes . 11) diff --git a/lisp/utf-2000/Ideograph-R184-Eat.el b/lisp/utf-2000/Ideograph-R184-Eat.el index c46e9c9..a52fc6b 100644 --- a/lisp/utf-2000/Ideograph-R184-Eat.el +++ b/lisp/utf-2000/Ideograph-R184-Eat.el @@ -3772,20 +3772,29 @@ (total-strokes . 17) (=ks-x1001 . #x4E3D) ; ø»‰œ® (=daikanwa . 44237) ; ø¸Š³ + (=jef-china3 . #x6DBE) ; øº†¶¾ )) (define-char - '((morohashi-daikanwa 44237 1) + '((=>ucs . #x9928) ; 館 + (morohashi-daikanwa 44237 1) (ideographic-radical . 184) ; â¾· (ideographic-strokes . 8) (total-strokes . 16) (=jis-x0208 . #x345B) ; ø½Š’° + (=ucs@jis . #x9928) ; ø½Š’° + )) +(define-char + '((morohashi-daikanwa 44237 1 0) + (ideographic-radical . 184) ; â¾· + (ideographic-strokes . 8) + (total-strokes . 16) (=gb12345 . #x395D) ; 館 (mojikyo . 050588) ; ý €Œ–œ (=ucs . #x9928) ; 館 )) (define-char '((=>ucs . #x9928) ; 館 - (morohashi-daikanwa 44237 1 0) + (morohashi-daikanwa 44237 1 1) (ideographic-radical . 184) ; â¾· (ideographic-strokes . 8) (total-strokes . 16) diff --git a/lock/.precious b/lock/.precious deleted file mode 100644 index 1650a2e..0000000 --- a/lock/.precious +++ /dev/null @@ -1 +0,0 @@ -Dummy file to keep CVS happy. diff --git a/src/s/cygwin.sc b/src/s/cygwin.sc deleted file mode 100755 index ad54ac7..0000000 --- a/src/s/cygwin.sc +++ /dev/null @@ -1,112 +0,0 @@ -/* Default linker script, for normal executables */ -OUTPUT_FORMAT(pei-i386) -SEARCH_DIR("/usr/i686-pc-cygwin/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/lib/w32api"); -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(SORT(.ctors.*)); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(SORT(.dtors.*)); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - etext = .; - *(.gcc_except_table) - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - ___RUNTIME_PSEUDO_RELOC_LIST__ = .; - __RUNTIME_PSEUDO_RELOC_LIST__ = .; - *(.rdata_runtime_pseudo_reloc) - ___RUNTIME_PSEUDO_RELOC_LIST_END__ = .; - __RUNTIME_PSEUDO_RELOC_LIST_END__ = .; - } - .pdata BLOCK(__section_alignment__) : - { - *(.pdata) - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .endjunk BLOCK(__section_alignment__) : - { - /* end is deprecated, don't use it */ - end = .; - _end = .; - __end__ = .; - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } -} -- 1.7.10.4