From: tomo <tomo>
Date: Mon, 1 Jul 2002 09:28:48 +0000 (+0000)
Subject: (ids-dump-file-specs-alist): Deleted.
X-Git-Tag: ids-0_0-1~218
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1116d0572dd4a7cd758740fc34c86da2ee959f8;p=chise%2Fids.git

(ids-dump-file-specs-alist): Deleted.
(ids-dump-ranges): Deleted.
(ids-dump-insert-jis-x0208-1990): New function.
(ids-dump-range): New function.
(ids-dump-ucs-basic): New implementation.
(ids-dump-ucs-ext-a): Likewise.
(ids-dump-ucs-compat): Likewise.
(ids-dump-ucs-ext-b-*): Likewise.
(ids-dump-ucs-compat-supplement): Likewise.
(ids-dump-daikanwa-nn): Likewise.
(ids-dump-daikanwa-index): New function.
(ids-dump-daikanwa-hokan): Renamed from `ids-dump-daikanwa-ho'; new
implementation.
(ids-dump-cbeta): New implementation.
(ids-dump-jis-x0208-1990): New function.
---

diff --git a/ids-dump.el b/ids-dump.el
index bae090f..3372f10 100644
--- a/ids-dump.el
+++ b/ids-dump.el
@@ -26,66 +26,6 @@
 
 (require 'ids)
 
-(defvar ids-dump-file-specs-alist
-  '((ucs-basic "IDS-UCS-Basic.txt"
-	       ids-dump-insert-ccs-ranges
-	       ucs "U+%04X\t%c\t%s\n"
-	       (#x4E00 . #x9FA5))
-    (ucs-ext-a "IDS-UCS-Ext-A.txt"
-	       ids-dump-insert-ccs-ranges
-	       ucs "U+%04X\t%c\t%s\n"
-	       (#x3400 . #x4DB5) #xFA1F #xFA23)
-    (ucs-compat "IDS-UCS-Compat.txt"
-		ids-dump-insert-ccs-ranges
-		ucs "U+%04X\t%c\t%s\n"
-		(#xF900 . #xFA1E) (#xFA20 . #xFA22) (#xFA24 . #xFA2D))
-    (ucs-ext-b-1 "IDS-UCS-Ext-B-1.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x20000 . #x21FFF))
-    (ucs-ext-b-2 "IDS-UCS-Ext-B-2.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x22000 . #x23FFF))
-    (ucs-ext-b-3 "IDS-UCS-Ext-B-3.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x24000 . #x25FFF))
-    (ucs-ext-b-4 "IDS-UCS-Ext-B-4.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x26000 . #x27FFF))
-    (ucs-ext-b-5 "IDS-UCS-Ext-B-5.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x28000 . #x29FFF))
-    (ucs-ext-b-6 "IDS-UCS-Ext-B-6.txt"
-		 ids-dump-insert-ccs-ranges
-		 ucs "U-%08X\t%c\t%s\n"
-		 (#x2A000 . #x2A6D6))
-    (ucs-compat-supplement "IDS-UCS-Compat-Supplement.txt"
-			   ids-dump-insert-ccs-ranges
-			   ucs "U-%08X\t%c\t%s\n"
-			   (#x2F800 . #x2FA1D))
-    (daikanwa-01 "IDS-Daikanwa-01.txt" ids-dump-insert-daikanwa 00001 01449)
-    (daikanwa-02 "IDS-Daikanwa-02.txt" ids-dump-insert-daikanwa 01450 04674)
-    (daikanwa-03 "IDS-Daikanwa-03.txt" ids-dump-insert-daikanwa 04675 07410)
-    (daikanwa-04 "IDS-Daikanwa-04.txt" ids-dump-insert-daikanwa 07411 11529)
-    (daikanwa-05 "IDS-Daikanwa-05.txt" ids-dump-insert-daikanwa 11530 14414)
-    (daikanwa-06 "IDS-Daikanwa-06.txt" ids-dump-insert-daikanwa 14415 17574)
-    (daikanwa-07 "IDS-Daikanwa-07.txt" ids-dump-insert-daikanwa 17575 22677)
-    (daikanwa-08 "IDS-Daikanwa-08.txt" ids-dump-insert-daikanwa 22678 28107)
-    (daikanwa-09 "IDS-Daikanwa-09.txt" ids-dump-insert-daikanwa 28108 32803)
-    (daikanwa-10 "IDS-Daikanwa-10.txt" ids-dump-insert-daikanwa 32804 38699)
-    (daikanwa-11 "IDS-Daikanwa-11.txt" ids-dump-insert-daikanwa 38700 42209)
-    (daikanwa-12 "IDS-Daikanwa-12.txt" ids-dump-insert-daikanwa 42210 48902)
-    (daikanwa-ho "IDS-Daikanwa-ho.txt" ids-dump-insert-daikanwa-hokan)
-    (cbeta "IDS-CBETA.txt"
-	   ids-dump-insert-ccs-ranges
-	   ideograph-cbeta "CB%05d\t%c\t%s\n"
-	   (1 . 13363))
-    ))
-
 (defun ids-dump-insert-line (ccs line-spec code)
   (let ((chr (decode-char ccs code))
 	id-list)
@@ -112,20 +52,6 @@
 	    (t (error 'wrong-type-argument range)))
       (setq ranges (cdr ranges)))))
 
-(defun ids-dump-ranges (range filename)
-  (with-temp-buffer
-    (let* ((coding-system-for-write 'utf-8)
-	   (spec (assq range ids-dump-file-specs-alist))
-	   (file (nth 1 spec))
-	   (func (nth 2 spec))
-	   (args (nthcdr 3 spec)))
-      (if (file-directory-p filename)
-	  (setq filename (expand-file-name file filename)))
-      (insert ";; -*- coding: utf-8 -*-\n")
-      (apply func args)
-      (write-region (point-min)(point-max)
-		    filename))))
-
 (defun ids-dump-insert-daikanwa (start end)
   (let ((i start)
 	mdh-alist
@@ -185,15 +111,216 @@
 	       (ids-format-list
 		(get-char-attribute chr 'ideographic-structure)))))))
 
-(dolist (spec ids-dump-file-specs-alist)
-  (eval `(defun ,(intern (concat "ids-dump-" (symbol-name (car spec))))
-	   (filename)
-	   (interactive ,(concat "Fdump "
-				 (file-name-sans-extension (nth 1 spec))
-				 " : "))
-	   (ids-dump-ranges ',(car spec) filename))))
+(defun ids-dump-insert-jis-x0208-1990 ()
+  (let ((row 16)
+	cell h l code chr)
+    (while (<= row 83)
+      (setq h (+ row 32))
+      (setq cell 1)
+      (while (<= cell 94)
+	(setq l (+ cell 32))
+	(setq chr (make-char 'japanese-jisx0208-1990 h l))
+	(insert
+	 (format "J90-%02X%02X\t%c\t%s\n"
+		 h l
+		 (decode-builtin-char 'japanese-jisx0208-1990
+				      (logior (lsh h 8) l))
+		 (ids-format-list
+		  (get-char-attribute chr 'ideographic-structure))))
+	(setq cell (1+ cell)))
+      (setq row (1+ row)))
+    (setq h (+ row 32))
+    (setq cell 1)
+    (while (<= cell 6)
+      (setq l (+ cell 32))
+      (setq chr (make-char 'japanese-jisx0208-1990 h l))
+      (insert
+       (format "J90-%02X%02X\t%c\t%s\n"
+	       h l
+	       (decode-builtin-char 'japanese-jisx0208-1990
+				    (logior (lsh h 8) l))
+	       (ids-format-list
+		(get-char-attribute chr 'ideographic-structure))))
+      (setq cell (1+ cell)))))
+
+(defun ids-dump-range (file path func &rest args)
+  (with-temp-buffer
+    (let* ((coding-system-for-write 'utf-8))
+      (if (file-directory-p path)
+	  (setq path (expand-file-name file path)))
+      (insert ";; -*- coding: utf-8 -*-\n")
+      (apply func args)
+      (write-region (point-min)(point-max) path))))
+
+;;;###autoload
+(defun ids-dump-ucs-basic (filename)
+  (interactive "Fdump IDS-UCS-Basic : ")
+  (ids-dump-range "IDS-UCS-Basic.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U+%04X\t%c\t%s\n"
+		  '(#x4E00 . #x9FA5)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-a (filename)
+  (interactive "Fdump IDS-UCS-Ext-A : ")
+  (ids-dump-range "IDS-UCS-Ext-A.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U+%04X\t%c\t%s\n"
+		  '(#x3400 . #x4DB5) #xFA1F #xFA23))
+
+;;;###autoload
+(defun ids-dump-ucs-compat (filename)
+  (interactive "Fdump IDS-UCS-Compat : ")
+  (ids-dump-range "IDS-UCS-Compat.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U+%04X\t%c\t%s\n"
+		  '(#xF900 . #xFA1E) '(#xFA20 . #xFA22) '(#xFA24 . #xFA2D)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-1 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-1 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-1.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x20000 . #x21FFF)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-2 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-2 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-2.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x22000 . #x23FFF)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-3 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-3 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-3.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x24000 . #x25FFF)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-4 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-4 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-4.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x26000 . #x27FFF)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-5 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-5 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-5.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x28000 . #x29FFF)))
+
+;;;###autoload
+(defun ids-dump-ucs-ext-b-6 (filename)
+  (interactive "Fdump IDS-UCS-Ext-B-6 : ")
+  (ids-dump-range "IDS-UCS-Ext-B-6.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x2A000 . #x2A6D6)))
+
+;;;###autoload
+(defun ids-dump-ucs-compat-supplement (filename)
+  (interactive "Fdump IDS-UCS-Compat-Supplement : ")
+  (ids-dump-range "IDS-UCS-Compat-Supplement.txt" filename
+		  #'ids-dump-insert-ccs-ranges 'ucs "U-%08X\t%c\t%s\n"
+		  '(#x2F800 . #x2FA1D)))
+
+;;;###autoload
+(defun ids-dump-daikanwa-01 (filename)
+  (interactive "Fdump IDS-Daikanwa-01 : ")
+  (ids-dump-range "IDS-Daikanwa-01.txt" filename
+		  #'ids-dump-insert-daikanwa 00001 01449))
+
+;;;###autoload
+(defun ids-dump-daikanwa-02 (filename)
+  (interactive "Fdump IDS-Daikanwa-02 : ")
+  (ids-dump-range "IDS-Daikanwa-02.txt" filename
+		  #'ids-dump-insert-daikanwa 01450 04674))
+
+;;;###autoload
+(defun ids-dump-daikanwa-03 (filename)
+  (interactive "Fdump IDS-Daikanwa-03 : ")
+  (ids-dump-range "IDS-Daikanwa-03.txt" filename
+		  #'ids-dump-insert-daikanwa 04675 07410))
+
+;;;###autoload
+(defun ids-dump-daikanwa-04 (filename)
+  (interactive "Fdump IDS-Daikanwa-04 : ")
+  (ids-dump-range "IDS-Daikanwa-04.txt" filename
+		  #'ids-dump-insert-daikanwa 07411 11529))
+
+;;;###autoload
+(defun ids-dump-daikanwa-05 (filename)
+  (interactive "Fdump IDS-Daikanwa-05 : ")
+  (ids-dump-range "IDS-Daikanwa-05.txt" filename
+		  #'ids-dump-insert-daikanwa 11530 14414))
+
+;;;###autoload
+(defun ids-dump-daikanwa-06 (filename)
+  (interactive "Fdump IDS-Daikanwa-06 : ")
+  (ids-dump-range "IDS-Daikanwa-06.txt" filename
+		  #'ids-dump-insert-daikanwa 14415 17574))
+
+;;;###autoload
+(defun ids-dump-daikanwa-07 (filename)
+  (interactive "Fdump IDS-Daikanwa-07 : ")
+  (ids-dump-range "IDS-Daikanwa-07.txt" filename
+		  #'ids-dump-insert-daikanwa 17575 22677))
+
+;;;###autoload
+(defun ids-dump-daikanwa-08 (filename)
+  (interactive "Fdump IDS-Daikanwa-08 : ")
+  (ids-dump-range "IDS-Daikanwa-08.txt" filename
+		  #'ids-dump-insert-daikanwa 22678 28107))
+
+;;;###autoload
+(defun ids-dump-daikanwa-09 (filename)
+  (interactive "Fdump IDS-Daikanwa-09 : ")
+  (ids-dump-range "IDS-Daikanwa-09.txt" filename
+		  #'ids-dump-insert-daikanwa 28108 32803))
+
+;;;###autoload
+(defun ids-dump-daikanwa-10 (filename)
+  (interactive "Fdump IDS-Daikanwa-10 : ")
+  (ids-dump-range "IDS-Daikanwa-10.txt" filename
+		  #'ids-dump-insert-daikanwa 32804 38699))
+
+;;;###autoload
+(defun ids-dump-daikanwa-11 (filename)
+  (interactive "Fdump IDS-Daikanwa-11 : ")
+  (ids-dump-range "IDS-Daikanwa-11.txt" filename
+		  #'ids-dump-insert-daikanwa 38700 42209))
+
+;;;###autoload
+(defun ids-dump-daikanwa-12 (filename)
+  (interactive "Fdump IDS-Daikanwa-12 : ")
+  (ids-dump-range "IDS-Daikanwa-12.txt" filename
+		  #'ids-dump-insert-daikanwa 42210 48902))
+
+;;;###autoload
+(defun ids-dump-daikanwa-index (filename)
+  (interactive "Fdump IDS-Daikanwa-dx : ")
+  (ids-dump-range "IDS-Daikanwa-dx.txt" filename
+		  #'ids-dump-insert-daikanwa 48903 49964))
+
+;;;###autoload
+(defun ids-dump-daikanwa-hokan (filename)
+  (interactive "Fdump IDS-Daikanwa-ho : ")
+  (ids-dump-range "IDS-Daikanwa-ho.txt" filename
+		  #'ids-dump-insert-daikanwa-hokan))
+
+;;;###autoload
+(defun ids-dump-cbeta (filename)
+  (interactive "Fdump IDS-CBETA : ")
+  (ids-dump-range "IDS-CBETA.txt" filename
+		  #'ids-dump-insert-ccs-ranges
+		  'ideograph-cbeta "CB%05d\t%c\t%s\n"
+		  '(1 . 13363)))
 
+;;;###autoload
+(defun ids-dump-jis-x0208-1990 (filename)
+  (interactive "Fdump IDS-JIS-X0208-1990 : ")
+  (ids-dump-range "IDS-JIS-X0208-1990.txt" filename
+		  #'ids-dump-insert-jis-x0208-1990))
 
+    
 ;;; @ End.
 ;;;