Automate the build of ja-dic.el.

ja-dic.el no longer needs to be in the repository: it's now
generated as part of the build from bzr.  Also, update SKK-JISYO.L to
match the upstream source exactly.
* .bzrignore: Add leim/ja-dic/.
* leim/ja-dic/ja-dic.el: Remove from repository.  It is still distributed
as part of the Emacs tarball.
* leim/Makefile.in ($(srcdir)/ja-dic/ja-dic.el): New rule.
(compile-main): Depend on it.
* leim/SKK-DIC/README: Update to reflect new build procedure.
* leim/SKK-DIC/SKK-JISYO.L: Update to match source exactly.
This is now the annotated version, to match the upstream file name;
the unannotated one is built from it automatically.
* lisp/international/ja-dic-cnv.el (skkdic-convert): Remove the annotations
from the input, rather than assume that it's been done for us by the
SKK script unannotate.awk.  Switch ja-dic.el to UTF-8.  Don't put
the current date into a ja-dic.el comment, as that complicates
regression testing.

Fixes: debbugs:13984

ChangeLog

@@ -1,3 +1,8 @@
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Automate the build of ja-dic.el (Bug#13984).
+	* .bzrignore: Add leim/ja-dic/.
+
 2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
 
 	File synchronization fixes (Bug#13944).

leim/ChangeLog

@@ -1,3 +1,18 @@
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Automate the build of ja-dic.el (Bug#13984).
+	ja-dic.el no longer needs to be in the repository: it's now
+	generated as part of the build from bzr.  Also, update SKK-JISYO.L to
+	match the upstream source exactly.
+	* ja-dic/ja-dic.el: Remove from repository.  It is still distributed
+	as part of the Emacs tarball.
+	* Makefile.in ($(srcdir)/ja-dic/ja-dic.el): New rule.
+	(compile-main): Depend on it.
+	* SKK-DIC/README: Update to reflect new build procedure.
+	* SKK-DIC/SKK-JISYO.L: Update to match source exactly.
+	This is now the annotated version, to match the upstream file name;
+	the unannotated one is built from it automatically.
+
 2013-03-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* quail/latin-ltx.el: Resolve conflicts (bug#13950).

leim/Makefile.in

@@ -144,6 +144,11 @@ leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
 	fi
 	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
+$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
+	@$(MKDIR_P) $(srcdir)/ja-dic
+	$(RUN_EMACS) -l $(buildlisppath)/international/ja-dic-cnv \
+	  --eval '(skkdic-convert "$(srcdir)/SKK-DIC/SKK-JISYO.L" "$(srcdir)/ja-dic")'
+
 ## Following adapted from lisp/Makefile.in.
 setwins=wins="${srcdir}/ja-dic quail"; \
 	[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \
@@ -156,7 +161,7 @@ compile-targets: $(TARGETS)
 # Compile all the Elisp files that need it.  Beware: it approximates
 # `no-byte-compile', so watch out for false-positives!
 .PHONY: compile-main
-compile-main: ${TIT_MISC}
+compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el
 	@($(setwins); \
 	els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
 	for el in $$els; do \

leim/SKK-DIC/README

@@ -1,4 +1,6 @@
-The file SKK-JISYO.L is renamed from SKK-JISYO.L.unannotated which is
-distributed at http://openlab.ring.gr.jp/skk/skk/dic/.
-SKK-JISYO.L.unannotated is free software distributed under the terms
+This directory contains a copy of the following file:
+
+http://openlab.ring.gr.jp/skk/skk/dic/SKK-JISYO.L
+
+This file is free software distributed under the terms
 of the GNU General Public License.

lisp/ChangeLog

@@ -1,3 +1,12 @@
+2013-03-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Automate the build of ja-dic.el (Bug#13984).
+	* international/ja-dic-cnv.el (skkdic-convert): Remove the annotations
+	from the input, rather than assume that it's been done for us by the
+	SKK script unannotate.awk.  Switch ja-dic.el to UTF-8.  Don't put
+	the current date into a ja-dic.el comment, as that complicates
+	regression testing.
+
 2013-03-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* whitespace.el: Fix double evaluation.

lisp/international/ja-dic-cnv.el

@@ -330,16 +330,21 @@ The name of generated file is specified by the variable `ja-dic-filename'."
   (interactive "FSKK dictionary file: ")
   (message "Reading file \"%s\" ..." filename)
   (let* ((coding-system-for-read 'euc-japan)
-	 (skkbuf(find-file-noselect (expand-file-name filename)))
+	 (skkbuf (get-buffer-create " *skkdic-unnannotated*"))
 	 (buf (get-buffer-create "*skkdic-work*")))
+    ;; Set skkbuf to an unannotated copy of the dictionary.
+    (with-current-buffer skkbuf
+      (insert-file-contents (expand-file-name filename))
+      (re-search-forward "^[^;]")
+      (while (re-search-forward ";[^\n/]*/" nil t)
+	(replace-match "/")))
     ;; Setup and generate the header part of working buffer.
     (with-current-buffer buf
       (erase-buffer)
       (buffer-disable-undo)
       (insert ";;; ja-dic.el --- dictionary for Japanese input method"
-	      " -*-coding: euc-japan; -*-\n"
+	      " -*-coding: utf-8; -*-\n"
 	      ";;\tGenerated by the command `skkdic-convert'\n"
-	      ";;\tDate: " (current-time-string) "\n"
 	      ";;\tOriginal SKK dictionary file: "
 	      (file-relative-name (expand-file-name filename) dirname)
 	      "\n\n"
@@ -348,7 +353,6 @@ The name of generated file is specified by the variable `ja-dic-filename'."
 	      ";; Do byte-compile this file again after any modification.\n\n"
 	      ";;; Start of the header of the original SKK dictionary.\n\n")
       (set-buffer skkbuf)
-      (widen)
       (goto-char 1)
       (let (pos)
 	(search-forward ";; okuri-ari")
@@ -399,7 +403,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
       ;; Save the working buffer.
       (set-buffer buf)
       (set-visited-file-name (expand-file-name ja-dic-filename dirname) t)
-      (set-buffer-file-coding-system 'euc-japan)
+      (set-buffer-file-coding-system 'utf-8)
       (save-buffer 0))
     (kill-buffer skkbuf)
     (switch-to-buffer buf)))