diff --git a/leim/CXTERM-DIC/4Corner.tit b/leim/CXTERM-DIC/4Corner.tit index 9457dd88386..eb78a54d71c 100644 Binary files a/leim/CXTERM-DIC/4Corner.tit and b/leim/CXTERM-DIC/4Corner.tit differ diff --git a/leim/CXTERM-DIC/ARRAY30.tit b/leim/CXTERM-DIC/ARRAY30.tit index f29c8e479d7..5480656b049 100644 Binary files a/leim/CXTERM-DIC/ARRAY30.tit and b/leim/CXTERM-DIC/ARRAY30.tit differ diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit index 97dfe89f1a1..b44d9f385fd 100644 Binary files a/leim/CXTERM-DIC/CCDOSPY.tit and b/leim/CXTERM-DIC/CCDOSPY.tit differ diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit index 7a8d68aa755..65d8dcec0be 100644 Binary files a/leim/CXTERM-DIC/PY-b5.tit and b/leim/CXTERM-DIC/PY-b5.tit differ diff --git a/leim/CXTERM-DIC/QJ-b5.tit b/leim/CXTERM-DIC/QJ-b5.tit index 9ab03e83a47..b42f3fd005c 100644 Binary files a/leim/CXTERM-DIC/QJ-b5.tit and b/leim/CXTERM-DIC/QJ-b5.tit differ diff --git a/leim/CXTERM-DIC/QJ.tit b/leim/CXTERM-DIC/QJ.tit index fafeea4b866..1c4d0fd0d65 100644 Binary files a/leim/CXTERM-DIC/QJ.tit and b/leim/CXTERM-DIC/QJ.tit differ diff --git a/leim/CXTERM-DIC/README b/leim/CXTERM-DIC/README index 34853091cf5..cc29fcbeb52 100644 --- a/leim/CXTERM-DIC/README +++ b/leim/CXTERM-DIC/README @@ -5,9 +5,10 @@ into these four groups. (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) QJ.tit (copied from .../cxterm/dict/gb/QJ.tit) -They are verbatim copies of those included in the directory -contrib/clients/cxterm of the distribution of X11R6. Each file -contains a license notice. +They are copies of the files included in the directory +contrib/clients/cxterm of the distribution of X11R6, except that a +"-*- coding: " line was prepended to each file, and RCS Id lines were +removed. Each file contains a license notice. (2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit) PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit) @@ -15,9 +16,10 @@ contains a license notice. TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit) They are copies of those included in the directory -contrib/clients/cxterm of the distribution of X11R6. As the original -files don't contain copyright and license notices, a proper notice is -extracted from .../cxterm/README and added at the head of each file. +contrib/clients/cxterm of the distribution of X11R6. +RCS Id lines were removed. As the original files don't contain +copyright and license notices, a proper notice was extracted from +.../cxterm/README and prepended to each file. (3) 4Corner.tit ARRAY30.tit @@ -25,8 +27,10 @@ extracted from .../cxterm/README and added at the head of each file. ZOZY.tit They are versions modified by the original authors from those -distributed with X11R5 to include proper copyright notices. Each file -contains a license notice. +distributed with X11R6 in .../cxterm/dict/big5, to include proper +copyright and license notices. ETZY.tit and ZOZY.tit were further +modified from the X11R6 version. Also, a "-*- coding: " line was +prepended to each file, and RCS Id lines were removed. (4) ECDICT.tit, Punct-b5.tit, Punct.tit diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit index 5e8fadfba42..0589f222d74 100644 Binary files a/leim/CXTERM-DIC/SW.tit and b/leim/CXTERM-DIC/SW.tit differ diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit index ddba1d378d1..44712222047 100644 Binary files a/leim/CXTERM-DIC/TONEPY.tit and b/leim/CXTERM-DIC/TONEPY.tit differ diff --git a/leim/ChangeLog b/leim/ChangeLog index fa1612ab034..a28df28a6dd 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,20 @@ +2013-12-27 Paul Eggert + + Sync better from sources. + * CXTERM-DIC/ARRAY30.tit, CXTERM-DIC/4Corner.tit: + * CXTERM-DIC/QJ.tit, CXTERM-DIC/QJ-b5.tit: + Omit blank lines not present in the original. + * CXTERM-DIC/CCDOSPY.tit: + * CXTERM-DIC/PY-b5.tit: + * CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: + * MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: + Clarify which header lines were added for Emacs. + * CXTERM-DIC/README: + Clarify what changes we made, and where the files came from. + * MISC-DIC/README, MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: + Update URLs. + * SKK-DIC/SKK-JISYO.L: Update from upstream. + 2013-12-16 Paul Eggert Fix problems with CANNOT_DUMP and EMACSLOADPATH. diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README index cea30b350fe..74ae75289b2 100644 --- a/leim/MISC-DIC/README +++ b/leim/MISC-DIC/README @@ -10,8 +10,8 @@ Wittern himself. Each file contains a license notice. (2) CTLau.html CTLau-b5.html -They are verbatim copies of those distributed at the author's home -page . Each file contains a +They are verbatim copies of those distributed by the author; they used to +be at . Each file contains a license notice. (3) pinyin.map @@ -19,8 +19,8 @@ license notice. They are copies of those distributed with a free package called CCE at: - http://ftp.debian.org/debian/dists/potato/main - /source/utils/cce_0.36.orig.tar.gz + + http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz As the original files don't contain copyright and license notices, a proper notice is extracted from the file Copyright and added at the diff --git a/leim/MISC-DIC/pinyin.map b/leim/MISC-DIC/pinyin.map index 6439c41d687..6c2117713b5 100644 Binary files a/leim/MISC-DIC/pinyin.map and b/leim/MISC-DIC/pinyin.map differ diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin index e33388314ec..13a63fd7335 100644 Binary files a/leim/MISC-DIC/ziranma.cin and b/leim/MISC-DIC/ziranma.cin differ diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L index f02c5658f2a..e81ccdedc71 100644 Binary files a/leim/SKK-DIC/SKK-JISYO.L and b/leim/SKK-DIC/SKK-JISYO.L differ