[Emacs-diffs] trunk r115764: Sync better from sources.

[Paul Eggert]

------------------------------------------------------------
revno: 115764
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-26 19:25:43 -0800
message:
  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.
modified:
  leim/CXTERM-DIC/4Corner.tit    
4corner.tit-20091113204419-o5vbwnq5f7feedwu-1639
  leim/CXTERM-DIC/ARRAY30.tit    
array30.tit-20091113204419-o5vbwnq5f7feedwu-1640
  leim/CXTERM-DIC/CCDOSPY.tit    
ccdospy.tit-20091113204419-o5vbwnq5f7feedwu-1641
  leim/CXTERM-DIC/PY-b5.tit      pyb5.tit-20091113204419-o5vbwnq5f7feedwu-1646
  leim/CXTERM-DIC/QJ-b5.tit      qjb5.tit-20091113204419-o5vbwnq5f7feedwu-1650
  leim/CXTERM-DIC/QJ.tit         qj.tit-20091113204419-o5vbwnq5f7feedwu-1651
  leim/CXTERM-DIC/README         readme-20091113204419-o5vbwnq5f7feedwu-4442
  leim/CXTERM-DIC/SW.tit         sw.tit-20091113204419-o5vbwnq5f7feedwu-1652
  leim/CXTERM-DIC/TONEPY.tit     tonepy.tit-20091113204419-o5vbwnq5f7feedwu-1653
  leim/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1629
  leim/MISC-DIC/README           readme-20091113204419-o5vbwnq5f7feedwu-4443
  leim/MISC-DIC/pinyin.map       pinyin.map-20091113204419-o5vbwnq5f7feedwu-2182
  leim/MISC-DIC/ziranma.cin      
ziranma.cin-20091113204419-o5vbwnq5f7feedwu-2183
  leim/SKK-DIC/SKK-JISYO.L       skkjisyo.l-20091113204419-o5vbwnq5f7feedwu-1658

=== modified file 'leim/CXTERM-DIC/4Corner.tit'
--- a/leim/CXTERM-DIC/4Corner.tit       2011-06-12 10:37:40 +0000
+++ b/leim/CXTERM-DIC/4Corner.tit       2013-12-27 03:25:43 +0000
@@ -6,13 +6,13 @@
 AUTOSELECT:    NO
 PROMPT:        ?|?????X::\040
 #
-COMMENT 
+COMMENT
 COMMENT Copyright (c) 2001 Christian Wittern <address@hidden>
-COMMENT 
+COMMENT
 COMMENT Permission to copy and distribute both modified and
 COMMENT unmodified versions is granted without royalty provided this
 COMMENT notice is preserved.
-COMMENT 
+COMMENT
 COMMENT        Authors: Dr. Urs App, Christian Wittern (Kyoto Univ, Japan)
 COMMENT
 COMMENT Input:  ?|?????X (address@hidden)
@@ -6676,4 +6676,3 @@
 99901  ??
 99903  ??
 99904  ?a
-

=== modified file 'leim/CXTERM-DIC/ARRAY30.tit'
--- a/leim/CXTERM-DIC/ARRAY30.tit       2011-06-12 10:37:40 +0000
+++ b/leim/CXTERM-DIC/ARRAY30.tit       2013-12-27 03:25:43 +0000
@@ -9,7 +9,7 @@
 PROMPT: ?????i???C?????j\040
 #
 COMMENT Copyright (c) 1997 by  William Yeh <address@hidden>
-COMMENT 
+COMMENT
 COMMENT Permission to copy and distribute both modified and unmodified
 COMMENT versions is granted without royalty provided this notice is preserved.
 COMMENT
@@ -13185,4 +13185,3 @@
 napa   ??                      # ---> 6v1-0^1-   0
 ,nr\040        ??                      # ---> 8v6v4^     0
 weu\040        ??                      # ---> 2^3^7^     0
-

=== modified file 'leim/CXTERM-DIC/CCDOSPY.tit'
--- a/leim/CXTERM-DIC/CCDOSPY.tit       2011-11-20 19:35:27 +0000
+++ b/leim/CXTERM-DIC/CCDOSPY.tit       2013-12-27 03:25:43 +0000
@@ -1,5 +1,4 @@
-# -*- coding: euc-china -*-
-# Header added for Emacs
+# Header added for Emacs -*- coding: euc-china -*-
 #
 # This file is included in the directory contrib/clients/cxterm of the
 # distribution of X11R6.  As the file itself doesn't contain copyright
@@ -8,7 +7,7 @@
 #
 # X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
 # X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
-# 
+#
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose is hereby granted without fee,
 # provided that this entire copyright and permission notice appear
@@ -19,7 +18,6 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
-#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
@@ -564,4 +562,3 @@
 zuj    ??????????
 zun    ??????????
 zuo    ??????????????????????????
-

=== modified file 'leim/CXTERM-DIC/PY-b5.tit'
--- a/leim/CXTERM-DIC/PY-b5.tit 2011-11-20 19:35:27 +0000
+++ b/leim/CXTERM-DIC/PY-b5.tit 2013-12-27 03:25:43 +0000
@@ -1,5 +1,4 @@
-# -*- coding: cn-big5 -*-
-# Header added for Emacs
+# Header added for Emacs -*- coding: cn-big5 -*-
 #
 # This file is included in the directory contrib/clients/cxterm of the
 # distribution of X11R6.  As the file itself doesn't contain copyright
@@ -8,7 +7,7 @@
 #
 # X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
 # X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
-# 
+#
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose is hereby granted without fee,
 # provided that this entire copyright and permission notice appear
@@ -19,7 +18,6 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
-#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
@@ -2299,4 +2297,3 @@
 zuo3   ?????w
 zuo4   address@hidden
 zuo5   
-

=== modified file 'leim/CXTERM-DIC/QJ-b5.tit'
--- a/leim/CXTERM-DIC/QJ-b5.tit 2011-06-12 10:37:40 +0000
+++ b/leim/CXTERM-DIC/QJ-b5.tit 2013-12-27 03:25:43 +0000
@@ -110,4 +110,3 @@
 |      ?U
 }      ?b
 ~      ??
-

=== modified file 'leim/CXTERM-DIC/QJ.tit'
--- a/leim/CXTERM-DIC/QJ.tit    2011-06-12 10:37:40 +0000
+++ b/leim/CXTERM-DIC/QJ.tit    2013-12-27 03:25:43 +0000
@@ -110,4 +110,3 @@
 |      ??
 }      ??
 ~      ??
-

=== modified file 'leim/CXTERM-DIC/README'
--- a/leim/CXTERM-DIC/README    2011-11-15 07:55:13 +0000
+++ b/leim/CXTERM-DIC/README    2013-12-27 03:25:43 +0000
@@ -5,9 +5,10 @@
 (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 @@
     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 @@
     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
 

=== modified file 'leim/CXTERM-DIC/SW.tit'
--- a/leim/CXTERM-DIC/SW.tit    2011-11-20 19:35:27 +0000
+++ b/leim/CXTERM-DIC/SW.tit    2013-12-27 03:25:43 +0000
@@ -1,5 +1,4 @@
-# -*- coding: euc-china -*-
-# Header added for Emacs
+# Header added for Emacs -*- coding: euc-china -*-
 #
 # This file is included in the directory contrib/clients/cxterm of the
 # distribution of X11R6.  As the file itself doesn't contain copyright
@@ -19,7 +18,6 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
-#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
@@ -749,4 +747,3 @@
 zy     ??????????????????????????????????????????????????
 zy     ????????????????????????
 zz     ????????????????????????????????
-

=== modified file 'leim/CXTERM-DIC/TONEPY.tit'
--- a/leim/CXTERM-DIC/TONEPY.tit        2011-11-20 19:35:27 +0000
+++ b/leim/CXTERM-DIC/TONEPY.tit        2013-12-27 03:25:43 +0000
@@ -1,5 +1,4 @@
-# -*- coding: euc-china -*-
-# Header added for Emacs
+# Header added for Emacs -*- coding: euc-china -*-
 #
 # This file is included in the directory contrib/clients/cxterm of the
 # distribution of X11R6.  As the file itself doesn't contain copyright
@@ -19,7 +18,6 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
-#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
@@ -2121,4 +2119,3 @@
 zuo3   ??????
 zuo4   ????????????????????????
 zuo5   
-

=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2013-12-16 22:35:57 +0000
+++ b/leim/ChangeLog    2013-12-27 03:25:43 +0000
@@ -1,3 +1,20 @@
+2013-12-27  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        Fix problems with CANNOT_DUMP and EMACSLOADPATH.

=== modified file 'leim/MISC-DIC/README'
--- a/leim/MISC-DIC/README      2011-11-15 07:55:13 +0000
+++ b/leim/MISC-DIC/README      2013-12-27 03:25:43 +0000
@@ -10,8 +10,8 @@
 (2) CTLau.html
     CTLau-b5.html
 
-They are verbatim copies of those distributed at the author's home
-page <umunhum.stanford.edu/~lee/chicomp/>. Each file contains a
+They are verbatim copies of those distributed by the author; they used to
+be at <http://umunhum.stanford.edu/~lee/chicomp/>.  Each file contains a
 license notice.
 
 (3) pinyin.map
@@ -19,8 +19,8 @@
 
 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

=== modified file 'leim/MISC-DIC/pinyin.map'
--- a/leim/MISC-DIC/pinyin.map  2012-12-31 15:34:32 +0000
+++ b/leim/MISC-DIC/pinyin.map  2013-12-27 03:25:43 +0000
@@ -1,10 +1,9 @@
-% -*- coding: cn-gb-2312 -*-
-% Header added for Emacs
+% Header added for Emacs -*- coding: cn-gb-2312 -*-
 %
 % This file is included in the free package called CCE.  It is
-% available at:
-%      http://ftp.debian.org/debian/dists/potato/main
-%              /source/utils/cce_0.36.orig.tar.gz
+% available in:
+%
+% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
 %
 % As the file itself doesn't contain copyright and license notices,
 % the following statements of the file cce/Copyright covers it.

=== modified file 'leim/MISC-DIC/ziranma.cin'
--- a/leim/MISC-DIC/ziranma.cin 2012-12-31 15:34:32 +0000
+++ b/leim/MISC-DIC/ziranma.cin 2013-12-27 03:25:43 +0000
@@ -1,10 +1,9 @@
-% -*- coding: cn-gb-2312 -*-
-% Header added for Emacs
+% Header added for Emacs -*- coding: cn-gb-2312 -*-
 %
 % This file is included in the free package called CCE.  It is
-% available at:
-%      http://ftp.debian.org/debian/dists/potato/main
-%              /source/utils/cce_0.36.orig.tar.gz
+% available in:
+%
+% http://archive.debian.org/debian/pool/main/c/cce/cce_0.36.orig.tar.gz
 %
 % As the file itself doesn't contain copyright and license notices,
 % the following statements of the file cce/Copyright covers it.

=== modified file 'leim/SKK-DIC/SKK-JISYO.L'
--- a/leim/SKK-DIC/SKK-JISYO.L  2013-03-18 04:30:20 +0000
+++ b/leim/SKK-DIC/SKK-JISYO.L  2013-12-27 03:25:43 +0000
@@ -13,9 +13,9 @@
 ;; SKK Development Team <address@hidden>
 ;;
 ;; Maintainer: SKK Development Team <address@hidden>
-;; Version: $Id: SKK-JISYO.L,v 1.1124 2013/03/16 00:10:02 czkmt Exp $
+;; Version: $Id: SKK-JISYO.L,v 1.1164 2013/12/21 00:10:02 czkmt Exp $
 ;; Keywords: japanese
-;; Last Modified: $Date: 2013/03/16 00:10:02 $
+;; Last Modified: $Date: 2013/12/21 00:10:02 $
 ;;
 ;; This dictionary is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -42379,7 +42379,7 @@
 versace /????????????;ww.versace.com/??????????/
 versailles /??????????/????????????/
 verse /????????;????/
-version /??????????/????????????/??/
+version /??????????/????????????/??/(skk-version)/
 version-up /????????????????/
 versionup /????????????????/??????????????????/
 versus /????????/??????????/
@@ -135522,6 +135522,7 @@
 ???????????? /??????/
 ?????????? /????/
 ?????????? /??????/
+???????? /????/
 ?????? /????/????/
 ???????????????? /????????/
 ?????????? /????;????/
@@ -145653,6 +145654,7 @@
 ?? /??/??/??/??/??/??/??/??/??/??;????/??;??????????????/??;??????????????/
 ???????????? /Bk/Berkelium/
 ???????????????? /????????????;[??]Buerger's disease/
+?????????? /(skk-version)/
 ?????????????????? /??????????????/
 ?????????? /????????/
 ???? /??/