Index: lang/elisp/pdicv-mode/trunk/pdicv-core.el
===================================================================
--- lang/elisp/pdicv-mode/trunk/pdicv-core.el (revision 71)
+++ lang/elisp/pdicv-mode/trunk/pdicv-core.el (revision 74)
@@ -215,5 +215,5 @@
 
          (32bit-address-mode (if (= (-> header 'index-blkbit) 32) t nil))
-		 (tab-sep-p (if (eq 'unicode-bocu-6 (-> header 'version)) t nil))
+		 (tab-sep-p (eq 'unicode-bocu-6 (-> header 'version)))
 
          (ix 0) (ix-max (-> header 'nindex))
@@ -297,4 +297,5 @@
     (let* ((result ()) ;(match-count 0)
            (header (pdicv-get-header-info filename))
+		   (tab-sep-p (eq 'unicode-bocu-6 (-> header 'version)))
 		   (block-size (-> header 'block-size))
            (offset (+ (-> header 'datablock-begins-at) (* phys block-size)))
@@ -340,5 +341,5 @@
                         (concat (substring eword 0 compress-length) eword-compressed) ))
           (setq q (1+ eword-len))
-                                        ; �������������
+		  ;; �������������
           (when (not aligned)
 			(setq eword-attrib (nt:read-uchar rest q))
@@ -384,7 +385,14 @@
             ) ; if extended
 
-                                        ;	  (insert (format "- %s\n" eword))
-          (when (funcall criteria-func eword pron jword example)
-			(push (list eword pron jword example) result))
+		  (if tab-sep-p
+			  (let* ((splitted (split-string eword "\t"))
+					 (eword (car splitted))
+					 (entry (cadr splitted)))
+				(when (funcall criteria-func entry eword pron jword example)
+				  (push (list entry pron jword example) result)))
+			(when (funcall criteria-func eword eword pron jword example)
+			  (push (list eword pron jword example) result)))
+		  ;;(when (funcall criteria-func eword pron jword example)
+		  ;;	(push (list eword pron jword example) result))
           );let
         ); wend
Index: lang/elisp/pdicv-mode/trunk/pdicv-search.el
===================================================================
--- lang/elisp/pdicv-mode/trunk/pdicv-search.el (revision 71)
+++ lang/elisp/pdicv-mode/trunk/pdicv-search.el (revision 74)
@@ -60,14 +60,8 @@
                 (message "Loading index-table for %s (\"%s\")..." dicname path)
                 (setq index-table (pdicv-get-index-list path word-encoding))
-                (push (cons dicname index-table) pdicv-index-table-list))
-            );fi
-          );let*
-        (setq diclist (cdr diclist))
-        );wend
+                (push (cons dicname index-table) pdicv-index-table-list)) ))
+        (setq diclist (cdr diclist)))
       (setq pdicv-inited-p t)
-      (message "Done.")
-      ); let
-    );caught
-  )
+      (message "Done.") )))
 
 (defun pdicv-search-regexp (dicname regexp-to-search &optional field-to-search)
@@ -137,5 +131,5 @@
 ;						(string-match needle1 word)))
 ;				)
-                                `(lambda (e p j x) (string-match ,needle1 ,field-to-search))
+                                `(lambda (e_ e p j x) (string-match ,needle1 ,field-to-search))
                                 );list
                     (list
@@ -144,22 +138,12 @@
                                        ;					(string< word needle2))))
                      (if just-p
-                         `(lambda (e p j x) (zerop (nt:strcmp ,field-to-search ,needle1)))
-                       `(lambda (e p j x) (and (not (string< ,field-to-search ,needle1))
-                                               (string< ,field-to-search ,needle2))) ; �ǡ����֥��������
-                       );just-p
-                     );list
-                    ));fi,criteria
-
-                 );let*
+                         `(lambda (e_ e p j x) (zerop (nt:strcmp ,field-to-search ,needle1)))
+                       `(lambda (e_ e p j x) (and (not (string< ,field-to-search ,needle1))
+												  (string< ,field-to-search ,needle2))) ; �ǡ����֥��������
+                       )))))
                                         ;	  (insert (format "%s" criteria))
             (pdicv-core-search dicinfo criteria simple-mode-p (not first-round-p)) ; clear only at the first time
-            );let*
-          );fi
-        (setq first-round-p nil)
-        );wend
-      );let
-    );caught
-  )
- ;;debug
+            ))
+        (setq first-round-p nil)))))
 
 (defun pdicv-search-interactive ()
@@ -174,9 +158,5 @@
             (read-from-minibuffer "Word to search: "))
       (if (> (length word-to-search) 0)
-          (pdicv-search (intern dicname) word-to-search))
-      );let
-    );caught
-  )
-
+          (pdicv-search (intern dicname) word-to-search)) )))
 
 (defun pdicv-search-region (from to)
@@ -184,7 +164,5 @@
   (interactive "r")
   (let ((dicname (completing-read "Target dictionary: " pdicv-dictionary-list nil t "")))
-    (if dicname (pdicv-search (intern dicname) (buffer-substring from to)))
-    );let
-  )
+    (if dicname (pdicv-search (intern dicname) (buffer-substring from to))) ))
 
 (defun pdicv-set-target-dictionary ()
@@ -192,7 +170,5 @@
   (interactive)
   (let ((dicname (completing-read "Target dictionary: " pdicv-dictionary-list nil t "")))
-    (if dicname (setq pdicv-target-dictionary (intern dicname)))
-    );let
-  )
+    (if dicname (setq pdicv-target-dictionary (intern dicname))) ))
 
 (defun pdicv-search-current-word ()
@@ -204,7 +180,5 @@
     (if word;(and word (not (nt:skipit-p word-to-search)))
         (pdicv-search-just pdicv-target-dictionary word)
-      (message "no word at cursor"))
-    );let
-  )
+      (message "no word at cursor")) ))
 
 (defun pdicv-search-next-word ()
@@ -224,9 +198,5 @@
         (if (and word (not (nt:skipit-p word)))
             (pdicv-search-just pdicv-target-dictionary word)
-          (message "no word at cursor"));fi
-        );progn
-      );fi
-    );let
-  )
+          (message "no word at cursor")) ))))
 
 (defun pdicv-search-previous-word ()
@@ -234,6 +204,5 @@
   (interactive)
   (forward-word -1) ; (backward-word 1)
-  (pdicv-search-current-word)
-  )
+  (pdicv-search-current-word))
 
 ;;; pdicv-search.el ends here