;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
-;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2000-2011 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008
+;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H14PRO021
;; Copyright (C) 2003
input method `chinese-qj'.")
("chinese-ecdict" "\e$(05CKH\e(B"
-"In this input method, you enter a Chinese (Big5) charactere or word
+"In this input method, you enter a Chinese (Big5) character or word
by typing the corresponding English word. For example, if you type
\"computer\", \"\e$(0IZH+\e(B\" is input.
(princ ";; Quail package `")
(princ package)
- (princ (format "' -*- coding:%s; " coding-system-for-write))
- (princ "byte-compile-disable-print-circle:t; -*-\n")
+ (princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
(princ ";; Generated by the command `titdic-convert'\n;;\tDate: ")
(princ (current-time-string))
(princ "\n;;\tOriginal TIT dictionary file: ")
(cond ((looking-at "COMMENT")
(let ((pos (match-end 0)))
(end-of-line)
- (setq tit-comments (cons (buffer-substring pos (point))
- tit-comments))))))
+ (setq tit-comments
+ (cons (buffer-substring-no-properties pos (point))
+ tit-comments))))))
((= ch ?M) ; MULTICHOICE, MOVERIGHT, MOVELEFT
(cond ((looking-at "MULTICHOICE:[ \t]*")
(goto-char (match-end 0))
(cond ((looking-at "PROMPT:[ \t]*")
(goto-char (match-end 0))
(setq tit-prompt (tit-read-key-value))
- ;; Some TIT dictionaies that are encoded by
+ ;; Some TIT dictionaries that are encoded by
;; euc-china contains invalid character at the tail.
(let* ((last (aref tit-prompt (1- (length tit-prompt))))
(split (split-char last)))
tit-keyprompt)))))))
(end-of-line)
(princ ";; ")
- (princ (buffer-substring pos (point)))
+ (princ (buffer-substring-no-properties pos (point)))
(princ "\n")
(forward-line 1)))
(forward-line 1)
(setq pos (point))
(skip-chars-forward "^ \t\n")
- (setq key (buffer-substring pos (point)))
+ (setq key (buffer-substring-no-properties pos (point)))
(skip-chars-forward " \t")
(setq ch (following-char))
(if (or (= ch ?#) (= ch ?\n))
(setq translations
(if translations
(concat translations
- (buffer-substring pos (point)))
- (buffer-substring pos (point)))))
+ (buffer-substring-no-properties pos (point)))
+ (buffer-substring-no-properties pos (point)))))
(while (not (eolp))
(setq pos (point))
(skip-chars-forward "^ \t\n")
- (setq translations (cons (buffer-substring pos (point))
+ (setq translations (cons (buffer-substring-no-properties
+ pos (point))
translations))
(skip-chars-forward " \t")
(setq ch (following-char))
;; dictionary in the buffer DICBUF. The input method name of the
;; Quail package is NAME, and the title string is TITLE.
-;; TSANG-P is non-nil, genereate \e$(06AQo\e(B input method. Otherwise
+;; TSANG-P is non-nil, generate \e$(06AQo\e(B input method. Otherwise
;; generate \e$(0X|/y\e(B (simple version of \e$(06AQo\e(B). If BIG5-P is non-nil, the
;; input method is for inputting Big5 characters. Otherwise the input
;; method is for inputting CNS characters.
(\",\" . quail-prev-translation-block))
nil nil)\n\n")
(insert "(quail-define-rules\n")
- (save-excursion
- (set-buffer dicbuf)
+ (with-current-buffer dicbuf
;; Handle double CR line ends, which result when checking out of
;; CVS on MS-Windows.
(goto-char (point-min))
- (while (re-search-forward "\r\r$" nil t)
- (replace-match ""))
- (goto-char (point-min))
(search-forward "A440")
(beginning-of-line)
(let ((table (make-hash-table :test 'equal))
(forward-char 5)
(let ((trans (char-to-string (following-char)))
key slot)
- (re-search-forward "[A-Z]+$" nil t)
+ (re-search-forward "\\([A-Z]+\\)\r*$" nil t)
(setq key (downcase
(if (or tsang-p
- (<= (- (match-end 0) (match-beginning 0)) 1))
- (match-string 0)
- (string (char-after (match-beginning 0))
- (char-after (1- (match-end 0)))))))
+ (<= (- (match-end 1) (match-beginning 1)) 1))
+ (match-string 1)
+ (string (char-after (match-beginning 1))
+ (char-after (1- (match-end 1)))))))
(setq val (gethash key table))
(if val (setq trans (concat val trans)))
(puthash key trans table)
nil nil nil nil)\n\n")
(insert "(quail-define-rules\n")
(let ((pos (point)))
- (insert-buffer-substring dicbuf)
+ (insert-buffer-substring-no-properties dicbuf)
(goto-char pos)
(re-search-forward "^[a-z]")
(beginning-of-line)
(insert "\" \"")
(delete-char 1)
(end-of-line)
+ (while (= (preceding-char) ?\r)
+ (delete-char -1))
(insert "\")")
(forward-line 1)))
(insert ")\n"))
(defun ziranma-converter (dicbuf name title)
(let (dic)
- (save-excursion
- (set-buffer dicbuf)
+ (with-current-buffer dicbuf
(goto-char (point-min))
- (search-forward "%keyname end\n")
+ (search-forward "\n%keyname end")
+ (forward-line 1)
(let ((table (make-hash-table :test 'equal))
elt pos key trans val)
(while (not (eobp))
(setq pos (point))
(skip-chars-forward "^ \t")
- (setq key (buffer-substring pos (point)))
+ (setq key (buffer-substring-no-properties pos (point)))
(skip-chars-forward " \t")
- (setq trans (vector (buffer-substring (point) (line-end-position))))
+ (setq pos (point))
+ (skip-chars-forward "^\r\n")
+ (setq trans (vector (buffer-substring-no-properties pos (point))))
(setq val (gethash key table))
(if val (setq trans (vconcat val trans)))
(puthash key trans table)
(let (dicbuf-start dicbuf-end key-start key (pos (point)))
;; Find the dictionary, which starts below a horizontal rule and
;; ends at the second to last line in the HTML file.
- (save-excursion
- (set-buffer dicbuf)
+ (with-current-buffer dicbuf
(goto-char (point-min))
- (search-forward "#\n#<hr>\n")
+ (re-search-forward "^#<hr>")
+ (forward-line 1)
(setq dicbuf-start (point))
(goto-char (point-max))
- (forward-line -1)
+ (re-search-backward "^<hr>")
(setq dicbuf-end (point)))
- (insert-buffer-substring dicbuf dicbuf-start dicbuf-end)
+ (insert-buffer-substring-no-properties dicbuf dicbuf-start dicbuf-end)
;; CTLau-b5.html contains characters (0xa1 0xbc) which show up as
;; hollow boxes when the original characters in CTLau.html from
;; which the file is converted have no Big5 equivalent. Go
(insert "\" \"")
(delete-char 1)
(end-of-line)
+ (while (= (preceding-char) ?\r)
+ (delete-char -1))
(insert "\")")
(forward-line 1)))
(insert ")\n"))
(setq coding-system-for-write
(coding-system-change-eol-conversion coding 'unix))
(with-temp-file (expand-file-name quailfile dirname)
- (insert (format ";; Quail package `%s' -*- coding:%s; " name coding))
- (insert "byte-compile-disable-print-circle:t; -*-\n")
+ (insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
+ name coding))
(insert ";; Generated by the command `miscdic-convert'\n")
(insert ";; Date: " (current-time-string) "\n")
(insert ";; Source dictionary file: " dicfile "\n")
(if (eq coding 'iso-2022-cn-ext) "Chinese-CNS"
"Chinese-GB"))
"\" \"" title "\" t\n")
- (let* ((coding-system-for-read coding)
+ (let* ((coding-system-for-read
+ (coding-system-change-eol-conversion coding 'unix))
(dicbuf (find-file-noselect filename)))
(funcall converter dicbuf name title)
(kill-buffer dicbuf)))
(setq tail (cdr tail)))))
(defun batch-miscdic-convert ()
- "Run `miscdic-convert' on the files remaing on the command line.
+ "Run `miscdic-convert' on the files remaining on the command line.
Use this from the command line, with `-batch';
it won't work in an interactive Emacs.
If there's an argument \"-dir\", the next argument specifies a directory
;; coding: iso-2022-7bit
;; End:
-;; arch-tag: 8ad478b2-a985-4da2-b47f-d8ee5d7c24a3
;;; titdic-cnv.el ends here
HCoop / bpt / emacs.git / blobdiff