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.

14 files changed, 56 insertions, 51 deletions

diff --git a/leim/CXTERM-DIC/4Corner.tit b/leim/CXTERM-DIC/4Corner.tit
index 9457dd88386..eb78a54d71c 100644
--- a/leim/CXTERM-DIC/4Corner.tit
+++ b/leim/CXTERM-DIC/4Corner.tit
@@ -6,13 +6,13 @@ ENCODE:	BIG5
 AUTOSELECT:     NO
 PROMPT: ¥|¨¤¸¹½X::\040
 #
-COMMENT 
+COMMENT
 COMMENT Copyright (c) 2001 Christian Wittern <chris@ccbs.ntu.edu.tw>
-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 (¤Î¤@ªþ¥[½X)
@@ -6676,4 +6676,3 @@ BEGINDICTIONARY
 99901   æÎ
 99903   ¿¢
 99904   ºa
-
diff --git a/leim/CXTERM-DIC/ARRAY30.tit b/leim/CXTERM-DIC/ARRAY30.tit
index f29c8e479d7..5480656b049 100644
--- a/leim/CXTERM-DIC/ARRAY30.tit
+++ b/leim/CXTERM-DIC/ARRAY30.tit
@@ -9,7 +9,7 @@ AUTOSELECT:    NO
 PROMPT: ¤¤¤å¡i¦æ¦C¢²¢¯¡j\040
 #
 COMMENT Copyright (c) 1997 by  William Yeh <is80001@cis.nctu.edu.tw>
-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 @@ rfk;	ùÙ			# ---> 4^4-8-0-   0
 napa    ùÚ                      # ---> 6v1-0^1-   0
 ,nr\040 ùÛ                      # ---> 8v6v4^     0
 weu\040 ùÜ                      # ---> 2^3^7^     0
-
diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index 97dfe89f1a1..b44d9f385fd 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -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 @@ zui	×ì×í×î×ïÞ©
 zuj     ×ê×ë߬çÚõò
 zun     ×ð×ñߤé×÷®
 zuo     ×ò×ó×ô×õ×ö×÷×ø×ùßòàÜâôëÑìñ
-
diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit
index 7a8d68aa755..65d8dcec0be 100644
--- a/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@ -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 @@ zuo2	¬Q§@¯¤ÙËßOÞþßÃ
 zuo3    ¥ª¦õðw
 zuo4    °µ§@§¤®yÜ`¯®Æw¬gÌ©Ð_ÍÚßÜÑY
 zuo5    
-
diff --git a/leim/CXTERM-DIC/QJ-b5.tit b/leim/CXTERM-DIC/QJ-b5.tit
index 9ab03e83a47..b42f3fd005c 100644
--- a/leim/CXTERM-DIC/QJ-b5.tit
+++ b/leim/CXTERM-DIC/QJ-b5.tit
@@ -110,4 +110,3 @@ z	£C
 |       ¡U
 }       ¡b
 ~       ¡ã
-
diff --git a/leim/CXTERM-DIC/QJ.tit b/leim/CXTERM-DIC/QJ.tit
index fafeea4b866..1c4d0fd0d65 100644
--- a/leim/CXTERM-DIC/QJ.tit
+++ b/leim/CXTERM-DIC/QJ.tit
@@ -110,4 +110,3 @@ z	£ú
 |       £ü
 }       £ý
 ~       £þ
-
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
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -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 @@ zv	·±×ÏÙÛÙÜÙà
 zy      °±´Ôµª¶Ì·Õ·ú¸×º¤ºÐÂÈÄÊÆóÆøÇâÇèÉÏЩÐéÑõÕ½Ö¹ÙÚÙÝÙÞê¨
 zy      ë­ë®ë¯ë°ë±ë²ë³ë´ëµõºö´÷ª
 zz      ´Ó¿¨Áì­ƵÇêÈËÌ°Õ§ÕêÖÚêßì£ì¨ò¢ò¥
-
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index ddba1d378d1..44712222047 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -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 @@ zuo2	×Á×ò×÷óÐ
 zuo3    ´é×ó×ô
 zuo4    Ôä×õ×ö×÷×ø×ùÚèßòâôëÑìñõ¡
 zuo5    
-
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  <eggert@cs.ucla.edu>
+
+        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  <eggert@cs.ucla.edu>
 
         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 <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 @@ 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
--- a/leim/MISC-DIC/pinyin.map
+++ b/leim/MISC-DIC/pinyin.map
@@ -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.

diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin
index e33388314ec..13a63fd7335 100644
--- a/leim/MISC-DIC/ziranma.cin
+++ b/leim/MISC-DIC/ziranma.cin
@@ -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.
diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L
index f02c5658f2a..e81ccdedc71 100644
--- a/leim/SKK-DIC/SKK-JISYO.L
+++ b/leim/SKK-DIC/SKK-JISYO.L
@@ -13,9 +13,9 @@
 ;; SKK Development Team <skk@ring.gr.jp>
 ;;
 ;; Maintainer: SKK Development Team <skk@ring.gr.jp>
-;; 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 @@ verre /¥ô¥§¡¼¥ë;(Fr)¥¬¥é¥¹/
 versace /¥ô¥§¥ë¥µ¡¼¥Á;ww.versace.com/¥Ù¥ë¥µ¡¼¥Á/
 versailles /¥Ù¥ë¥µ¥¤¥æ/¥ô¥§¥ë¥µ¥¤¥æ/
 verse /¥ô¥¡¡¼¥¹;²Î»ì/
-version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/
+version /¥Ð¡¼¥¸¥ç¥ó/¥ô¥¡¡¼¥¸¥ç¥ó/ÈÇ/(skk-version)/
 version-up /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/
 versionup /¥Ð¡¼¥¸¥ç¥ó¥¢¥Ã¥×/¥ô¥¡¡¼¥¸¥ç¥ó¥¢¥Ã¥×/
 versus /¥Ð¡¼¥µ¥¹/¥ô¥¡¡¼¥µ¥¹/
@@ -135522,6 +135522,7 @@ zyklus /¥Á¥¯¥ë¥¹/¥Ä¥£¥¯¥ë¥¹/
 ¤Ê¤¤¤¬¤¤¤½¤¦ /Æâ³°Áõ/
 ¤Ê¤¤¤¬¤·¤í /ÊΤí/
 ¤Ê¤¤¤¬¤á¤ó /Æâ²èÌÌ/
+¤Ê¤¤¤¬¤ó /Æâ´Þ/
 ¤Ê¤¤¤­ /Æ⵬/Æâµ­/
 ¤Ê¤¤¤­¤¸¤å¤ó¤«¤ó /Æⵤ½Û´Ä/
 ¤Ê¤¤¤­¤ç¤¦ /Æⶵ;Ê©¶µ/
@@ -145653,6 +145654,7 @@ zyklus /¥Á¥¯¥ë¥¹/¥Ä¥£¥¯¥ë¥¹/
 ¤Ð /¾ì/ÇÏ/±©/ÍÕ/¿Ï/»õ/ÇÍ/ÇÌ/Äí/ÇÎ;ÇξÖ/ÔÇ;¡Ö¾ì¡×¤Î°ÛÂλú/Ñã;¡Ö¿Ï¡×¤Î°ÛÂλú/
 ¤Ð¡¼¤¯¤ê¤¦¤à /Bk/Berkelium/
 ¤Ð¡¼¤¸¤ã¡¼¤Ó¤ç¤¦ /¥Ð¡¼¥¸¥ã¡¼ÉÂ;[°å]Buerger's disease/
+¤Ð¡¼¤¸¤ç¤ó /(skk-version)/
 ¤Ð¡¼¤¸¤ç¤ó¤Ð¤ó¤´¤¦ /¥Ð¡¼¥¸¥ç¥óÈÖ¹æ/
 ¤Ð¡¼¤¹¤È¤¦ /¥Ð¡¼¥¹ÅÞ/
 ¤Ð¤¢ /ÇÌ/