提交: 7fe1110061804bb224c90ddac27d92f7a89dc7c2 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修订版: 7fe1110061804bb224c90ddac27d92f7a89dc7c2 (tree)
• 时间: 2006-05-31 01:07:24
• 作者: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_52_0_650'.

更改概述

• modified: BoardGroup.pas
• modified: Doxyfile
• modified: Editor.dfm
• modified: Editor.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• modified: InputAssist.pas
• modified: InputAssistDataModule.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Search.dfm
• modified: Search.pas
• modified: Setting.pas
• modified: gikoNavi.res
• delete: readme/InputAssist.default
• modified: readme/readme.txt
• modified: readme/setup.INF
• modified: res/skin/skin30-2G/Header.html
• modified: res/skin/skin30-2G/chie_base.css
• modified: res/skin/skin30-2G/chie_event.js
• modified: res/skin/skin30-2G/chie_image.css
• modified: res/skin/skin30-2G/chie_image.js
• modified: res/skin/skin30-2G/chie_popup.js
• modified: res/skin/skin30-2G/chie_search.js
• modified: res/skin/skin30-3G/Header.html
• modified: res/skin/skin30-3G/chie_base.css
• modified: res/skin/skin30-3G/chie_event.js
• modified: res/skin/skin30-3G/chie_image2.js
• modified: res/skin/skin30-3G/chie_popup.js
• modified: res/skin/skin30-3G/chie_search.js

差异

--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -3,8 +3,8 @@ unit BoardGroup;
 interface
 
 uses
-	Windows, SysUtils, Classes, ComCtrls, {HTTPApp,} YofUtils, IdGlobal,
-	ExternalBoardManager, ExternalBoardPlugInMain, StrUtils;
+	Windows, SysUtils, Classes, ComCtrls, IniFiles, {HTTPApp,} YofUtils, IdGlobal,
+	ExternalBoardManager, ExternalBoardPlugInMain, StrUtils, DateUtils;
 
 type
 	//ƒŠƒXƒg‚Ì•\Ž¦ƒAƒCƒeƒ€‘I‘ð
@@ -16,7 +16,6 @@ type
 	TBoard = class;
 	TThreadItem = class;
 
-
 	// BBS ‚̃‹[ƒg
 	TBBS = class(TList)
 	private
@@ -59,6 +58,7 @@ type
 	end;
 
 	// ƒJƒeƒSƒŠ(” URL ‚̃ŠƒXƒg)
+//	TCategory = class(THashedStringList)
 	TCategory = class(TStringList)
 	private
 		FNo: Integer;
@@ -90,10 +90,9 @@ type
 		property NodeExpand: Boolean read FExpand write FExpand;
 	end;
 
- 	//! ƒXƒŒƒbƒh”ƒJƒEƒ“ƒgðŒ•¶
-	TThreadCount = function(Item : TThreadItem): Boolean;
-
+	
 	// ”Â(ƒXƒŒƒbƒh URL ‚̃ŠƒXƒg)
+//	TBoard = class(THashedStringList)
 	TBoard = class(TStringList)
 	private
 		FContext: DWORD;							// ƒvƒ‰ƒOƒCƒ“‚ªŽ©—R‚ɐݒ肵‚Ä‚¢‚¢’l(Žå‚ɃCƒ“ƒXƒ^ƒ“ƒX‚ª“ü‚é)
@@ -207,11 +206,11 @@ type
 		function GetUserThreadCount: Integer;
 		function GetNewThread(Index: Integer): TThreadItem;
 		function GetLogThread(Index: Integer): TThreadItem; overload;
+		function GetLogThread(Index: Integer; Base: Integer): TThreadItem; overload;
 		function GetArchiveThread(Index: Integer): TThreadItem;
 		function GetLiveThread(Index: Integer): TThreadItem;
 		function GetUserThread(Index: Integer): TThreadItem;
-		function GetThreadCount(func :TThreadCount ): Integer;
-		function GetThread(func :TThreadCount;const Index :Integer ): TThreadItem;
+
 		procedure BeginUpdate;
 		procedure EndUpdate;
 		property NodeExpand: Boolean read FExpand write FExpand;
@@ -349,7 +348,7 @@ var
 implementation
 
 uses
-	GikoSystem, RoundData, MojuUtils, DateUtils, IniFiles;
+	GikoSystem, RoundData, MojuUtils;
 
 const
 	BBS2CH_NAME:					 string	= '‚Q‚¿‚á‚ñ‚Ë‚é';
@@ -364,34 +363,9 @@ const
     HEADTXT_FILENAME:		string = 'head.html';
 	//DEFAULT_LIST_COUNT:		Integer = 100;
 
-//! ƒƒO‚ðŽ‚Á‚Ä‚¢‚é‚È‚ç^‚ð•Ô‚·
-function CountLog(Item: TThreadItem): Boolean;
-begin
-	Result := Item.IsLogFile;
-end;
-//! V’…‚È‚ç^‚ð•Ô‚·
-function CountNew(Item: TThreadItem): Boolean;
-begin
-	Result := Item.NewArrival;
-end;
-//! DAT—Ž‚¿‚È‚ç^‚ð•Ô‚·
-function CountDat(Item: TThreadItem): Boolean;
-begin
-	Result := (Item.AgeSage = gasArch);
-end;
-//! ¶‘¶ƒXƒŒ‚È‚ç^‚ð•Ô‚·
-function CountLive(Item: TThreadItem): Boolean;
-begin
-	Result := (Item.AgeSage <> gasArch);
-end;
-
-//! í‚ɐ^
-function CountAll(Item: TThreadItem): Boolean;
-begin
-    Result := True;
-end;
-
-
+//	COLUMN_CATEGORY:	 array[0..0] of string = ('ƒJƒeƒSƒŠ–¼');
+//	COLUMN_BOARD:			array[0..3] of string = ('”–¼', 'Žæ“¾”', '„‰ñ—\–ñ', '‘O‰ñ„‰ñ“úŽž');
+//	COLUMN_THREADITEM: array[0..3] of string = ('ƒXƒŒƒbƒh–¼', 'ƒJƒEƒ“ƒg', '„‰ñ—\–ñ', '‘O‰ñ„‰ñ“úŽž');
 
 // BBSID ‚ð—p‚¢‚é 2 ‚¿‚á‚ñ‚Ë‚é‚Ì‚Ý’T‚µo‚µ‚Ü‚·
 // BBSID ‚ÌŽg—p‚Í‹É—Í”ð‚¯‚Ä‚­‚¾‚³‚¢B
@@ -1223,14 +1197,17 @@ begin
 
    // Result := inDateTimeString;
 end;
-//! ƒTƒuƒWƒFƒNƒgURLŽæ“¾
+// ƒTƒuƒWƒFƒNƒgURLŽæ“¾
 function TBoard.GetReadCgiURL: string;
 begin
+	//Result := URL + SUBJECT_FILENAME;
+	//Result := GikoSys.UrlToServer(URL)
+	//				+ 'test/read.cgi/' + BBSID + '/?raw=0.0';
 	Result := URL + SUBJECT_FILENAME;
 
 end;
 
-//! ƒTƒuƒWƒFƒNƒgƒtƒ@ƒCƒ‹–¼Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
+// ƒTƒuƒWƒFƒNƒgƒtƒ@ƒCƒ‹–¼Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
 function TBoard.GetSubjectFileName: string;
 begin
 	if Length( FilePath ) > 0 then
@@ -1240,7 +1217,7 @@ begin
 						+ BBS2CH_LOG_FOLDER + PATH_DELIM + BBSID + PATH_DELIM + SUBJECT_FILENAME;
 end;
 
-//! ƒCƒ“ƒfƒbƒNƒXƒtƒ@ƒCƒ‹–¼(folder.idx)Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
+// ƒCƒ“ƒfƒbƒNƒXƒtƒ@ƒCƒ‹–¼(folder.idx)Žæ“¾iƒpƒX{ƒtƒ@ƒCƒ‹–¼j
 function TBoard.GetFolderIndexFileName: string;
 begin
 	if Length( FilePath ) > 0 then
@@ -1249,7 +1226,7 @@ begin
 		Result := GikoSys.Setting.LogFolderP
 						+ BBS2CH_LOG_FOLDER + PATH_DELIM + BBSID + PATH_DELIM + FOLDER_INDEX_FILENAME;
 end;
-//! SETTING.TXT‚̃tƒ@ƒCƒ‹–¼Žæ“¾
+//SETTING.TXT‚̃tƒ@ƒCƒ‹–¼Žæ“¾
 function TBoard.GetSETTINGTXTFileName: string;
 begin
 	if Length( FilePath ) > 0 then
@@ -1285,8 +1262,12 @@ end;
 
 // ƒXƒŒ—§‚Ä‘—MURL
 function TBoard.GetSendURL: string;
+//var
+//	Protocol, Host, Path, Document, Port, Bookmark : string;
 begin
     Result := GikoSys.UrlToServer(URL);
+	//GikoSys.ParseURI( URL, Protocol,Host, Path, Document, Port, Bookmark );
+	//if GikoSys.Is2chHost(Host) then
 	if Self.Is2ch then
         Result := Result + 'test/bbs.cgi'
     else
@@ -1313,7 +1294,15 @@ begin
 	if FUpdate then
 		FModified := True;
 end;
-
+{
+procedure TBoard.SetRoundName(s: PChar);
+begin
+	if FRoundName = s then Exit;
+	FRoundName := s;
+	if FUpdate then
+		FModified := True;
+end;
+}
 procedure TBoard.SetLastModified(d: TDateTime);
 begin
 	if FLastModified = d then Exit;
@@ -1354,8 +1343,8 @@ begin
 	if FUpdate then
 		FModified := True;
 end;
-//! func‚ÌðŒ‚Éˆê’v‚·‚éƒXƒŒƒbƒh‚̐”‚ð•Ô‚·
-function TBoard.GetThreadCount(func :TThreadCount ): Integer;
+
+function TBoard.GetNewThreadCount: Integer;
 var
 	i: Integer;
 begin
@@ -1363,12 +1352,12 @@ begin
 	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
 	begin
 		for i := 0 to Count - 1 do begin
-			if func(Items[i]) then
+			if Items[i].NewArrival then
 				inc(Result);
 		end;
 	end else begin
 		for i := 0 to Count - 1 do begin
-			if func(Items[i]) then
+			if Items[i].NewArrival then
 			begin
 				if Items[i].ShortTitle = '' then
 					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
@@ -1378,33 +1367,94 @@ begin
 		end;
 	end;
 end;
-//! V’…ƒXƒŒƒbƒh‚̐”‚ðŽæ“¾‚·‚é
-function TBoard.GetNewThreadCount: Integer;
-begin
-	Result := GetThreadCount(CountNew);
-end;
-//! ƒƒO—L‚èƒXƒŒƒbƒh‚̐”‚ðŽæ“¾‚·‚é
+
 function TBoard.GetLogThreadCount: Integer;
+var
+	i: Integer;
 begin
-	Result := GetThreadCount(CountLog);
+	Result := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].IsLogFile then
+				inc(Result);
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].IsLogFile then
+			begin
+				if Items[i].ShortTitle = '' then
+					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then
+					inc(Result);
+			end;
+		end;
+	end;
 end;
-//! iž‚ÝðŒ‚Éˆê’v‚·‚éƒXƒŒƒbƒh‚̐”‚ðŽæ“¾‚·‚é
+
 function TBoard.GetUserThreadCount: Integer;
+var
+	i: Integer;
 begin
-	Result := GetThreadCount(CountAll);
+	Result := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+		Result := Count
+	else
+		for i := 0 to Count - 1 do begin
+			if Items[i].ShortTitle = '' then
+				Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+			if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then
+				inc(Result);
+		end;
 end;
-//! DAT—Ž‚¿ƒXƒŒƒbƒh‚̐”‚ðŽæ“¾‚·‚é
 function TBoard.GetArchiveThreadCount: Integer;
+var
+	i: Integer;
 begin
-	Result := GetThreadCount(CountDat);
+	Result := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].AgeSage = gasArch then
+				inc(Result);
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if  Items[i].AgeSage = gasArch then
+			begin
+				if Items[i].ShortTitle = '' then
+					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then
+					inc(Result);
+			end;
+		end;
+	end;
 end;
-//! ¶‘¶ƒXƒŒƒbƒh‚̐”‚ðŽæ“¾‚·‚é
+
 function TBoard.GetLiveThreadCount: Integer;
+var
+	i: Integer;
 begin
-	Result := GetThreadCount(CountLive);
+	Result := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].AgeSage <> gasArch then
+				inc(Result);
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if  Items[i].AgeSage <> gasArch then
+			begin
+				if Items[i].ShortTitle = '' then
+					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then
+					inc(Result);
+			end;
+		end;
+	end;
 end;
-//! func‚ÌðŒ‚É“K‡‚·‚éIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
-function TBoard.GetThread(func :TThreadCount;const Index :Integer ): TThreadItem;
+function TBoard.GetArchiveThread(Index: Integer): TThreadItem;
 var
 	i: Integer;
 	Cnt: Integer;
@@ -1414,7 +1464,8 @@ begin
 	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
 	begin
 		for i := 0 to Count - 1 do begin
-			if func(Items[i]) then begin
+			if Items[i].AgeSage = gasArch then
+									begin
 				if Index = Cnt then begin
 					Result := Items[i];
 					Exit;
@@ -1424,8 +1475,9 @@ begin
 		end;
 	end else begin
 		for i := 0 to Count - 1 do begin
-			if func(Items[i]) then begin
-				if Length(Items[i].ShortTitle) = 0 then
+			if Items[i].AgeSage = gasArch then
+			begin
+				if Items[i].ShortTitle = '' then
 					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
 				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
 					if Index = Cnt then begin
@@ -1438,30 +1490,181 @@ begin
 		end;
 	end;
 end;
-//! DAT—Ž‚¿ƒXƒŒƒbƒh‚ÅIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
-function TBoard.GetArchiveThread(Index: Integer): TThreadItem;
-begin
-	Result := GetThread(CountDat, Index);
-end;
-//! ¶‘¶ƒXƒŒƒbƒh‚ÅIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
 function TBoard.GetLiveThread(Index: Integer): TThreadItem;
+var
+	i: Integer;
+	Cnt: Integer;
 begin
-	Result := GetThread(CountLive, Index);
+	Result := nil;
+	Cnt := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].AgeSage <> gasArch then
+									begin
+				if Index = Cnt then begin
+					Result := Items[i];
+					Exit;
+				end;
+				inc(Cnt);
+			end;
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].AgeSage <> gasArch then
+			begin
+				if Items[i].ShortTitle = '' then
+					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
+					if Index = Cnt then begin
+						Result := Items[i];
+						Exit;
+					end;
+					inc(Cnt);
+				end;
+			end;
+		end;
+	end;
 end;
-//! V’…ƒXƒŒƒbƒh‚ÅIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
 function TBoard.GetNewThread(Index: Integer): TThreadItem;
+var
+	i: Integer;
+	Cnt: Integer;
 begin
-	Result := GetThread(CountNew, Index);
+	Result := nil;
+	Cnt := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].NewArrival then
+									begin
+				if Index = Cnt then begin
+					Result := Items[i];
+					Exit;
+				end;
+				inc(Cnt);
+			end;
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].NewArrival then
+			begin
+				if Items[i].ShortTitle = '' then
+					Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+				if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
+					if Index = Cnt then begin
+						Result := Items[i];
+						Exit;
+					end;
+					inc(Cnt);
+				end;
+			end;
+		end;
+	end;
 end;
-//! Log‚ ‚èƒXƒŒƒbƒh‚ÌIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
+
 function TBoard.GetLogThread(Index: Integer): TThreadItem;
+var
+	i: Integer;
+	Cnt: Integer;
 begin
-	Result := GetThread(CountLog, Index);
+	Cnt := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].IsLogFile then
+									begin
+				if Index = Cnt then begin
+					Result := Items[i];
+					Exit;
+				end;
+				inc(Cnt);
+			end;
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].IsLogFile then
+				begin
+					if Items[i].ShortTitle = '' then
+						Items[i].ShortTitle := ZenToHan(Items[i].Title);
+					if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
+						if Index = Cnt then begin
+							Result := Items[i];
+							Exit;
+					end;
+					inc(Cnt);
+				end;
+			end;
+		end;
+	end;
+	Result := nil;
+end;
+function TBoard.GetLogThread(Index: Integer; Base: Integer): TThreadItem;
+var
+	i: Integer;
+	Cnt: Integer;
+begin
+	Cnt := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := Base to Count - 1 do begin
+			if Items[i].IsLogFile then
+									begin
+				if Index = Cnt then begin
+					Result := Items[i];
+					Exit;
+				end;
+				inc(Cnt);
+			end;
+		end;
+	end else begin
+		for i := Base to Count - 1 do begin
+			if Items[i].IsLogFile then
+				begin
+					if Items[i].ShortTitle = '' then
+						Items[i].ShortTitle := ZenToHan(Items[i].Title);
+					if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
+						if Index = Cnt then begin
+							Result := Items[i];
+							Exit;
+					end;
+					inc(Cnt);
+				end;
+			end;
+		end;
+	end;
+	Result := nil;
 end;
-//! iž‚Ý‚ÅIndex”Ԗڂ̃XƒŒƒbƒh‚ðŽæ“¾‚·‚é
 function TBoard.GetUserThread(Index: Integer): TThreadItem;
+var
+	i: Integer;
+	Cnt: Integer;
 begin
-	Result := GetThread(CountAll, Index);
+	Result := nil;
+	Cnt := 0;
+	if Length( ParentCategory.ParenTBBS.ShortSelectText ) = 0 then
+	begin
+		for i := 0 to Count - 1 do begin
+			if Index = Cnt then
+			begin
+				Result := Items[ i ];
+				Exit;
+			end;
+			inc( Cnt );
+		end;
+	end else begin
+		for i := 0 to Count - 1 do begin
+			if Items[i].ShortTitle = '' then
+				Items[i].ShortTitle := CustomStringReplace(ZenToHan(Items[i].Title), ' ', '');
+			if AnsiPos(ParentCategory.ParenTBBS.ShortSelectText, Items[i].ShortTitle) <> 0 then begin
+				if Index = Cnt then begin
+					Result := Items[i];
+					Exit;
+				end;
+				inc(Cnt);
+			end;
+		end;
+	end;
 end;
 
 procedure TBoard.BeginUpdate;
@@ -1474,6 +1677,16 @@ begin
 	FUpdate := True;
 end;
 
+{class function TBoard.GetColumnName(Index: Integer): string;
+begin
+	Result := COLUMN_THREADITEM[Index];
+end;
+
+class function TBoard.GetColumnCount: Integer;
+begin
+	Result := Length(COLUMN_THREADITEM);
+end;}
+
 //constructor TThreadItem.Create(AOwner: TComponent);
 procedure TThreadItem.Init;
 begin
@@ -1579,6 +1792,28 @@ begin
 
 end;
 
+// *************************************************************************
+// ŠO•””ƒvƒ‰ƒOƒCƒ“‚ªŽg—p‰Â”\‚©
+// *************************************************************************
+{
+function	TThreadItem.IsBoardPlugInAvailable : Boolean;
+begin
+
+	repeat
+		if BoardPlugIn = nil then
+			Break;
+
+		if not Assigned( Pointer( BoardPlugIn.Module ) ) then
+			Break;
+
+		Result := True;
+		Exit;
+	until True;
+
+	Result := False;
+
+end;
+}
 function TThreadItem.GetDatURL: string;
 var
 	Protocol, Host, Path, Document, Port, Bookmark: string;
@@ -1642,8 +1877,31 @@ begin
 	end;
 end;
 
+{function TThreadItem.GetOldDatgzURL: string;
+var
+	Protocol, Host, Path, Document, Port, Bookmark: string;
+begin
+	Result := Format('%s%s/%.3s/%s.gz', [ParentBoard.URL,
+																			 'kako',
+																			 FileName,
+																			 FileName]);
+	if FDownloadHost <> '' then begin
+		ParseURI(Result, Protocol, Host, Path, Document, Port, Bookmark);
+		Result := Format('%s://%s%s%s', [Protocol,
+																		 DownloadHost,
+																		 Path,
+																		 Document]);
+
+	end;
+end;}
+
 function TThreadItem.GetOfflawCgiURL(const SessionID: string): string;
+//var
+//	Protocol, Host, Path, Document, Port, Bookmark: string;
 begin
+//	Result := GikoSys.UrlToServer(ParentBoard.URL)
+//					+ 'test/offlaw.cgi/' + ParentBoard.BBSID + '/'
+//					+ ChangeFileExt(FileName, '') + '/?raw=.0&sid=' + HttpEncode(SessionID);
 	if FDownloadHost = '' then begin
 		Result := GikoSys.UrlToServer(ParentBoard.URL)
 						+ 'test/offlaw.cgi/' + ParentBoard.BBSID + '/'
@@ -1654,6 +1912,10 @@ begin
 		Result := 'http://' + FDownloadHost
 						+ '/test/offlaw.cgi/' + ParentBoard.BBSID + '/'
 						+ ChangeFileExt(FileName, '') + '/?raw=.0&sid=' + HttpEncode(SessionID);
+//		Result := Format('%s://%s%s%s', [Protocol,
+//																		 DownloadHost,
+//																		 Path,
+//																		 Document]);
 	end;
 end;
 
@@ -1716,6 +1978,14 @@ begin
 		ParentBoard.FModified := True;
 end;
 
+{procedure TThreadItem.SetRoundNo(i: Integer);
+begin
+	if FRoundNo = i then Exit;
+	FRoundNo := i;
+	if FUpdate and (ParentBoard <> nil) then
+		ParentBoard.FModified := True;
+end;}
+
 procedure TThreadItem.SetRound(b: Boolean);
 begin
 	if b then
@@ -1735,8 +2005,15 @@ begin
 	if FUpdate and (ParentBoard <> nil) then
 		ParentBoard.FModified := True;
 end;
-
-
+{
+procedure TThreadItem.SetRoundName(const s: PChar);
+begin
+	if FRoundName = s then Exit;
+	FRoundName := s;
+	if FUpdate and (ParentBoard <> nil) then
+		ParentBoard.FModified := True;
+end;
+}
 procedure TThreadItem.SetKokomade(i: Integer);
 begin
 	if FKokomade = i then Exit;
@@ -1777,6 +2054,12 @@ begin
 	FUpdate := True;
 end;
 
+{initialization
+	BBS2ch := TBBS.Create;
+
+finalization
+	if BBS2ch <> nil then
+		BBS2ch.Free;}
 function TThreadItem.GetCreateDate: TDateTime;
 var
 	unixtime: Int64;

--- a/Doxyfile
+++ b/Doxyfile
@@ -1,14 +1,14 @@
-# Doxyfile 1.4.6
+# Doxyfile 1.4.5
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = gikonavi
-PROJECT_NUMBER         = "b52 rev. 598"
+PROJECT_NUMBER         = b51
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = Japanese
-USE_WINDOWS_ENCODING   = YES
+USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
@@ -25,7 +25,7 @@ INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2
 ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 BUILTIN_STL_SUPPORT    = NO
 DISTRIBUTE_GROUP_DOC   = NO
@@ -43,11 +43,11 @@ HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
 HIDE_IN_BODY_DOCS      = NO
 INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
+CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = YES
 INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
+SORT_MEMBER_DOCS       = YES
 SORT_BRIEF_DOCS        = NO
 SORT_BY_SCOPE_NAME     = NO
 GENERATE_TODOLIST      = YES
@@ -83,13 +83,13 @@ EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = 
-INPUT_FILTER           = "pas2dox --sjis "
+INPUT_FILTER           = pas2doxj.bat
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = YES
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
+SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = YES

--- a/Editor.dfm
+++ b/Editor.dfm
@@ -1,6 +1,6 @@
 object EditorForm: TEditorForm
-  Left = 306
-  Top = 172
+  Left = 432
+  Top = 258
   Width = 640
   Height = 449
   HorzScrollBar.Visible = False
@@ -482,7 +482,7 @@ object EditorForm: TEditorForm
     Left = 72
     Top = 124
     Bitmap = {
-      494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1014,14 +1014,13 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFF7F887
       0003003FC1F7FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF7FEBF0003CC00FF0FFC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
-      000000000000}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
   end
   object HotToobarImageList: TImageList
     Left = 104
     Top = 124
     Bitmap = {
-      494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1553,8 +1552,7 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFE7F887
       0003003FC1F3FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF3FEBF0003CC00FF07FC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
-      000000000000}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
   end
   object Indy: TIdHTTP
     Intercept = IdLogDebug

--- a/Editor.pas
+++ b/Editor.pas
@@ -855,7 +855,7 @@ begin
 
 	Cookie := '';
 	if ACOOKIE <> '' then
-	   Cookie := ACOOKIE;
+       Cookie := ACOOKIE;
 	if SPID <> '' then
 		Cookie := Cookie + 'SPID=' + SPID + '; ';
 	if PON <> '' then
@@ -864,19 +864,9 @@ begin
 	//ƒzƒXƒg‚ª2ch‚ŁABe‚ÉLogin‚µ‚Ä‚¢‚ê‚ÎBE‚̃f[ƒ^‚ð‘—‚é
 	//GikoSys.ParseURI( URL, Protocol,Host, Path, Document, Port, Bookmark );
 	//if GikoSys.Is2chHost(Host) and GikoSys.Setting.BeLogin then
-	if (Board.Is2ch) then begin
-		// ŒÅ’è‚̃NƒbƒL[‚ª‚ ‚ê‚ΐH‚킹‚é
-		if Length(GikoSys.Setting.FixedCookie) > 0 then begin
-			// ƒzƒXƒg‚ª2ch‚̏ꍇCŒÅ’è‚̃NƒbƒL[‚ðH‚킹‚é
-			Cookie := Cookie + GikoSys.Setting.FixedCookie + '; ';
-		end;
-		if (GikoSys.Setting.BeLogin) then begin
-			Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
-					+ 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
-		end;
-
-	end;
-
+	if (Board.Is2ch) and (GikoSys.Setting.BeLogin) then
+	    Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
+    			+ 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
 	Cookie := 'Cookie: ' + Cookie + 'NAME=' + NameComboBox.Text + '; MAIL=' + MailComboBox.Text;
 
 	sysMenu := GetSystemMenu( Handle, false );
@@ -957,35 +947,35 @@ begin
 
 	                        if ABoard = nil then Exit;
 
-                                if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
-                                        body := TStringList.Create;
-                                        try
-                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                Remote := GetFusianaName(body, ABoard);
-                                        finally
-                                                body.Free;
-                                        end;
-                                end;
-
-                                //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾
-                                //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤...
-                                if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                        //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA
-                                        //‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢
-                                        tmpRawheader := Indy.Response.RawHeaders.Text;
-                                        GetSETTINGTXTAction.Execute;
-                                        body := TStringList.Create;
-                                        try
-                                                if FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                                        body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                        Remote := GetFusianaName(body, ABoard);
-                                                end;
-                                        finally
-                                                body.Free;
-                                        end;
+								if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
+										body := TStringList.Create;
+										try
+												body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+												Remote := GetFusianaName(body, ABoard);
+										finally
+												body.Free;
+										end;
+								end;
+
+								//Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾
+								//ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤‚Å•|‚¢EEE
+								if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
+										//GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA
+										//‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢
+										tmpRawheader := Indy.Response.RawHeaders.Text;
+										GetSETTINGTXTAction.Execute;
+										body := TStringList.Create;
+										try
+												if FileExists(ABoard.GetSETTINGTXTFileName) then begin
+													body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+													Remote := GetFusianaName(body, ABoard);
+												end;
+										finally
+												body.Free;
+										end;
                                 end;
 
-                                if Remote = 'fusianasan' then begin
+								if Remote = 'fusianasan' then begin
 				        MsgResult := MsgBox(
 					        	Handle,
 					        'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #13#10 +
@@ -1001,83 +991,83 @@ begin
 					        DrawMenuBar(Handle);
 					        Exit;
 						end;
-                                        end;
-                                end;
-
-			        if ResultType = grtOK then begin
-				        if (GikoSys.Setting.UseSamba) and  (Timer1.Enabled) then
-					        WriteSambaTime(FHost, Now());
-                                        State := gdsComplete;
-                                end else if ResultType = grtCookie then begin
-				        //ƒ‹[ƒv–hŽ~
-				        if not FirstWriting then
-					        raise Exception.Create('');
-                                        MsgResult := MsgBox(
-                                                Handle,
-                                                'E“Še‚³‚ꂽ“à—e‚̓Rƒs[A•Û‘¶Aˆø—pA“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 +
-                                                'E“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10#13#10 +
-                                                '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H',
-                                                'î•ñ',
-                                                MB_YESNO or MB_ICONQUESTION);
-				        if MsgResult = IDYES then begin
-					        if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
-						        GetCookie(tmpRawheader, Board);
-							end else begin
-								GetCookie(Indy.Response.RawHeaders.Text, Board);
-					        end;
-					        if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
-						        raise Exception.Create('');
-					        //‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh
-							Send(Board.Cookie, Board.SPID, Board.PON, False);
-					        Exit;
-				        end else begin
-					        Board.SPID := '';
-					        Board.PON := '';
-					        FWork := False;
-					        EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
-					        DrawMenuBar(Handle);
-					        Exit;
-				        end;
-			        end else if ResultType = grtCheck then begin
-				        //ƒ‹[ƒv–hŽ~
-				        if not FirstWriting then
-					        raise Exception.Create('');
+								end;
+                        end;
 
-				        MsgResult := MsgBox(
-					        Handle,
-					        '‘‚«ž‚Ý‚ÉŠÖ‚µ‚Ä‚Í—lX‚ȃƒOî•ñ‚ª‹L˜^‚³‚ê‚Ä‚¢‚Ü‚·B' + #13#10 +
-					        '“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10 +
-					        'Œö˜—Ç‘­‚É”½‚µ‚½‚èA‘¼l‚É–À˜f‚ð‚©‚¯‚鏑‚«ž‚݂͍T‚¦‚ĉº‚³‚¢B' + #13#10 +
-					        '“Še‚³‚ꂽ“à—e‚̓Rƒs[E•Û‘¶Eˆø—pE“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 +
-					        #13#10 +
-					        '‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H',
-					        'Šm”F',
-				        	MB_YESNO or MB_ICONQUESTION);
-
-				        if MsgResult = IDYES then begin
-                                                if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
-						        GetCookie(tmpRawheader, Board);
+			if ResultType = grtOK then begin
+				if (GikoSys.Setting.UseSamba) and  (Timer1.Enabled) then
+					WriteSambaTime(FHost, Now());
+				State := gdsComplete;
+			end else if ResultType = grtCookie then begin
+				//ƒ‹[ƒv–hŽ~
+				if not FirstWriting then
+					raise Exception.Create('');
+				MsgResult := MsgBox(
+					Handle,
+					'E“Še‚³‚ꂽ“à—e‚̓Rƒs[A•Û‘¶Aˆø—pA“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 +
+					'E“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10#13#10 +
+					'‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H',
+					'î•ñ',
+					MB_YESNO or MB_ICONQUESTION);
+				if MsgResult = IDYES then begin
+					if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
+						GetCookie(tmpRawheader, Board);
 					end else begin
 						GetCookie(Indy.Response.RawHeaders.Text, Board);
-                                        end;
-
-                                        if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
-                                                raise Exception.Create('');
-				        	Send(Board.Cookie, Board.SPID, Board.PON, False);
-					        Exit;
-				        end else begin
-					        EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
-					        DrawMenuBar(Handle);
-					        Board.SPID := '';
-					        Board.PON := '';
-					        FWork := false;
-					        Exit;
+					end;
+					if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
+						raise Exception.Create('');
+					//‚à‚¤ˆê‰ñ‚±‚̃ƒ\ƒbƒh
+					Send(Board.Cookie, Board.SPID, Board.PON, False);
+					Exit;
+				end else begin
+					Board.SPID := '';
+					Board.PON := '';
+					FWork := false;
+					EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+					DrawMenuBar(Handle);
+					Exit;
+				end;
+			end else if ResultType = grtCheck then begin
+				//
+				//ƒ‹[ƒv–hŽ~
+				if not FirstWriting then
+					raise Exception.Create('');
+
+				MsgResult := MsgBox(
+					Handle,
+					'‘‚«ž‚Ý‚ÉŠÖ‚µ‚Ä‚Í—lX‚ȃƒOî•ñ‚ª‹L˜^‚³‚ê‚Ä‚¢‚Ü‚·B' + #13#10 +
+					'“Še‚ÉŠÖ‚µ‚Ä”­¶‚·‚éÓ”C‚Í‘S‚Ä“ŠeŽÒ‚É‹A‚µ‚Ü‚·B' + #13#10 +
+					'Œö˜—Ç‘­‚É”½‚µ‚½‚èA‘¼l‚É–À˜f‚ð‚©‚¯‚鏑‚«ž‚݂͍T‚¦‚ĉº‚³‚¢B' + #13#10 +
+					'“Še‚³‚ꂽ“à—e‚̓Rƒs[E•Û‘¶Eˆø—pE“]Ú“™‚³‚ê‚éê‡‚ª‚ ‚è‚Ü‚·B' + #13#10 +
+					#13#10 +
+					'‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Ý‚Ü‚·‚©H',
+					'Šm”F',
+					MB_YESNO or MB_ICONQUESTION);
+
+				if MsgResult = IDYES then begin
+                    if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
+						GetCookie(tmpRawheader, Board);
+					end else begin
+						GetCookie(Indy.Response.RawHeaders.Text, Board);
+                    end;
+					if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
+						raise Exception.Create('');
+					Send(Board.Cookie, Board.SPID, Board.PON, False);
+					Exit;
+				end else begin
+					EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
+					DrawMenuBar(Handle);
+					Board.SPID := '';
+					Board.PON := '';
+					FWork := false;
+					Exit;
 				        end;
 			        end else begin
-                                        if (GikoSys.Setting.UseSamba)  and  (Timer1.Enabled) then
-					        WriteSambaTime(FHost, Now());
-                                        State := gdsError;
-                                        raise Exception.Create('');
+                        if (GikoSys.Setting.UseSamba)  and  (Timer1.Enabled) then
+							WriteSambaTime(FHost, Now());
+				        State := gdsError;
+				        raise Exception.Create('');
 			        end;
 
 		except
@@ -1120,9 +1110,8 @@ begin
 		DrawMenuBar(Handle);
 	end;
 	FWork := false;
-    //”ñŒöŽ®ƒMƒRƒiƒr”‚ȂǂÌ2chŒÝŠ·ƒXƒNƒŠƒvƒg—p
-    //2chˆÈŠO‚Å‚©‚ÂResponceCode‚ª302Found‚ŏ‘‚«ž‚ÝŠ®—¹
-    //if (not Board.Is2ch) and (FStatusCode = 302) then begin
+    //”ñŒöŽ®ƒMƒRƒiƒr”‚Ȃǂ̃XƒNƒŠƒvƒg—p
+    //ResponceCode‚ª302Found‚ŏ‘‚«ž‚ÝŠ®—¹
     if FStatusCode = 302 then begin
         GikoForm.PlaySound('ResEnd');
         SaveSendFile;
@@ -1213,13 +1202,12 @@ begin
 		s := 'sid=' + HttpEncode(SessionID) + '&'
 	else
 		s := '';
-        s := s + 'subject=&'
-               + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
-               + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
-               + 'MESSAGE=' + HttpEncode(body) + '&'
-               + 'bbs=' + Board.BBSID + '&'
-			   + 'time=' + IntToStr(SendTime) + '&';
-			   
+	s := s + 'subject=&'
+				 + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
+				 + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
+				 + 'MESSAGE=' + HttpEncode(body) + '&'
+				 + 'bbs=' + Board.BBSID + '&'
+				 + 'time=' + IntToStr(SendTime) + '&';
 	if FThreadItem = nil then begin
 		s := s + 'subject=' + HttpEncode(TitleEdit.Text) + '&';
 		s := s + 'submit=' + HttpEncode('‘SÓ”C‚𕉂¤‚±‚Æ‚ð³‘ø‚µ‚ď‘‚«ž‚Þ') + #13#10;
@@ -2182,7 +2170,7 @@ begin
 		end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
 			ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
 		end else begin
-			ABoard.Cookie := ABoard.Cookie + val + '; ';
+			ABoard.Cookie := val + '; ';
 		end;
 		//expires‚ðØ‚èo‚·
 		val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -4469,7 +4469,7 @@ object GikoForm: TGikoForm
     Left = 4
     Top = 244
     Bitmap = {
-      494C010138003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010138003B00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000F0000000010020000000000000F0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -6453,8 +6453,7 @@ object GikoForm: TGikoForm
       00000000C003FFFF0000000080017FFF0000000080013F7F0000000000000E3F
       000000000000861F800000000000C20FC00100000000E007F81F00000000F043
       F00F00000000F861E00700008001FC70C003803F8001FEFCF81FC07FC003FFFE
-      F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
-      000000000000}
+      F81FE0FFE007FFFFF83FFFFFF81FFFFF}
   end
   object ItemImageList: TImageList
     Left = 4
@@ -7886,12 +7885,10 @@ object GikoForm: TGikoForm
       end
       object N76: TMenuItem
         Action = GikoDM.LiveItemAction
-        AutoCheck = True
         GroupIndex = 1
       end
       object DAT3: TMenuItem
         Action = GikoDM.ArchiveItemAction
-        AutoCheck = True
         GroupIndex = 1
       end
       object S2: TMenuItem
@@ -8649,9 +8646,6 @@ object GikoForm: TGikoForm
     object N58: TMenuItem
       Caption = '-'
     end
-    object FavoriteTreeItemNameCopyPopupMenu: TMenuItem
-      Action = GikoDM.FavoriteTreeViewItemNameCopyAction
-    end
     object FavoriteTreeURLCopyPopupMenu: TMenuItem
       Action = GikoDM.FavoriteTreeViewURLCopyAction
     end
@@ -8728,11 +8722,9 @@ object GikoForm: TGikoForm
     end
     object N75: TMenuItem
       Action = GikoDM.LiveItemAction
-      AutoCheck = True
     end
     object DAT2: TMenuItem
       Action = GikoDM.ArchiveItemAction
-      AutoCheck = True
     end
     object N68: TMenuItem
       Caption = '-'

--- a/Giko.pas
+++ b/Giko.pas
@@ -408,7 +408,6 @@ type
     N75: TMenuItem;
     DAT3: TMenuItem;
     N76: TMenuItem;
-    FavoriteTreeItemNameCopyPopupMenu: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure BrowserStatusTextChange(Sender: TObject;
@@ -669,8 +668,6 @@ type
 		procedure OpenThreadItem(Thread: TThreadItem; URL: String);
 		//! ListViewiƒXƒŒƒbƒhˆê——j‚ðXV‚·‚é
 		procedure RefreshListView(Thread: TThreadItem);
-		//! ƒXƒŒƒbƒhˆê——‚Ì•\Ž¦”͈͐ݒèƒ`ƒFƒbƒNƒNƒŠƒA
-		procedure ClearThreadRengeAction;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -1466,32 +1463,21 @@ procedure TGikoForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
 //	if GikoForm.WindowState <> wsMinimized then
 //		SaveCoolBarSettings;
-	CanClose := True;
 	if ( GikoSys.Setting.ShowDialogForEnd ) and
 			(MessageDlg('ƒMƒRƒiƒr‚ðI—¹‚µ‚Ä‚æ‚낵‚¢‚Å‚·‚©H', mtConfirmation,[mbOk, mbCancel], 0) = mrCancel ) then begin
 		CanClose := false;
 			Exit;
-	end;
-
-	if GikoSys.Setting.TabAutoLoadSave then begin
-		GikoDM.TabAutoSaveAction.Execute;
-	end;
-
-	if (SearchDialog <> nil) then begin
-		if (SearchDialog.Visible) then begin
-			SearchDialog.Close;
-			try
-				SearchDialog.Release;
-			except
-			end;
-			SearchDialog := nil;
+	end else begin
+		CanClose := True;
+		if GikoSys.Setting.TabAutoLoadSave then begin
+			GikoDM.TabAutoSaveAction.Execute;
 		end;
 	end;
-	{    //2chŒ¾Œȩ̂²ÙFree
+    {    //2chŒ¾Œȩ̂²ÙFree
 		if GikoSys.Setting.Gengo <> nil then begin
 				GikoSys.Setting.Gengo.Free;
         end;
-	}
+    }
 	Application.UnhookMainWindow(Hook);
 	Application.Terminate;
 end;
@@ -1912,8 +1898,8 @@ begin
 				tmp2 := ZenToHan(e.Get_outerText);
 				if (GikoSys.IsNumeric(tmp2)) then begin
 					//‚“‚̓ŒƒX”ԍ†‚Á‚Û‚¢‚Á‚·B
-					wkIntSt := StrToInt64(tmp2);
-					wkIntTo := StrToInt64(tmp2);
+					wkIntSt := StrToInt(tmp2);
+					wkIntTo := StrToInt(tmp2);
 						//s := GetThreadText(wkBBS, wkKey, wkIntSt, wkIntTo, False, False);
 					FHint.PopupType := gptThread;
 					HTMLCreater.SetResPopupText(FHint, GetActiveContent, wkIntSt, wkIntTo, False, False);
@@ -4623,7 +4609,7 @@ begin
 		threadNumber := ChangeFileExt(Thread.FileName, '');
 		GikoSys.GetPopupResNumber( URL, stRes, edRes );
 		// ƒXƒŒ‚̔ԍ†‚ðƒŒƒX”Ô‚ÆŒë‚Á‚Ä”FŽ¯‚µ‚Ä‚¢‚é‚Ì‚ðƒNƒŠƒA
-		if (StrToInt64(threadNumber) = stRes) then begin
+		if (StrToInt(threadNumber) = stRes) then begin
 			if not (AnsiEndsText(threadNumber + '/' + threadNumber, URL))
 				and (Pos('&st=' + threadNumber , URL) = 0) then begin
 				stRes := 0;
@@ -4782,7 +4768,7 @@ begin
 				end;
 			end;
 			// ƒƒO‚È‚µƒXƒŒƒbƒh‚Ì‚Æ‚«‚́AƒzƒXƒg–¼‚̃`ƒFƒbƒN‚ð‚·‚é
-			if (not ThreadItem.IsLogFile) then begin
+			if not ThreadItem.IsLogFile then begin
 				if AnsiPos(Host, Board.URL) = 0 then
 					ThreadItem.DownloadHost := Host
 				else
@@ -5099,7 +5085,7 @@ begin
 
 			ThreadItem := GetActiveContent;
 			if ThreadItem <> nil then begin
-				Num := StrToInt64(s);
+				Num := StrToInt(s);
 				FHint.PopupType := gptThread;
 				HTMLCreater.SetResPopupText(FHint, ThreadItem, Num, Num, False, False);
 				if FHint.ResCount <> 0 then
@@ -5824,16 +5810,27 @@ end;
 
 procedure TGikoForm.SetSelectWord( const text : string );
 begin
-	// ƒXƒŒˆê——‚͈͎̔w’è‚ð‰ðœ
-	ClearThreadRengeAction;
 
 	if Length( text ) = 0 then
 	begin
 		GikoDM.AllItemAction.Checked := True;
-		SetListViewType( gvtAll )
+		GikoDM.LogItemAction.Checked := False;
+		GikoDM.NewItemAction.Checked := False;
 	end else begin
-		SetListViewType( gvtUser, text, false );
+		// ƒ`ƒ‰‚‚­‚ÆŒ™‚¾‚©‚çAˆê‰ž‰Ÿ‚µ‚Ä‚ ‚é‚Æ‚«‚¾‚¯ˆ—‚·‚é
+		if GikoDM.AllItemAction.Checked then
+			GikoDM.AllItemAction.Checked := False;
+		if GikoDM.LogItemAction.Checked then
+			GikoDM.LogItemAction.Checked := False;
+		if GikoDM.NewItemAction.Checked then
+			GikoDM.NewItemaction.Checked := False;
 	end;
+
+	if Length( text ) = 0 then
+		SetListViewType( gvtAll )
+	else
+		SetListViewType( gvtUser, text, false );
+
 end;
 
 procedure TGikoForm.SelectComboBoxChange(Sender: TObject);
@@ -5869,9 +5866,7 @@ begin
 			end else
 				Str := SelectComboBox.Text + Str;
 
-			if (Length(Str) > 0) then begin
-				SetSelectWord(Str);
-			end;
+			SetSelectWord(Str);
 		end;
 	end else if Length( SelectComboBox.Text ) = 0 then
 	begin
@@ -5880,27 +5875,16 @@ begin
 		 * i‚±‚±‚ł͉½‚à‚µ‚È‚¢j
 		 *}
 	end else begin
-        // ƒXƒŒˆê——‚͈͎̔w’è‚ð‰ðœ
-		ClearThreadRengeAction;
+		// ƒ`ƒ‰‚‚­‚ÆŒ™‚¾‚©‚çAˆê‰ž‰Ÿ‚µ‚Ä‚ ‚é‚Æ‚«‚¾‚¯ˆ—‚·‚é
+		if GikoDM.AllItemAction.Checked then
+			GikoDM.AllItemAction.Checked := False;
+		if GikoDM.LogItemAction.Checked then
+			GikoDM.LogItemAction.Checked := False;
+		if GikoDM.NewItemAction.Checked then
+			GikoDM.NewItemaction.Checked := False;
 	end;
 
 end;
-//! ƒXƒŒƒbƒhˆê——‚Ì•\Ž¦”͈͐ݒèƒ`ƒFƒbƒNƒNƒŠƒA
-procedure TGikoForm.ClearThreadRengeAction;
-begin
-	// ƒ`ƒ‰‚‚­‚ÆŒ™‚¾‚©‚çAˆê‰ž‰Ÿ‚µ‚Ä‚ ‚é‚Æ‚«‚¾‚¯ˆ—‚·‚é
-	if GikoDM.AllItemAction.Checked then
-		GikoDM.AllItemAction.Checked := False;
-	if GikoDM.LogItemAction.Checked then
-		GikoDM.LogItemAction.Checked := False;
-	if GikoDM.NewItemAction.Checked then
-		GikoDM.NewItemaction.Checked := False;
-	if GikoDM.LiveItemAction.Checked then
-		GikoDM.LiveItemAction.Checked := False;
-	if GikoDM.ArchiveItemAction.Checked then
-		GikoDM.ArchiveItemAction.Checked := False;
-
-end;
 
 procedure TGikoForm.SelectComboBoxExit(Sender: TObject);
 begin
@@ -6238,29 +6222,26 @@ begin
 		FavoriteTreeNameURLCopyPopupMenu.Visible := False;
 		FavoriteTreeReloadPopupMenu.Visible := False;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := False;
 	end else if FClickNode.IsFirstNode then begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := True;
 		FavoriteTreeDeletePopupMenu.Visible := False;
 		FavoriteTreeRenamePopupMenu.Visible := False;
 		FavoriteTreeNewFolderPopupMenu.Visible := True;
 		FavoriteTreeURLCopyPopupMenu.Visible := False;
-		FavoriteTreeNameCopyPopupMenu.Visible := False;
+		FavoriteTreeNameCopyPopupMenu.Visible := True;
 		FavoriteTreeNameURLCopyPopupMenu.Visible := False;
 		FavoriteTreeReloadPopupMenu.Visible := False;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := True;
 	end else if FClickNode.Text = Favorite.FAVORITE_LINK_NAME then begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := True;
 		FavoriteTreeDeletePopupMenu.Visible := True;
 		FavoriteTreeRenamePopupMenu.Visible := False;
 		FavoriteTreeNewFolderPopupMenu.Visible := True;
 		FavoriteTreeURLCopyPopupMenu.Visible := False;
-		FavoriteTreeNameCopyPopupMenu.Visible := False;
+		FavoriteTreeNameCopyPopupMenu.Visible := True;
 		FavoriteTreeNameURLCopyPopupMenu.Visible := False;
 		FavoriteTreeReloadPopupMenu.Visible := False;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := True;
 	end else if TObject(FClickNode.Data) is TFavoriteFolder then begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := True;
 		FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6271,7 +6252,6 @@ begin
 		FavoriteTreeNameURLCopyPopupMenu.Visible := False;
 		FavoriteTreeReloadPopupMenu.Visible := False;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := True;
 	end else if TObject(FClickNode.Data) is TFavoriteThreadItem then begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := False;
 		FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6282,7 +6262,6 @@ begin
 		FavoriteTreeNameURLCopyPopupMenu.Visible := True;
 		FavoriteTreeReloadPopupMenu.Visible := True;
 		FavoriteTreeLogDeletePopupMenu.Visible := True;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := True;
 	end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := False;
 		FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6293,7 +6272,6 @@ begin
 		FavoriteTreeNameURLCopyPopupMenu.Visible := True;
 		FavoriteTreeReloadPopupMenu.Visible := True;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := True;
 	end else begin
 		FavoriteTreeBrowseFolderPopupMenu.Visible := False;
 		FavoriteTreeDeletePopupMenu.Visible := False;
@@ -6304,7 +6282,6 @@ begin
 		FavoriteTreeNameURLCopyPopupMenu.Visible := False;
 		FavoriteTreeReloadPopupMenu.Visible := False;
 		FavoriteTreeLogDeletePopupMenu.Visible := False;
-		FavoriteTreeItemNameCopyPopupMenu.Visible := False;
 	end;
 
 end;

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -913,7 +913,7 @@ object GikoDM: TGikoDM
     object FavoriteTreeViewURLCopyAction: TAction
       Tag = -1
       Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
-      Caption = 'URL'#12434#12467#12500#12540'(&U)'
+      Caption = 'URL'#12434#12467#12500#12540'(&C)'
       Hint = #36984#25246#12373#12428#12390#12356#12427#12473#12524#12483#12489#12398'URL'#12434#12467#12500#12540#12377#12427
       OnExecute = FavoriteTreeViewURLCopyActionExecute
     end
@@ -1234,12 +1234,6 @@ object GikoDM: TGikoDM
       ShortCut = 16454
       OnExecute = OpenFindDialogActionExecute
     end
-    object FavoriteTreeViewItemNameCopyAction: TAction
-      Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
-      Caption = #34920#31034#21517#12434#12467#12500#12540'(&S)'
-      Hint = #34920#31034#12375#12390#12356#12427#21517#21069#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
-      OnExecute = FavoriteTreeViewItemNameCopyActionExecute
-    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -217,7 +217,6 @@ type
     OpenFindDialogAction: TAction;
     ArchiveItemAction: TAction;
     LiveItemAction: TAction;
-    FavoriteTreeViewItemNameCopyAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -404,7 +403,6 @@ type
     procedure OpenFindDialogActionExecute(Sender: TObject);
     procedure ArchiveItemActionExecute(Sender: TObject);
     procedure LiveItemActionExecute(Sender: TObject);
-    procedure FavoriteTreeViewItemNameCopyActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -726,7 +724,7 @@ begin
 
 end;
 // *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚邨‹C‚É“ü‚è‚ÌURL‚ðƒRƒs[‚·‚é
+//! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚ÌURL‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewURLCopyActionExecute(Sender: TObject);
 begin
@@ -738,7 +736,7 @@ begin
 	end;
 end;
 // *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚邨‹C‚É“ü‚è‚Ì–¼‘O‚ðƒRƒs[‚·‚é
+//! ‘I‘ð‚³‚ê‚Ä‚¢‚锂̖¼‘O‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewNameCopyActionExecute(Sender: TObject);
 begin
@@ -748,14 +746,10 @@ begin
 	if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
 		Clipboard.AsText :=
 			TFavoriteItem(GikoForm.ClickNode.Data).GetItemTitle + #13#10;
-	end else begin
-		Clipboard.AsText :=
-			GikoForm.ClickNode.Text + #13#10;
-
 	end;
 end;
 // *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚邨‹C‚É“ü‚è‚Ì–¼‘O‚ÆURL‚ðƒRƒs[‚·‚é
+//! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚Ì–¼‘O‚ÆURL‚ðƒRƒs[‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewNameURLCopyActionExecute(
   Sender: TObject);
@@ -773,7 +767,7 @@ begin
 
 end;
 // *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚邨‹C‚É“ü‚èƒXƒŒƒbƒh‚ðíœ‚·‚é
+//! ‘I‘ð‚³‚ê‚Ä‚¢‚éƒXƒŒƒbƒh‚ðíœ‚·‚é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewLogDeleteActionExecute(Sender: TObject);
 const
@@ -3865,17 +3859,6 @@ begin
 	end;
 end;
 
-// *************************************************************************
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚邨‹C‚É“ü‚è‚Ì•\Ž¦–¼‚ðƒRƒs[‚·‚é
-// *************************************************************************
-procedure TGikoDM.FavoriteTreeViewItemNameCopyActionExecute(
-  Sender: TObject);
-begin
-	if GikoForm.ClickNode = nil then Exit;
-
-	Clipboard.AsText :=
-			GikoForm.ClickNode.Text + #13#10;
-end;
 
 end.
 

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -649,10 +649,12 @@ begin
 				//ThreadItem.ShortTitle := CustomStringReplace(ZenToHan(ThreadItem.Title), ' ', '');
 				ThreadItem.Count := Rec.FCount;
 				ThreadItem.Size := Rec.FSize;
+//			ThreadItem.RoundNo := Rec.FRoundNo;
 				ThreadItem.RoundDate := Rec.FRoundDate;
 				ThreadItem.LastModified := Rec.FLastModified;
 				ThreadItem.Kokomade := Rec.FKokomade;
 				ThreadItem.NewReceive := Rec.FNewReceive;
+//			ThreadItem.Round := Rec.FRound;
 				ThreadItem.UnRead := Rec.FUnRead;
 				ThreadItem.ScrollTop := Rec.FScrollTop;
 				ThreadItem.AllResCount := Rec.FAllResCount;
@@ -665,6 +667,17 @@ begin
 				Node := FavoriteDM.TreeView.Items.AddChildObject( FavoriteDM.TreeView.Items.Item[0], ThreadItem.Title, FavoThreadItem);
 				*}
 
+				{//„‰ñƒŠƒXƒg‚É‘¶Ý‚µ‚½‚珄‰ñƒtƒ‰ƒOƒZƒbƒg
+				if ThreadItem.IsLogFile then begin
+					idx := RoundList.Find(ThreadItem);
+					if idx <> -1 then begin
+						RoundItem := RoundList.Items[idx, grtItem];
+						ThreadItem.RoundName := RoundItem.RoundName;
+						ThreadItem.Round := True;
+					end;
+				end;
+				}
+
 				ThreadItem.EndUpdate;
 				Board.Add(ThreadItem);
 

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -38,7 +38,6 @@ type
 		destructor Destory;
 		procedure Open;
 		procedure Close;
-		procedure Flush;
 		function Add(const S: string): Integer; override;
 	end;
 	THTMLCreate = class(TObject)
@@ -54,10 +53,10 @@ type
 		constructor Create;
 
 		function AddBeProfileLink(AID : string; ANum: Integer):string ;
-		procedure CreateUsePluginHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; var sTitle: string);
-		procedure CreateUseSKINHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList);
-		procedure CreateUseCSSHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
-		procedure CreateDefaultHTML (html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+		procedure CreateUsePluginHTML(html:TStringList; ThreadItem: TThreadItem; var sTitle: string);
+		procedure CreateUseSKINHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList);
+		procedure CreateUseCSSHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+		procedure CreateDefaultHTML (html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 		procedure ConvertResAnchor(PRes: PResRec);
 		procedure separateNumber(var st: String; var et: String; const Text, Separator: String);
 		function checkComma(const s : String; var j : Integer; var No  : String) : boolean;
@@ -296,10 +295,10 @@ begin
 				if pos = nil then
 					b := Length(REF_MARK[idx2])
 				else
-					b := pos - (pp  + idx) + 1;
+					b := pos - pp + 1;
 
 				len := Length(PRes.FBody);
-				SetLength(PRes.FBody, len + idx + b );
+				SetLength(PRes.FBody, len + idx + b);
 				Move(pp^, PRes.FBody[len + 1], idx + b);
 				Delete(s, 1, idx + b);
 			end else begin
@@ -794,7 +793,7 @@ begin
 end;
 
 //Plugin‚ð—˜—p‚·‚éBoard‚̃XƒŒƒbƒh‚ÌHTML‚ðì¬‚µ‚Ädoc‚ɏ‘‚«ž‚Þ
-procedure THTMLCreate.CreateUsePluginHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; var sTitle: string);
+procedure THTMLCreate.CreateUsePluginHTML(html:TStringList; ThreadItem: TThreadItem; var sTitle: string);
 var
 	i: integer;
 	NewReceiveNo: Integer;
@@ -809,8 +808,7 @@ begin
 	html.add(boardPlugIn.GetHeader( DWORD( threadItem ),
 		'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ));
 	html.Add('<p id="idSearch"></p>');
-	html.Flush;
-	
+
 	for i := 0 to threadItem.Count - 1 do begin
 		// 1 ‚Í•K‚¸•\Ž¦
 		if i <> 0 then begin
@@ -879,7 +877,7 @@ begin
 end;
 
 
-procedure THTMLCreate.CreateUseSKINHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList);
+procedure THTMLCreate.CreateUseSKINHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList);
 const
 	KOKO_TAG = '<a name="koko"></a>';
 	NEW_TAG = '<a name="new"></a>';
@@ -914,7 +912,6 @@ begin
 	SkinRes := LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, ThreadItem.Size );
 
 	html.Add('<p id="idSearch"></p>'#13#10'<a name="top"></a>');
-	html.Flush;
 
 	for i := 0 to ReadList.Count - 1 do begin
 		// 1 ‚Í•K‚¸•\Ž¦
@@ -969,7 +966,7 @@ begin
 	html.Add( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
 end;
 
-procedure THTMLCreate.CreateUseCSSHTML(html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+procedure THTMLCreate.CreateUseCSSHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 const
 	FORMAT_NOMAIL  = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
 					+ '<span class="name_label"> –¼‘OF </span> <span class="name"><b>%s</b></span>'
@@ -1013,7 +1010,6 @@ begin
 		html.Add('</head>'#13#10'<body>');
 		html.Add('<a name="top"></a>'#13#10'<p id="idSearch"></p>');
 		html.Add('<div class="title">' + sTitle + '</div>');
-		html.Flush;
 		for i := 0 to ReadList.Count - 1 do begin
 			// 1 ‚Í•K‚¸•\Ž¦
 			if i <> 0 then begin
@@ -1061,7 +1057,7 @@ begin
 	end;
 end;
 
-procedure THTMLCreate.CreateDefaultHTML (html:TBufferedWebBrowser; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+procedure THTMLCreate.CreateDefaultHTML (html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 var
 	i: integer;
 	No: string;
@@ -1082,7 +1078,6 @@ begin
 	html.Add('<font size=+1 color="#FF0000">' + sTitle + '</font>');
 	html.Add('<dl>');
 	html.Add('<p id="idSearch"></p>');
-	html.Flush;
 	for i := 0 to ReadList.Count - 1 do begin
 		// 1 ‚Í•K‚¸•\Ž¦
 		if i <> 0 then begin
@@ -1721,7 +1716,7 @@ begin
 	end else begin
 		FBuffSize := BuffSize;
 	end;
-	Self.Capacity := FBuffSize + 10;
+	Self.Capacity := FBuffSize + 1;
 end;
 procedure TBufferedWebBrowser.Open;
 begin
@@ -1731,7 +1726,10 @@ begin
 end;
 procedure TBufferedWebBrowser.Close;
 begin
-	Self.Flush;
+	if (Self.Count > 0) then begin
+		FBrowserDoc.Write(Self.Text);
+		Self.Clear;
+	end;
 	try
 		FBrowserDoc.Close;
 	except
@@ -1740,19 +1738,12 @@ begin
 end;
 function TBufferedWebBrowser.Add(const S: string): Integer;
 begin
-	Result := inherited Add(TrimRight(s));
+	Result := inherited Add(S);
 	if (Self.Count > FBuffSize) then begin
 		FBrowserDoc.Write(Self.Text);
 		Self.Clear;
 	end;
 end;
-procedure TBufferedWebBrowser.Flush ;
-begin
-	if (Self.Count > 0) then begin
-		FBrowserDoc.Write(Self.Text);
-		Self.Clear;
-	end;
-end;
 destructor TBufferedWebBrowser.Destory;
 begin
 	try

--- a/InputAssist.pas
+++ b/InputAssist.pas
@@ -72,7 +72,7 @@ var
 
 implementation
 
-uses Setting, MojuUtils;
+uses Setting;
 
 
 {$R *.dfm}
@@ -194,19 +194,15 @@ procedure TInputAssistForm.GikoListView1Compare(Sender: TObject; Item1,
 begin
 	if ((FSortColumn and 2) > 0) then begin
 		// ƒJƒeƒSƒŠ‚Ń\[ƒg
-		Compare := CompareStr(
-			ZenToHan(Item1.SubItems[0]), ZenToHan(Item2.SubItems[0]));
+		Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
 		if (Compare = 0) then begin
-			Compare := CompareStr(
-				ZenToHan(Item1.Caption), ZenToHan(Item2.Caption));
+			Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
 		end;
 	end else begin
 		// ƒL[‚Ń\[ƒg
-		Compare := CompareStr(
-			ZenToHan(Item1.Caption), ZenToHan(Item2.Caption));
+		Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
 		if (Compare = 0) then begin
-			Compare := CompareStr(
-				ZenToHan(Item1.SubItems[0]), ZenToHan(Item2.SubItems[0]));
+			Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
 		end;
 	end;
 	// ¸‡~‡‚Ì”½“]

--- a/InputAssistDataModule.pas
+++ b/InputAssistDataModule.pas
@@ -3,7 +3,7 @@ unit InputAssistDataModule;
 interface
 
 uses
-  SysUtils, Classes, Windows;
+  SysUtils, Classes;
 
 type
   TResistWord = class;
@@ -15,7 +15,6 @@ type
 	{ Private éŒ¾ }
 	FInit : Boolean;
 	FDictionary : TStringList;	///< “o˜^’PŒê‚Æ’èŒ^•¶‚ÌŽ«‘
-	FSorted : Boolean;
 	function GetSorted: Boolean;	///< ƒ\[ƒg‚̏ó‘Ԃ̎擾
 	procedure SetSorted(Value: Boolean);	///< ƒ\[ƒgó‘Ԃ̐ݒè
 
@@ -58,7 +57,6 @@ type
   end;
 
   function CategorySort(List: TStringList; Index1, Index2: Integer): Integer;
-  function KeySort(List: TStringList; Index1, Index2: Integer): Integer;
 var
   InputAssistDM: TInputAssistDM;
 
@@ -118,13 +116,6 @@ var
 begin
 	FInit := True;
 	try
-		// iniƒtƒ@ƒCƒ‹‚ª–³‚¯‚ê‚΁AƒfƒtƒHƒ‹ƒg‚ðƒŠƒl[ƒ€‚·‚é
-		if not FileExists(FilePath) then begin
-			CopyFile(
-					PChar(ChangeFileExt(FilePath, '.default')),
-					PChar(FilePath), True);
-		end;
-
 		// ƒtƒ@ƒCƒ‹‚Ì‘¶Ý‚ðŠm”F
 		if FileExists(FilePath) then begin
 			ini := TMemIniFile.Create(FilePath);
@@ -149,9 +140,6 @@ begin
 				sections.Free;
 				ini.Free;
 			end;
-			if FSorted Then begin
-				FDictionary.CustomSort(KeySort);
-			end;
 		end;
 
 	except
@@ -167,11 +155,10 @@ var
 begin
 	if FileExists(FilePath) then begin
 		try
-			SysUtils.DeleteFile(FilePath);
+			DeleteFile(FilePath);
 		except
 		end;
 	end;
-
 	ini := TMemIniFile.Create(FilePath);
 	try
 		for i :=0 to FDictionary.Count - 1 do begin
@@ -201,8 +188,8 @@ end;
 procedure TInputAssistDM.DataModuleCreate(Sender: TObject);
 begin
 	FDictionary := TStringList.Create;
-	FDictionary.Sorted := False;
-	FSorted := True;
+	FDictionary.Duplicates := dupAccept;
+	FDictionary.Sorted := True;
 end;
 //! “o˜^’PŒê”Žæ“¾
 function TInputAssistDM.ResistWordCount : Integer;
@@ -235,9 +222,6 @@ begin
 				break;
 			end;
 		end;
-		if FSorted Then begin
-			FDictionary.CustomSort(KeySort);
-		end;
 	end;
 end;
 //! “o˜^’PŒê’ljÁ
@@ -253,9 +237,6 @@ begin
 		resWord.SetText('’èŒ^•¶');
 		FDictionary.AddObject(Key, resWord);
 		Result := resWord;
-		if FSorted Then begin
-			FDictionary.CustomSort(KeySort);
-		end;
 	end;
 end;
 //! “o˜^’PŒê‚̃L[•ÏX
@@ -270,10 +251,6 @@ begin
 				break;
 			end;
 		end;
-		if FSorted Then begin
-			FDictionary.CustomSort(KeySort);
-		end;
-
 	end;
 end;
 //! Key‚ðŽ‚Â“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
@@ -323,15 +300,17 @@ end;
 //! ƒ\[ƒg‚̏ó‘Ԃ̎擾
 function TInputAssistDM.GetSorted: Boolean;
 begin
-	Result := FSorted;
+	Result := False;
+	if (FDictionary <> nil) then begin
+		Result := FDictionary.Sorted;
+	end;
 end;
 //! ƒ\[ƒgó‘Ԃ̐ݒè
 procedure TInputAssistDM.SetSorted(Value: Boolean);
 begin
-	if (not FSorted) and (Value) then begin
-		FDictionary.CustomSort(KeySort);
+	if (FDictionary <> nil) then begin
+		FDictionary.Sorted := Value;
 	end;
-	FSorted := Value;
 end;
 //! Key‚̃JƒeƒSƒŠ‚É“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
 function TInputAssistDM.GetCategoryResistWords(Key: String; var list: TStringList): Integer;
@@ -381,30 +360,9 @@ begin
 	try
 		resWord1 := TResistWord(List.Objects[Index1]);
 		resWord2 := TResistWord(List.Objects[Index2]);
-		Result := CompareStr(ZenToHan(resWord1.GetCategory),
-								 ZenToHan(resWord2.GetCategory));
-		if (Result = 0) then begin
-			Result := CompareStr(ZenToHan(resWord1.GetKey),
-									 ZenToHan(resWord2.GetKey));
-		end;
-	except
-	end;
-end;
-//! Key‚ð‘S”¼Šp–³Ž‹‚ÌŒ`‚Ń\[ƒg‚·‚éÛ‚Ì”äŠrƒƒ\ƒbƒh
-function KeySort(List: TStringList; Index1, Index2: Integer): Integer;
-var
-	resWord1 : TResistWord;
-	resWord2 : TResistWord;
-begin
-	Result := 0;
-	try
-		resWord1 := TResistWord(List.Objects[Index1]);
-		resWord2 := TResistWord(List.Objects[Index2]);
-		Result := CompareStr(ZenToHan(resWord1.FKey),
-								 ZenToHan(resWord2.FKey));
+		Result := AnsiCompareStr(resWord1.GetCategory, resWord2.GetCategory);
 		if (Result = 0) then begin
-			Result := CompareStr(ZenToHan(resWord1.GetCategory),
-									 ZenToHan(resWord2.GetCategory));
+			Result := AnsiCompareStr(resWord1.GetKey, resWord2.GetKey);
 		end;
 	except
 	end;

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -363,39 +363,6 @@ object KuroutOption: TKuroutOption
         end
       end
     end
-    object KakikomiTabSheet: TTabSheet
-      Caption = #35443#32048#35373#23450'3'
-      ImageIndex = 2
-      object CookieGroupBox: TGroupBox
-        Left = 16
-        Top = 16
-        Width = 473
-        Height = 105
-        Caption = #12463#12483#12461#12540
-        TabOrder = 0
-        object Label8: TLabel
-          Left = 16
-          Top = 20
-          Width = 59
-          Height = 12
-          Caption = #22266#23450'Cookie'
-        end
-        object Label9: TLabel
-          Left = 20
-          Top = 67
-          Width = 321
-          Height = 12
-          Caption = '2'#12385#12419#12435#12397#12427#12408#12398#26360#12365#36796#12415#12398#38555#12395#65380#19978#35352#12398#25991#23383#21015#12434#24120#12395#36865#20449#12377#12427
-        end
-        object FixedCookieEdit: TEdit
-          Left = 16
-          Top = 40
-          Width = 441
-          Height = 20
-          TabOrder = 0
-        end
-      end
-    end
   end
   object OkBotton: TButton
     Left = 224

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -56,11 +56,6 @@ type
     Label6: TLabel;
     ReadTimeOut: TEdit;
     Label7: TLabel;
-    KakikomiTabSheet: TTabSheet;
-    CookieGroupBox: TGroupBox;
-    Label8: TLabel;
-    FixedCookieEdit: TEdit;
-    Label9: TLabel;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -121,8 +116,6 @@ begin
 	//FusianaSet
 	LocalTrapAtt.Checked := GikoSys.Setting.LocalTrapAtt;
 	RemoteTrapAtt.Checked := GikoSys.Setting.RemoteTrapAtt;
-	// Cookie
-    FixedCookieEdit.Text := GikoSys.Setting.FixedCookie;
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -141,15 +134,12 @@ begin
 	else
 		GikoSys.Setting.TimeAdjustSec := 0;
 	GikoSys.Setting.TimeAdjust := PutPostTimeRadioButton.Checked;
-	//2chŒ¾ŒêƒTƒ|[ƒg
-	GikoSys.Setting.GengoSupport := GengoSupport.Checked;
-	GikoSys.SetGikoMessage;
-	//ƒ[ƒJƒ‹EƒŠƒ‚[ƒg̼±ÅŒx
-	GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
-	GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
-	// Cookie
-	GikoSys.Setting.FixedCookie := FixedCookieEdit.Text;
-
+		//2chŒ¾ŒêƒTƒ|[ƒg
+		GikoSys.Setting.GengoSupport := GengoSupport.Checked;
+        GikoSys.SetGikoMessage;
+		//ƒ[ƒJƒ‹EƒŠƒ‚[ƒg̼±ÅŒx
+		GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
+		GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
 
 	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
 end;

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet4
+    ActivePage = TabSheet3
     MultiLine = True
-    TabIndex = 7
+    TabIndex = 3
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1207,8 +1207,8 @@ object OptionDialog: TOptionDialog
         end
       end
       object GroupBox19: TGroupBox
-        Left = 11
-        Top = 74
+        Left = 16
+        Top = 80
         Width = 465
         Height = 49
         Caption = #23653#27508

--- a/Search.dfm
+++ b/Search.dfm
@@ -16,9 +16,7 @@ object SearchDialog: TSearchDialog
   Font.Style = []
   OldCreateOrder = False
   Position = poOwnerFormCenter
-  OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
-  OnDestroy = FormDestroy
   DesignSize = (
     450
     303)
@@ -258,16 +256,4 @@ object SearchDialog: TSearchDialog
       TabOrder = 6
     end
   end
-  object BoardsProgressBar: TProgressBar
-    Left = 8
-    Top = 275
-    Width = 145
-    Height = 16
-    Min = 0
-    Max = 100
-    Smooth = True
-    Step = 1
-    TabOrder = 8
-    Visible = False
-  end
 end

--- a/Search.pas
+++ b/Search.pas
@@ -26,7 +26,6 @@ type
 		RegExpCheckBox: TCheckBox;
 		GoogleCheckBox: TCheckBox;
     FuzzyCharDicCheckBox: TCheckBox;
-    BoardsProgressBar: TProgressBar;
 		procedure FormCreate(Sender: TObject);
 		procedure CategoryListViewSelectItem(Sender: TObject; Item: TListItem;
 			Selected: Boolean);
@@ -38,8 +37,6 @@ type
 		procedure BoardListViewDblClick(Sender: TObject);
 		procedure CancelBottonClick(Sender: TObject);
 		procedure BoardListViewResize(Sender: TObject);
-    procedure FormDestroy(Sender: TObject);
-    procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 	private
 		{ Private éŒ¾ }
 		FChkItem: TObject;
@@ -49,9 +46,6 @@ type
 		procedure SetBoardList(Item: TListItem);
 		procedure CheckItem(Item: TObject);
 		procedure OnMatch(Sender: TObject; LineInfo: RE_LineInfo_t);
-		procedure SearchLogs( Reg: TGrep );
-		procedure SearchLog(Reg: TGrep; Item: TThreadItem);
-		function  CountBoards : Integer;
 	public
 		{ Public éŒ¾ }
 //		constructor Create(AOwner: TComponent); overload; override;
@@ -230,18 +224,17 @@ end;
 
 procedure TSearchDialog.OkBottonClick(Sender: TObject);
 var
-	i : Integer;
-//	i, j, k, l: Integer;
-//	Category: TCategory;
-//	Board: TBoard;
-//	ThreadItem: TThreadItem;
+	i, j, k, l: Integer;
+	Category: TCategory;
+	Board: TBoard;
+	ThreadItem: TThreadItem;
 	List: TList;
 	//sl: TStringList;
 	SearchWord: string;
 	Reg: TGrep;
 	Filter: string;
 	oldText: string;
-//	bbs : TBBS;
+	bbs : TBBS;
 begin
 	// grep “à‚ŃCƒxƒ“ƒg‚ªE‚¦‚Ä‚µ‚Ü‚¤‚̂ŁA‘€ì‚Å‚«‚È‚¢‚悤‚É‚·‚é
 	AllSelectButton.Enabled := False;
@@ -257,11 +250,6 @@ begin
 
 	Reg := TGrep.Create( nil );
 	try
-		// ƒvƒƒOƒŒƒXƒo[‚ðÝ’肵‚ÄŒ©‚¦‚é‚悤‚É‚·‚é
-		BoardsProgressBar.Max := CountBoards;
-		BoardsProgressBar.Position := 0;
-		BoardsProgressBar.Visible := True;
-
 		if Length( SearchComboBox.Text ) > 0 then
 		begin
 			// ComboBox ‚Ì“à—e‚ðXV
@@ -277,7 +265,7 @@ begin
 			SearchComboBox.Text := oldText;
 
 			BoardListView.Clear;
-			Application.ProcessMessages;
+            Application.ProcessMessages;
 			// grep —p‚ÌŒŸõƒ[ƒh‚𐶐¬
 			Reg.OnMatch := OnMatch;
 			Reg.UseFuzzyCharDic := FuzzyCharDicCheckBox.Checked;
@@ -317,11 +305,45 @@ begin
 			End;
 
 			// ƒTƒCƒg‚Ì’†‚Ì (‘±‚­)
-			SearchLogs(Reg);
+			try
+				// ŒfŽ¦”‚̒†‚Ì (‘±‚­)
+				for l := 0 to Length( BBSs ) - 1 do begin
+					bbs := BBSs[ l ];
+					for i := 0 to bbs.Count - 1 do begin
+						// ƒJƒeƒSƒŠ‚Ì’†‚Ì (‘±‚­)
+						Category := bbs.Items[i];
+						for j := 0 to Category.Count - 1 do begin
+							// ”‚̒†‚Ì (‘±‚­)
+							Board := Category.Items[j];
+							if Board.BoolData then begin
+								if not Board.IsThreadDatRead then
+									GikoSys.ReadSubjectFile(Board);
+								for k := 0 to Board.Count - 1 do begin
+									// ŒÂX‚̃XƒŒƒbƒh‚Ì (‘±‚­)
+									ThreadItem := Board.Items[k];
+									if FileExists( ThreadItem.GetThreadFileName ) then begin
+									// ƒƒO‚ª‘¶Ý‚·‚é
+										try
+											// ŒŸõ
+											// ¦Œ©‚‚©‚Á‚½‚ç OnMatch ‚É”ò‚Ô
+											FRegItem := ThreadItem;
+											Reg.GrepByRegExp( ThreadItem.GetThreadFileName )
+										except
+										end;
+										//Application.ProcessMessages;
+										if FCancel then raise	Exception.Create('ƒƒOŒŸõ‚𒆎~‚µ‚Ü‚·');
+									end;
+								end;
+
+							end;
+						end;
+					end;
+				end;
+			except
+				on E:Exception do ShowMessage(E.Message)
+			end;
 		end;
 	finally
-		//ƒvƒƒOƒŒƒXƒo[‚ð‰B‚·
-		BoardsProgressBar.Visible := False;
 		//sl.Free;
 		List.Free;
 		Screen.Cursor := crDefault;
@@ -335,96 +357,22 @@ begin
 		CancelBotton.Enabled := false;
 	end;
 end;
-//! ‘I‘ð‚³‚ê‚½”‚̃XƒŒƒbƒh‚Ì’†g‚ðŒŸõ‚·‚é
-procedure TSearchDialog.SearchLogs( Reg: TGrep );
-var
-	i, j, k, l : Integer;
-	bbs : TBBS;
-	Category: TCategory;
-	Board: TBoard;
-begin
-	// ƒTƒCƒg‚Ì’†‚Ì (‘±‚­)
-	try
-		// ŒfŽ¦”‚̒†‚Ì (‘±‚­)
-		for l := 0 to Length( BBSs ) - 1 do begin
-			bbs := BBSs[ l ];
-			for i := 0 to bbs.Count - 1 do begin
-				// ƒJƒeƒSƒŠ‚Ì’†‚Ì (‘±‚­)
-				Category := bbs.Items[i];
-				for j := 0 to Category.Count - 1 do begin
-					// ”‚̒†‚Ì (‘±‚­)
-					Board := Category.Items[j];
-					if Board.BoolData then begin
-						if not Board.IsThreadDatRead then
-							GikoSys.ReadSubjectFile(Board);
-						for k := 0 to Board.Count - 1 do begin
-							// ŒÂX‚̃XƒŒƒbƒh‚Ì (‘±‚­)
-							SearchLog(Reg, Board.Items[k]);
-						end;
-						BoardsProgressBar.StepIt;
-					end;
 
-				end;
-			end;
-		end;
-	except
-		on E:Exception do ShowMessage(E.Message)
-	end;
-end;
-//! ‘I‘ð‚³‚ê‚Ä‚¢‚锂̐”‚ðƒJƒEƒ“ƒg‚·‚é
-function  TSearchDialog.CountBoards : Integer;
-var
-	i, j, l : Integer;
-	bbs : TBBS;
-	Category: TCategory;
-	Board: TBoard;
-begin
-	Result := 0;
-	// ŒfŽ¦”‚̒†‚Ì (‘±‚­)
-	for l := 0 to Length( BBSs ) - 1 do begin
-		bbs := BBSs[ l ];
-		for i := 0 to bbs.Count - 1 do begin
-			// ƒJƒeƒSƒŠ‚Ì’†‚Ì (‘±‚­)
-			Category := bbs.Items[i];
-			for j := 0 to Category.Count - 1 do begin
-				// ”‚̒†‚Ì (‘±‚­)
-				Board := Category.Items[j];
-				if Board.BoolData then begin
-					Inc(Result);
-				end;
-			end;
-		end;
-	end;
-end;
-//! ³‹K•\Œ»‚ÌŒŸõ‚ɃXƒŒƒbƒh‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘—‚é
-procedure TSearchDialog.SearchLog(Reg: TGrep; Item: TThreadItem);
-begin
-	// ƒƒO‚ª‘¶Ý‚·‚é‚©Šm”F
-	if (Item.IsLogFile) and (FileExists( Item.GetThreadFileName )) then begin
-		try
-			// ŒŸõ
-			// ¦Œ©‚‚©‚Á‚½‚ç OnMatch ‚É”ò‚Ô
-			FRegItem := Item;
-			// GrepByReg‚Ì’†‚ÅApplication.ProcessMessage‚ª‘å—ʂɌĂ΂ê‚Ä‚¢‚é
-			Reg.GrepByRegExp( Item.GetThreadFileName )
-		except
-		end;
-		if FCancel then raise	Exception.Create('ƒƒOŒŸõ‚𒆎~‚µ‚Ü‚·');
-	end;
-end;
 procedure TSearchDialog.BoardListViewDblClick(Sender: TObject);
 begin
 
 	If TObject( BoardListView.Selected.Data ) is TThreadItem Then
 		GikoForm.InsertBrowserTab( TThreadItem(BoardListView.Selected.Data) );
 
-	BringToFront;
 end;
 
 procedure TSearchDialog.CancelBottonClick(Sender: TObject);
 begin
+
+	//Self.Close;
 	TGrep(Sender).Cancel := true;
 	FCancel := true;
+
 end;
 
 procedure TSearchDialog.BoardListViewResize(Sender: TObject);
@@ -434,24 +382,4 @@ begin
 
 end;
 
-procedure TSearchDialog.FormDestroy(Sender: TObject);
-begin
-	if (BoardListView <> nil) then begin
-		BoardListView.Clear;
-	end;
-	if (CategoryListView <> nil) then begin
-		CategoryListView.Clear;
-	end;
-end;
-
-procedure TSearchDialog.FormCloseQuery(Sender: TObject;
-  var CanClose: Boolean);
-begin
-	if (BoardsProgressBar.Visible) then begin
-		TGrep(Sender).Cancel := true;
-		FCancel := true;
-		Application.ProcessMessages;
-	end;
-end;
-
 end.

--- a/Setting.pas
+++ b/Setting.pas
@@ -411,7 +411,7 @@ type
 		//ƒXƒŒiž‚Ý‚Å–¢Šm’蕶Žš‚à—LŒø‚É‚·‚é‚©
 		FUseUndecided: Boolean;
 
-				//Be2ch
+                //Be2ch
                 //”FØ—pƒ†[ƒUIDEƒpƒXƒ[ƒh
 		FBeUserID: String;
 		FBeCode: String;
@@ -430,9 +430,6 @@ type
 		FInputAssistFormWidth: Integer;
 		FInputAssistFormHeight: Integer;
 
-		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
-		FFixedCookie: String;
-
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -756,8 +753,6 @@ type
 		//! InputAssistƒtƒH[ƒ€‚̃TƒCƒY
 		property InputAssistFormWidth: Integer read FInputAssistFormWidth write FInputAssistFormWidth;
 		property InputAssistFormHeight: Integer read FInputAssistFormHeight write FInputAssistFormHeight;
-		//! Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
-		property FixedCookie: String read FFixedCookie write FFixedCookie;
 
 end;
 
@@ -794,7 +789,7 @@ const
 	SPAMFILTER_FILE_NAME					= 'SpamFilter.ini';
 		LANGUAGE_FILE_NAME    = 'language.ini';
 	INPUTASSIST_FILE_NAME	= 'InputAssist.ini';
-    FIXED_COOKIE =           'hana=mogera';
+
 
 
 implementation
@@ -1378,9 +1373,6 @@ begin
 		FInputAssistFormWidth := ini.ReadInteger('IAtWindowsSize', 'Width', 400);
 		FInputAssistFormHeight := ini.ReadInteger('IAtWindowsSize', 'Height', 460);
 
-		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
-		FFixedCookie := ini.ReadString('Cookie', 'fixedString', FIXED_COOKIE);
-
 		ini.UpdateFile;
 	finally
 		ini.Free;
@@ -1749,8 +1741,6 @@ begin
 
 		//—š—ð‚̍őå•Û‘¶Œ”
 		ini.WriteInteger('Recode', 'Max', FMaxRecordCount);
-		// ŒÅ’è‚ÌCookie•¶Žš—ñ
-        ini.WriteString('Cookie', 'fixedString', FFixedCookie);
 
 		ini.UpdateFile;
 	finally

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/InputAssist.default
+++ /dev/null
@@ -1,79 +0,0 @@
-[ƒLƒ^]
-‚«‚½1=·À YÜYÜYÜYÜYÜYÜ(¡A¡)!!!
-‚«‚½2=·À*¥Kߥ*:.¡..¡.:*¥K(߁Íß)ߥ*:.¡. .¡.:*¥Kߥ*!!!!!
-‚«‚½[1=·À„ª(߁Íß)„ª(Íß )„ª(߁@ )„ª(@@)„ª(@@)„ª(@ ß)„ª( ߁Í)„ª(߁Íß)„ª !!
-‚«‚½[2=·À„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª!!!!
-‚«‚½[3=·À„ª„ª„ª„ª(‹„D‹)„ª„ª„ª„ª!!!!
-‚«‚½[4=·À„ª„ª„ª„ª(„Dß(›=(߁Íß)=›)„Dß)„ª„ª„ª„ª„ª!!!
-‚«‚½[5=·À„ª„ª„ª„ª„ª(ß(߁Í(߁Íß(™Í™)߁Íß)Íß)ß)„ª„ª„ª„ª„ª!!
-‚«‚½[6=·À„Ÿ‚—‚—́ãڂ–‚–`(߁Íß)„Ÿ‚—‚—́ãڂ–‚–`[!!
-‚«‚½[7=·À§§§(߁Íß)§( ߁Í)§( ß)§( )§(M )ʧ(„DM)ʧ(;L„DM)ʧʧ
-‚«‚½[8=·À·À·À·À„ª„ª„ªi߁Í߁߁i߁Í߁ß߁Í߁jß߁Í߁j„ª„ª„ª„ªII
-
-[‘‚«]
-‚Ú‚¯=ƒÀƒÍƒÈƒÃ..._Y(߁¤ß*)
-‚æ‚낵‚­=Î   =ƒm ™¯..._Y(߁¤ß*)
-‚ç‚Ô=ƒÇƒÍƒËƒÃ..._Y(߁¤ß*)
-‚í‚炽=ƒÖƒ¿ƒÁƒ¿ƒÑƒ¿..._Y(߁¤ß*)
-I—¹=Ž…“~ —¹..._Y(߁¤ß*)
-‚΂©=ƒÀƒ¿ƒÈƒ¿..._Y(߁¤ß*)
-‚È‚¯‚½=ƒÅƒ¿ƒÈƒÃƒÑƒ¿..._Y(T-T*)
-‚Ù‚µ‚ã=hƒÍçhƒÊ..._Y(߁¤ß*)
-‚©‚«‚©‚«=....Y(¥ƒÖ¥M )¶·¶·
-‚ß‚à‚ß‚à1=‚ƒÜ‚Á*߁[ß)‚ÁƒÓÒÓÒÓ....
-‚ß‚à‚ß‚à2=ƒÓ(DD )ÒÓÒÓ
-
-[ƒMƒR”L]
-‚¬‚±=@@@@@@ÈÈ@@
`ŒPP(,,߄Dß)@
@@UUPU U
-‚¬‚±Œã‚ë=@@@ ÈÈ
@@@(@@,,)
@@@/@@|
@`iQQj
-‚¬‚±À‚è=@@ÈÈ@
@@(,,߄Dß)
@@/ ‚‚Â
`iQQj
-‚¬‚±—§‚¿=@@ÈÈ
@@(,,߄Dß)
@ ¼@@‚Â
@ `@@|
@@ ‚µM‚i
-
-[‚PsAA]
-GJ=(*^[ß)b ¸Þ¯¼Þ®ÌÞ!!
-‚ ‚Í‚Í=( ߁Íß)±Êʔª”ªÉRɁRɁRÉ _ / _/ _
-‚ ‚ځ[‚ñ=ƒ¿ƒÀƒÍƒÍƒÅ..._Y(߁¤ß*)
-‚¢‚¢=iEÍEj²²!!
-‚¢‚­‚È‚¢=iE‚`Ej²¸Å²!!
-‚¢‚Á‚Ă悵=( ߄Dß)²¯ÃÖ¼
-‚¢‚â‚ñ=i/ƒÖ_j²ÔÝ
-‚¢‚悤=(=߃Öß)É ‚¡‚å‚£!
-‚¢‚ç‚Ë=i߇™ßj²×È
-‚¤‚܁[=(߄tß)³Ï°
-‚ª[‚ñ1=ƒ° (߄Dß;j
-‚ª[‚ñ2=ƒ°(߄Dß)¶Þ°Ý
-‚ª[‚ñ3=ƒ°(߄tß|||)¶Þ°Ý
-‚ª[‚ñ4=ƒK„ª„ªi߄Dß;)„ª„ªƒ“I
-‚ª[‚ñ5=¶Þ„ª„ª„ª(߄Dß;)„ª(@߄D)„ª(@@ß)„ª(@@ )„ª(ß;@ )„ª(„Dß; )„ª(߄Dß;)„ª„ª„ªÝ!!!!!
-‚ª‚­‚Ô‚é1=iiii G߄D߁jjj¶Þ¸¶Þ¸ÌÞÙÌÞÙ
-‚ª‚­‚Ô‚é2=(((((((( G߄Dß)))))))¶Þ¸¶Þ¸ÌÞÙÌÞÙ¶ÞÀ¶ÞÀÌÞÙ¶ÞÀ¶Þ¸¶Þ¸¶Þ¸¶Þ¸¶Þ¸
-‚ª‚­‚Ô‚é3=i(G߄Dß)¶Þ¸¶Þ¸ÌÞÙÌÞÙ
-‚©‚à[‚ñ1=(›£ß„Dß)›£ ¶Ó°Ý
-‚©‚à[‚ñ2=„‹(߄D߄‹)¶Ó«««Ý
-‚«‚±‚¦‚È‚¢=(¿@߄tß)ƒA[ƒA[‚«‚±‚¦‚ȁ[‚¢
-‚«‚É‚µ‚È‚¢=i߃Ã߁j·Æ¼Å²!!
-‚«‚É‚·‚é‚È=(¥„x¥)·Æ½ÙÅ!
-‚±‚È‚¢=ºÅ„ª„ª„ª„ª(߂`ß)„ª„ª„ª„ª² !!!!! @
-‚²‚é‚Ÿ1=( ߄Dß)ºÞÙ§
-‚²‚é‚Ÿ2=(#߄Dß) ºÞÙ§!!
-‚µ‚á‚«[‚ñ=(`¥ƒÖ¥L) ¼¬·°Ý
-‚µ‚å‚ځ[‚ñ=iLEƒÖE`j¼®ÎÞ°Ý
-‚½[‚ñ=;y=°( ߄tß)¥æ. À°Ý
-‚½‚¢‚Ù1=À²„ª„ª„ª„ª||ƒ³|(|ß|Í|ß|)|ƒ³||„ª„ª„ª„ªÎ!!!
-‚½‚¢‚Ù3=ƒ^ƒC„ª„ª„ª„ª||ƒ³|(|L|„D|`|)|ƒ³||„ª„ª„ª„ªƒz
-‚½‚è[=¼Ü~½¡„D¡)½@ÀØ°
-‚Í‚Ÿ=(߄Dß)ʧ?
-‚Í‚ ‚Í‚ 1=(GL„D`)‚Œ@_ƒ@@‚Œ@_ƒ@
-‚Í‚ ‚Í‚ 2=(;L„D`)ʧʧ
-‚Ђ¡1=i‚Œ‚Œ‚Œß„D߁jƒqƒBƒBƒBƒB
-‚Ђ¡2=ƒ°(||߄Dß)˨¨¨¨
-‚Ñ‚µ=m9iEÍEjËÞ¼¯!!
-‚Õ=i L,_TMjÌ߯
-‚Ӂ[‚ñ=( L_TM)Ì°Ý
-‚Õ‚¬‚á[=m9iO„DOjÌß·Þ¬°°°¯
-‚Ø=( ߄tß)¤Í߯
-‚Û‚©[‚ñ=( ߄tß)Î߶°Ý
-‚Ù‚µ‚¢=(@߄Dß)ν¨
-‚Ü‚¸[=(߄tß)Ͻް
-‚Ü‚¾=ÏÀÞ§-? i¥Í¥ j‚Á/™Ü™ÁÝÁÝ
-‚à‚¤‚¾‚ß‚Û=(L„D¼ Ó³ÀÞÒÎß

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -50,7 +50,7 @@
 ------------------------------
 ƒoƒO‚â—v–]‚́AƒMƒRƒiƒrƒXƒŒƒbƒh‚Ŏ󂯕t‚¯‚Ä‚¨‚è‚Ü‚·B
 ƒMƒRƒiƒrƒTƒCƒgFhttp://gikonavi.sourceforge.jp/
-ƒMƒRƒiƒrƒXƒŒFhttp://pc7.2ch.net/test/read.cgi/software/1148818605/l50
+ƒMƒRƒiƒrƒXƒŒFhttp://pc8.2ch.net/test/read.cgi/software/1121516093/l50
 
 ------------------------------
 “]Ú‚ɂ‚¢‚Ä
@@ -113,7 +113,6 @@ LICENSE
 @ƒXƒŒƒbƒhˆê——‚Ɂh¨‚¢hƒJƒ‰ƒ€’ljÁiƒfƒtƒHƒ‹ƒg”ñ•\Ž¦j
 @‚¨‹C‚É“ü‚èA—š—ðA‘—MƒƒO‚̃XƒŒƒbƒhƒ^ƒCƒgƒ‹–¼‚ðƒTƒjƒ^ƒCƒY‚·‚é‚悤‚ɏC³
 iƒm[ƒgƒ“‚̌딽‰ž–â‘è‚Ö‚Ì•”•ª“I‘Ήžj
-@‚Q‚¿‚á‚ñ‚Ë‚é‚ÌCookie‚ÌŽd—l•ÏX‚ɑΉž
   
 2006/01/14
   Version ÊÞÀ51

--- a/readme/setup.INF
+++ b/readme/setup.INF
@@ -90,7 +90,7 @@ Folder=gikoNavi
 87=config\Board\ƒMƒRƒiƒr.txt
 88=Samba.default
 89=config\language.ini
-90=config\InputAssist.default
+90=config\InputAssist.ini
 
 [Group]
 1=ƒMƒRƒiƒr,gikoNavi.exe

--- a/res/skin/skin30-2G/Header.html
+++ b/res/skin/skin30-2G/Header.html
@@ -16,7 +16,7 @@
 var start_time = new Date();
 //==========ƒOƒ[ƒoƒ‹•Ï”
 var anchorHead="";
-var skinName="skin30-2 v3.6.1231";
+var skinName="skin30-2 v3.5.0704";
 var browser="ƒMƒRƒiƒr";
 //==========ƒMƒRƒiƒr—pƒAƒ“ƒJ[‚Ì”»’èi0:ˆ—–³‚µ,1:ƒ|ƒbƒvƒAƒbƒv,2:ƒ{ƒ^ƒ“‘}“üj
 // ƒMƒRƒiƒr‚ł́AƒŒƒXƒAƒ“ƒJ[‚Í‘Š‘΃AƒhƒŒƒX‚Å‹Lq‚³‚ê‚é
@@ -48,16 +48,6 @@ function threadurl(){
  t_bbs=RegExp.$1;
  t_key=RegExp.$2;
 }
-//==========”ñ•\Ž¦ƒŒƒX‚Ì•\Ž¦-ƒMƒRƒiƒr‚Ì‚Ý
-function hiddenRes(e){ 
- var number=tohan(event.srcElement.innerText.replace(/>|„/g,""));
- var i=0;while(document.anchors[i].name.match(/\D/)){i++}
- var startRes=parseInt(document.anchors[i+1].name.replace(/\D/g,""));
- if(number.match(/(\d*)\D+(\d*)/)){var start=parseInt(RegExp.$1);}
- else {var start=parseInt(number);}
- //alert(startRes+">"+start+" && "+start+"!="+1);
- if(startRes>start && start!=1){return true}else{return false}
-}
 </script>
 </head>
 <body>

--- a/res/skin/skin30-2G/chie_base.css
+++ b/res/skin/skin30-2G/chie_base.css
@@ -7,11 +7,8 @@ dt a{text-decoration:none;}
 dd a{text-decoration:underline;line-height:1.1}
 
 /* ŒŸõŒ‹‰Ê */
-#foundPanel{color:LightSlateGray;}
-#foundPanel div {font-family:"‚l‚r ƒSƒVƒbƒN";}
-#foundPanel div span{font-family:Times;cursor:hand;}
-#foundPanel a      {color:LightSlateGray;}
-#foundPanel a:hover{color:#000;}
+#foundResult a      {color:LightSlateGray;}
+#foundResult a:hover{color:#000;}
 
 /* dt */
 dt{

--- a/res/skin/skin30-2G/chie_event.js
+++ b/res/skin/skin30-2G/chie_event.js
@@ -1,22 +1,18 @@
-//========V’…ƒWƒƒƒ“ƒvÝ’è
-var buffer=1;     // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
-var newResJump=1; // V’…ƒŒƒXƒWƒƒƒ“ƒvi0:ƒuƒ‰ƒEƒU”C‚¹A1:“Ç—¹Žž‚̂݁A2:íŽžj–‚©‚¿‚ãAOpenJaneAtwintail‚݂̂̐ݒè
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
 //ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰’è‹`
 //ŠO•”ŠÖ”Ftohan
 //ŠO•”•Ï”FanchorHead,lightmode,getID,skinName,browser,dts
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
-var waited=false;//command•\Ž¦Œãtrue‚É‚µA‘I‘ðŒã‚Éfalse‚É‚·‚éB
-var viewed=false;//thumb“Ǎž‚ÝŒãtrue‚É‚µAthumbPanel‚ɏæ~Œãfalse‚É‚·‚éB
-var searched=false; //ŒŸõŒã‚ɁAtrue‚É‚µAfoundPanel‚ɏæ~Œãfalse‚É‚·‚éB
-var cp,tp,vp,fp;
+//ƒOƒ[ƒoƒ‹•Ï”
+var buffer=1;     // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
+var newResJump=1; // V’…ƒŒƒXƒWƒƒƒ“ƒvi0:ƒuƒ‰ƒEƒU”C‚¹A1:“Ç—¹Žž‚̂݁A2:íŽžj–‚©‚¿‚ãAOpenJaneAtwintail‚݂̂̐ݒè
 //========Clickˆ—¨search,‘¼
 	document.onclick = clickEvent;
 function clickEvent(){
  if(clickCancel){return false}else{clearTimeout(clickTimer);if(document.getElementById("context")){document.getElementById("context").removeNode(true);}}
  var obj=window.event.srcElement;
  var tag=obj.tagName;
- if(tag=="B"||tag=="U"||tag=="SPAN"){searchPerson(obj)} //–¼‘O,ƒgƒŠƒbƒv,ID
+ if     (tag=="B")   {search(obj.parentElement)}   //–¼‘O
+ else if(tag=="U")   {search(obj)}                 //ƒgƒŠƒbƒv
+ else if(tag=="SPAN"){if(getID(obj)){searchID(obj)}} //ID
  else if(tag=="DT")  {searchRef(obj)}
  else if(tag=="DD")  {defaultPopup()}
  else if(tag=="A"){
@@ -27,7 +23,7 @@ function clickEvent(){
    if(obj.href.match(/^http:.*#/)){window.open(obj.href,"_parent");return false}
   }
   //A Bone•â³i”ñ•\Ž¦ƒŒƒX‚Ì•\Ž¦j
-  if((browser=="A Bone"||browser=="ƒMƒRƒiƒr") && hiddenRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content.replace(/\/l50$/,"/")+tohan(obj.innerText.replace(/[>„]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
+  if(browser=="A Bone" && hidedRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content+tohan(obj.innerText.replace(/[>„]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
   //Jane,Live,ƒMƒRƒiƒr•â³iskin30-2Normal‹y‚уMƒRƒiƒrj–ƒŒƒXƒWƒƒƒ“ƒv‚ªscrollIntoView‚Å‚È‚¢‚à‚Ì‚ÉŒW‚é•â³
   if(browser=="A Bone" || browser=="OpenJane" || browser=="Live2ch" || browser=="ƒMƒRƒiƒr"){if(obj.href.match(/^about|jumpres/)){
    var h=tohan(obj.innerText.replace(/[>„]/g,""));
@@ -36,17 +32,17 @@ function clickEvent(){
   }}
   return true;
  }
- else{panelOver();return}
+ else{return}
 }
 
 //=========MouseOverˆ—¨image,popup
 	document.onmouseover = mouseOverEvent;
 function mouseOverEvent() {
  var e = window.event.srcElement;
- if(e.tagName=='B'){if(browser!="twintail2"){
+ if(e.tagName=='B'){
   if(e.innerText.match(/^([^\d‚O-‚X]*)([\d‚O-‚X]+)([^\d‚O-‚X]*.*)/)){namePopup(e,RegExp.$1,RegExp.$2,RegExp.$3);}
   else if(e.innerText.match(/^‚ ‚ځ`‚ñ$/))                          {abonePopup(e);}
- }}
+ }
  if(e.tagName=='A'){
   if(!e.innerText.match(/%/)){ // URLƒGƒ“ƒR[ƒh‚Å‚ ‚肪‚¿‚È%‚ª‚È‚¯‚ê‚Î
    //e.href=e.href.replace(/>/g,"");
@@ -59,8 +55,9 @@ function mouseOverEvent() {
    }
   }
   if     (checkAnchor(e.href)==2){insButton(e);return;}
-  else if(checkAnchor(e.href)==1){  // ‘½’iƒ|ƒbƒvƒAƒbƒv
+  else if(checkAnchor(e.href)==1){
    if(event.shiftKey){if(e.rel){e.href=e.rel}return}
+   // ‘½’iƒ|ƒbƒvƒAƒbƒv
    var parent=e.parentElement;
    var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText;
    if(!document.getElementById("p"+aNum)){
@@ -69,48 +66,49 @@ function mouseOverEvent() {
     if(!onPopup){removePopup()}
     makePopContent(e);return;
    }
-  }else if(checkAnchor(e.href)==0){ // ‹tŽQÆƒ|ƒbƒvƒAƒbƒv
-   if(e.href.match(/menu:/) && event.shiftKey){searchPopup(e)}
   }
- }else if(e.tagName=="SPAN"||e.tagName=="TT"){
-  var obj=e;var onPopup;
-  while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
-  if(e.tagName=="SPAN"){
-   if(!onPopup && event.shiftKey){searchPopup(e)}
-  }else{searchPopup(e)}
  }else{ // ‘½’iƒ|ƒbƒvƒAƒbƒvÁ‹Ž
   var obj=e;var onPopup;
   if(obj.sourceIndex<0){obj=document.body;if(document.getElementById("popupBase")){onPopup=true;}} // namePopup‚Æ‚Ì‹£‡‚Ńm[ƒh‚ªŠO‚ê‚éuŠÔ‚̉ñ”ð
-  while(obj.tagName!="BODY"){if(obj.id.match(/(p\d+)/)){onPopup=true;break}else{obj=obj.parentElement;}}
+  while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement;}}
   if(onPopup){while(obj.id!=obj.parentElement.lastChild.id){obj.parentElement.lastChild.removeNode(true)}}
   else       {removePopup()}
  }
+ if(e.tagName=="DT"){setHash();}
+ if(e.tagName=="SPAN"){
+   var obj=e;var onPopup;
+   while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
+   if(!onPopup && event.shiftKey){searchPopup(event.toElement);} return;
+ }
 }
-//=========MouseMoveˆ—¨panelOver()
+//=========MouseMoveˆ—¨menuOver(),tpOver()
 	document.onmousemove=mouseMoveEvent;
+var waited=false;//command•\Ž¦Œãtrue‚É‚µA‘I‘ðŒã‚Éfalse‚É‚·‚éB
+var viewed=false;//thumb“Ǎž‚ÝŒãtrue‚É‚µAthumbPanel‚ɏæ~Œãfalse‚É‚·‚éB
+var cp,tp,vp;
 function mouseMoveEvent() {
  if(!cp){
-  var nHTML ='<div id="controlPanel"><input type="button" value="TOP" onclick="scroll_Top();blur()"><input type="button" value="END" onclick="scroll_End();blur()"><input type="button" value="IMG" onmouseup="imgCommand();blur()"><input type="button" value="FND" onclick="fndCommand();blur();"></div><div id="foundPanel" onmouseout="searched=false"></div>';
-  if(skinName.match(/30-2/)){nHTML+='<div id="thumbPanel" onmouseout="viewed=false"></div><div id="viewPanel"></div>';}
-  document.body.insertAdjacentHTML("afterBegin",nHTML);
-  cp=document.getElementById("controlPanel");fp=document.getElementById("foundPanel");
-  if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}else{tp=vp=new Object()}
-  cp.condition="waited";tp.condition="vp.firstChild || viewed || !lightmode";fp.condition=resultView ? "fp.hasChildNodes()" : "searched";
-  cp.territory="<25";   tp.territory=">20";                                  fp.territory="<(30+fp.clientHeight) && fp.hasChildNodes()";
+  var nHTML ="<div id='controlPanel'><input type='button' value='TOP' onclick='scroll_Top();blur()'><input type='button' value='END' onclick='scroll_End();blur()'><input type='button' value='IMG' onmouseup='imgCommand();blur()'><input type='button' value='FND' onclick='findIt(document.selection.createRange().text);blur()'></div>";
+  if(skinName.match(/30-2/)){nHTML+="<div id='thumbPanel' onmouseout='viewed=false'></div><div id='viewPanel'></div>";}
+  document.body.insertAdjacentHTML('afterBegin',nHTML);
+  cp=document.getElementById("controlPanel");
+  if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}
  }
- if(event){panelOver();}
- if(!idHash.length){setHash();searchColoring();}
+ cpOver();
+ tpOver();
 }
-// Šeƒpƒlƒ‹
-function panelOver(){
+// ƒRƒ“ƒgƒ[ƒ‹ƒpƒlƒ‹
+function cpOver(){
  var territoryW=document.body.clientWidth-120;var territoryH=25;
- var panels=new Array("cp","tp","fp");
- for(var i in panels){
-  if(skinName.match(/30-3/)&&panels[i]=="tp"){continue}
-  var panel=eval(panels[i]); var territoryY=eval("event.y"+panel.territory); var territoryX=eval(event.x>document.body.clientWidth-panel.offsetWidth-15);
-  if(eval(panel.condition)){panel.style.visibility="visible";return}
-  if(territoryY && territoryX){panel.style.visibility="visible";}else{panel.style.visibility="hidden";}
- }
+ if(waited){cp.style.visibility="visible";return}
+ if(event.y<territoryH && event.x>territoryW){cp.style.visibility="visible";}else{cp.style.visibility="hidden";}
+}
+// ƒTƒ€ƒlƒCƒ‹ƒpƒlƒ‹
+function tpOver(){
+ if(skinName.match(/30-3/) || !lightmode){return}
+ var territoryW=document.body.clientWidth-120;var territoryH=20;
+ if(document.getElementById("viewPanel").firstChild || viewed){tp.style.visibility="visible";return}
+ if(event.y>territoryH && event.x>territoryW){tp.style.visibility="visible";}else{tp.style.visibility="hidden";}
 }
 // TOP,END
 function scroll_Top(){document.getElementsByTagName("DL")[0].firstChild.scrollIntoView(true);}
@@ -129,14 +127,6 @@ function imgCommand(mode,s){
   clearCommand();
  }
 }
-function fndCommand(mode,s){
- if(!waited){
-  findIt(document.selection.createRange().text);
-  event.cancelBubble=true;
- }else{
-  clearCommand();
- }
-}
 function clearCommand(){
  waited=false;
  document.getElementById("command").removeNode(true);
@@ -184,7 +174,7 @@ function key(){
  else if(code=="36"){scroll_Top()}
  else if(code=="35"){scroll_End()}
  else if(code=="73" && event.shiftKey){changePanel();return false;} // shift+I
- else if(code=="70" && event.shiftKey){findIt(document.selection.createRange().text);return false;} // shift+F
+ else if(code=="70" && event.shiftKey){cp.childNodes[3].click();return false;} // shift+F
  else if(code=="78" && event.shiftKey && firstNew){firstNew.scrollIntoView(true)} // shift+N
  else if(code=="82" && event.shiftKey && event.ctrlKey){ // ctrl+shift+R
   //‚©‚¿‚ã`‚µ‚á•â³i”XV‚̃Vƒ‡[ƒgƒJƒbƒgƒL[j
@@ -200,7 +190,7 @@ function key(){
 //=========‚©‚¿‚ãAABoneAƒ]ƒk‚Q
 var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
 var k=0;
-function loadEvent(num){
+function loadEvent(num){ //setTimeout("setHash();",100);
  //====V’…ƒŒƒXƒWƒƒƒ“ƒv
  if(newResJump==0){clearInterval(timerID);return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
  //V’…ƒŒƒX‚ÌŠJŽn”ԍ†‚ðŽæ“¾
@@ -219,7 +209,7 @@ function loadEvent(num){
 //=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“‘Ήžƒuƒ‰ƒEƒU—pj©NewMark‚©‚çŒÄ‚яo‚µ
 //=========OpenJAtwin
 var scr,viewPos,endPos=0;
-function reloadEvent(){
+function reloadEvent(){ //setTimeout("setHash();",100);
  //====Šù“lj»
  var lastDt=dts[dts.length-2];if(!lastDt){return}// ‘S•”V’…‚È‚çI—¹
  while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}
@@ -252,10 +242,10 @@ function defaultPopup(){
   obj.innerText=num;
   obj.href="#"+hnum;
   makePopContent(obj);
- }else if(num.match(/\w{8,9}/)){ //\w{8}‚Å‚Í‚¾‚߂ہH
-  var obj=document.createElement("DT");
-  obj.innerHTML="<span>date time ID:"+num+"</span>";
-  searchPerson(obj.firstChild);
+ }else if(num.match(/\w/) && num.length==8){ //\w{8}‚Å‚Í‚¾‚߂ہH
+  var obj=document.createElement("span");
+  obj.innerText="date time ID:"+num;
+  setHash();searchID(obj);
  }
 }
 
@@ -270,14 +260,5 @@ function copyEvent(){
  copyText.execCommand("Copy");
  return false; 
 }
-//=========onScrollˆ—
-//window.onscroll=function(){clearInterval(beforeScrollTimer);onLoadEvent()}
-window.onscroll=function(){onLoadEvent()}
-if(document.getElementById("dl")){
- document.getElementById("dl").onscroll=function(){onLoadEvent()}
-}
-//=========onLoadˆ—
-window.onload=onLoadEvent;
-function onLoadEvent(){mouseMoveEvent();setHash();searchColoring();}
-setTimeout("onLoadEvent()",1000); // ˆê‰ñ‚¾‚¯’…F
-
+//=========onLoadˆ—iDAT2HTML‚̂݁j
+window.onload=function(){setHash()}

--- a/res/skin/skin30-2G/chie_image.css
+++ b/res/skin/skin30-2G/chie_image.css
@@ -18,7 +18,7 @@ input,button{
 }
 #thumbPanel div{
  width:100px;
- margin-bottom:0px;
+ margin-bottom:2px;
  border:solid 1px #D6DCE1;
  background-color:#FFF;
  text-align:right;

--- a/res/skin/skin30-2G/chie_image.js
+++ b/res/skin/skin30-2G/chie_image.js
@@ -1,11 +1,9 @@
-//======‰æ‘œ“Ǎž‚̐ݒè
-var onOpenLoad =1;  	// ƒXƒŒ“ǍžŽž‚̉摜“Ǎž@0:“ǂݍž‚Ü‚È‚¢A1:V’…ƒŒƒX‚̂݁A2:‘S•”
-var onMouseLoad=true;	// true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
-var takeArisk=false; 	// true:‰æ‘œ“ǂݍž‚ÝŽž‚Ƀ‚[ƒhØ‘ցAfalse:Žè“®‚Ń‚[ƒhØ‘Ö
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
 // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonMouseover
 // ŠO•”ŠÖ”FaddAnchor
 // ŠO•”•Ï”Fcp,tp,vp,dds
+//======‰æ‘œ“Ǎž‚̐ݒè
+var onMouseLoad=true;	// true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
+var takeArisk=false; 	// true:‰æ‘œ“ǂݍž‚ÝŽž‚Ƀ‚[ƒhØ‘ցAfalse:Žè“®‚Ń‚[ƒhØ‘Ö
 //==========ƒOƒ[ƒoƒ‹•Ï”
 //==========‰æ‘œˆ—“™
 var lightmode = true;
@@ -58,22 +56,14 @@ function insButton(a,hRH) {
    var nHTML='<input type="button" value="LOAD" onClick=\'loadImage(this,"'+a.href+'");blur()\'>'
             +'<input type="button" value="VIEW" onClick=\'changeView("swf","'+a.href+'");blur()\'>';
   }else{
-   var ahref=(hRH)?hRH:a.href;
+   if(hRH){var ahref=hRH}else{var ahref=a.href}
    if(ahref.match(/^javascript:.*'(.*)'.*/)){ahref=RegExp.$1+document.getElementsByName("ThreadURL")[0].content;a.href=ahref}
    var nHTML='<input type="button" value="VIEW" onClick=\'changeView("html","'+ahref+'");blur()\'>'
-            +'<input type="button" value="CHECK" onClick=\'changeView("html","http://so.7walker.net/?site='+ahref+'");blur()\'>';
+            ;//+'<input type="button" value="CHECK" onClick=\'changeView("html","http://www.tekijuku.com/URL/?url='+ahref+'");blur()\'>';
   }
   a.insertAdjacentHTML('AfterEnd',nHTML);
   a.className = 'replaced';
-  if(imageExt2(a.href)){
-   if(!event||event.type=="mousemove"||event.type=="scroll"){ // autoImageLoad‚ł̓Ǎž
-    if(onOpenLoad){loadImage(a.nextSibling,a.href)}
-   }else if(event.type=="mouseover"){   // mouseover‚ł̓Ǎž
-    if(onMouseLoad){loadImage(a.nextSibling,a.href)}
-   }else if(event.type=="click"){       // allImageload‚ł̓Ǎž
-    loadImage(a.nextSibling,a.href);
-   }
-  }
+  if(onMouseLoad && imageExt2(a.href)){loadImage(a.nextSibling,a.href)}
   return;
  }
 }
@@ -81,19 +71,19 @@ function insButton(a,hRH) {
 function loadImage(btn,href){
  if(!panel){changePanel()}
  if(takeArisk && lightmode){changeMode()}
- // “¯ˆê‰æ‘œŠm”F
- var thumbs = document.images;
- var l=thumbs.length;
- for(var i=l;i--;){if(thumbs[i].src==href){
-  if(lightmode){tp.style.visibility="visible";viewed=true;}
-  //thumbs[i].scrollIntoView(true);
-  imgOver(thumbs[i],100);
-  return true;
- }}
+ if(btn.tagName!="A"){
+  var thumbs = document.images;
+  var l=thumbs.length;
+  for(var i=l;i--;){if(thumbs[i].src==href){
+   if(lightmode){tp.style.visibility="visible";viewed=true;}
+   //thumbs[i].scrollIntoView(true);
+   imgOver(thumbs[i],100);
+   return true;
+  }}
+ }
  if(btn.parentElement.tagName=="DD"){var dt = btn.parentElement.previousSibling;}
  else                               {var dt = btn.parentElement;}
  var num = dt.firstChild.innerText;
- if(href.match(/www.securityfocus.com/)){if(!confirm(num+"‚̃ŒƒX‚É‚ ‚éhttp://www.securityfocus.com/‚̉摜‚̓uƒ‰ƒNƒ‰‚̉”\«‚ª‚‚¢‚Å‚·‚ªAŠJ‚«‚Ü‚·‚©H")){return}}
  if(href.search(/\.swf/i)==-1){
   var nHTML = '<div><img src="'+href+'" onLoad="imgResult(this)" onError="imgResult(this)" onClick="changeView(\'img\')" onmouseover="imgOver(this,100)" onmouseout="imgOver(this,30)">'
             +addAnchor(num,num)+' '
@@ -116,14 +106,7 @@ function loadImage(btn,href){
 function imgResult(img){
  var btn=img.parentElement.children.item(2);
  if(event.type=="load"){btn.value='___'; img.style.display='block';}
- else                  {btn.value='NONE';btn.style.color='#C00';}
- if(event.type=="error"){
-  var dt=getDTfromAnc(img.parentElement.children.item(1).innerText);
-  var ddAnc=dt.nextSibling.getElementsByTagName("A");
-  var a;var i=0;do{a=ddAnc[i];i++;}while(a.href!=img.href);
-  var btn=a.nextSibling;
-  btn.value='NONE';btn.style.color='#C00';
- }
+ else                  {btn.value='NONE';btn.style.color='#C00';setTimeout("viewed=false",3000)}
 }
 // ƒTƒCƒY‚̐ؑÖ
 function changeSize(btn){
@@ -204,10 +187,12 @@ function allImageLoad(mode){
  var ddl=dds.length;var exist;
  for(var i=0;i<ddl;i++){
   if(mode=="new"){if(dds[i].previousSibling.className!="new"){continue}}
-  var ddAnc=dds[i].getElementsByTagName("A");
-  for(j=0;j<ddAnc.length;j++){
-   cn=ddAnc[j];
-   if(imageExt2(cn.href)){insButton(cn,cn.href);exist=true}
+  cl=dds[i].childNodes.length;
+  for(j=0;j<cl;j++){
+   cn=dds[i].childNodes[j];
+   if(cn.tagName == "A"){
+    if(imageExt2(cn.href)){loadImage(cn,cn.href);exist=true}
+   }
   }
  }
  if(!exist){

--- a/res/skin/skin30-2G/chie_popup.js
+++ b/res/skin/skin30-2G/chie_popup.js
@@ -1,6 +1,4 @@
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
 // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonMouseover
-// ŠO•”•Ï”FidHash,refHash,foudRes,highlight
 // ŠO•”ŠÖ”FaddAnchor,getDTfromAnc
 // “Á’¥FDIV#popupBase‰º‚Ɂuƒtƒ‰ƒbƒg‚ŃŠƒjƒAv‚ÉDL#p\d‚ðì¬‚·‚éB
 //==========CSS‚̏o—Í
@@ -11,65 +9,65 @@ nCSS+='#popupBase dl{position:absolute; background-color:window; border:outset 1
 nCSS+='#popupBase dt span{float:none; margin-left:1em;}';
 nCSS+='#popupBase dd{margin:auto 1em}';
 document.write('<style type="text/css">'+nCSS+'</style>\n');
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
+//=========ƒOƒ[ƒoƒ‹•Ï”
+var pb;
 //=========ƒiƒ“ƒo[‚È–¼‘O‚̃|ƒbƒvƒAƒbƒv
 function namePopup(e,before,num,after){
  var hnum=tohan(num);
- if(hnum==774 || hnum==21 || hnum==1 || hnum==30){return} // Socket774A774KBA21‹ÖA[1-30]A‚È‚Ç‚Í–³Ž‹
- if(before && before.match(/–¼–³/)){return} //–¼–³‚µ‚Á‚Û‚¢‚Ì‚Í–³Ž‹
- if(after) {if(after=="Žü”N"){return}} // ƒfƒtƒHƒ‹ƒg‚È"‚ŽŽü”N"‚Í–³Ž‹
+ //‚RŽü”NA‚SŽü”NASocket774A774KBA21‹ÖA[1-30]A‚È‚Ç‚Í–³Ž‹
+ if(before){if(hnum==5 || hnum==774 || hnum==4 || hnum==21 || hnum==1 || hnum==30){return}}
  var nB = before ? "<b>"+before+"</b><b>":"<b>"; nB+=addAnchor(hnum,num); nB+=after ? "</b><b>"+after+"</b>":"</b>";
  e.outerHTML=nB;
 }
 //=========Žã‚ ‚ځ`‚ñ‚̃|ƒbƒvƒAƒbƒv
-function abonePopup(e){e.outerHTML = "<b>"+addAnchor(e.parentElement.previousSibling.innerText,'‚ ‚ځ`‚ñ')+"</b>";}
-//=========ŒŸõ‚µ‚½ƒŒƒX‚̃|ƒbƒvƒAƒbƒv
-function searchPopup(obj){
- var reg,cArray;var tag=obj.tagName;
- /*ref Popup*/if     (tag=="A")   {if(refHash[obj.innerText]){cArray=refHash[obj.innerText].split(" ")}else{return}}
- /*ID Popup*/ else if(tag=="SPAN"){reg=getID(obj);if(reg&&reg.length>3){cArray=idHash[reg].split(" ");}else{return} if(cArray.length==1){return}}
- /*ŒŸõPopup*/else if(tag=="TT")  {var cHash=(obj.parentElement.rel=="res")?foundRes:highlight;cArray=cHash[obj.parentElement.firstChild.style.backgroundColor];if(!cArray){return}}
- var targetString=""; for(var i=0;i<cArray.length;i++){targetString+=returnString(cArray[i]);} //’†g‚̐؂èo‚µ
- if(targetString){popup(targetString);} //‘Ώۂª‘¶Ý‚µ‚½‚çƒ|ƒbƒvƒAƒbƒv
+function abonePopup(e){
+ var hnum=e.parentElement.previousSibling.innerText;
+ e.outerHTML = "<b>"+addAnchor(hnum,'‚ ‚ځ`‚ñ')+"</b>";
 }
 //=========‘½’iƒ|ƒbƒvƒAƒbƒv
 //Eƒ|ƒbƒvƒAƒbƒv‚̍쐬
+var startRes;
 function makePopContent(obj){
  //Ž–‘O€”õ
- var num=obj.innerText.replace(/[>„]/g,""); var number=tohan(num);
- if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:"; // ƒuƒ‰ƒEƒU–{‘̂̃|ƒbƒvƒAƒbƒv‰ñ”ð
- //”ԍ†’²¸
+ var num=obj.innerText.replace(/[>„]/g,"");
+ var number=tohan(num);
+ if(!obj.rel){obj.rel=obj.href;}
+ obj.href="decoy:";
+ //’²¸
+ if(document.anchors.length==1){return} //ƒŒƒX”‚ª1‚È‚çI—¹
+ if(!startRes){startRes=parseInt(document.anchors[1].name.replace(/\D/g,""))}
  if(number.match(/(\d*)\D+(\d*)/)){var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);}
  else                             {var start=end=parseInt(number);}
- if(end-start>100){end=start+100} // 100ˆÈã•\Ž¦‚µ‚È‚¢
+// alert(startRes+">"+end+" && "+end+"!=1")
+ if(startRes>end && end!=1){obj.href=obj.rel;return}//‘¶Ý‚µ‚Ä‚¢‚È‚¯‚ê‚ΏI—¹
  //’†g‚̐؂èo‚µ
- var targetString=""; for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}
+ var targetString=""; if(end-start>100){end=start+100}
+ if(start==end){targetString=returnString(start)}
+ else          {for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}}
  //‘Ώۂª‘¶Ý‚µ‚½‚çrel‚É‘Þ”ð‚µ‚Äƒ|ƒbƒvƒAƒbƒv
  if(targetString){popup(targetString);}else{obj.href=obj.rel;}
 }
 //E’†g‚̐؂èo‚µ
 function returnString(num){
  var obj=getDTfromAnc(num);
- setSearchColor(obj);//ƒ|ƒbƒvƒAƒbƒvæ‚Ì’…F
  if(!obj){return("")} //‘Ώۂª“§–¾‚ ‚ځ`‚ñ‚È‚çI—¹
- var dt=obj.cloneNode(true);
-  var dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBER‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
- var dd=obj.nextSibling.cloneNode(true);
+ var dt,dd,dtOuter,ddOuter;
+ dt=obj.cloneNode(true);
+  dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBER‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
+ dd=obj.nextSibling.cloneNode(true);
   if(dd.hasChildNodes()){
    while(dd.lastChild.name){dd.lastChild.removeNode(true)} // LABELNUMBER”ñ‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
    if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true)} // ‹tŽQÆ‚̏œ‹Ž
   }
-  var ddOuter=dd.outerHTML;
+  ddOuter=dd.outerHTML;
  return(dtOuter+ddOuter);
 }
 //Eƒ|ƒbƒvƒAƒbƒv
-var pb;
 function popup(inner){
  if(!pb){document.body.insertAdjacentHTML('afterBegin','<div id="popupBase"></div>');pb=document.getElementById("popupBase")}
  //—v‘f‚̍쐬
  var parent=event.srcElement.parentElement;
- //var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDˆÈŠO–¼‘O—“A‰æ‘œAIDŒŸõ
- var aNum=event.srcElement.sourceIndex;if(!aNum){alert("aNumŽæ“¾ƒGƒ‰[")}
+ var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDˆÈŠO–¼‘O—“A‰æ‘œAIDŒŸõ
  if(document.getElementById('p'+aNum)){return} // ƒ|ƒbƒvƒAƒbƒv‚µ‚Ä‚½‚çI—¹
  pb.insertAdjacentHTML("beforeEnd",'<dl id="p'+aNum+'">'+inner+'</dl>');
  //—v‘f‚Ì”z’u
@@ -77,16 +75,16 @@ function popup(inner){
  // yŽ²’²®
  var pos=Math.min(event.y,document.body.clientHeight-event.y);
  var scTop=document.body.scrollTop+event.y;
- if(pos==event.y){var y=scTop-30;}  // ƒJ[ƒ\ƒ‹‚̉º‚Ö•\Ž¦
- else            {var y=scTop+10-p.clientHeight;}  // ƒJ[ƒ\ƒ‹‚̏ã‚Ö•\Ž¦
+ if(pos==event.y){var y=scTop-30;}  // ‰º
+ else            {var y=scTop+10-p.clientHeight;}  // ã
  if(y<0){y=0}
- if(event.srcElement.parentElement.tagName=="TT"){y+=35;}
+ if(event.srcElement.parentElement.id=="foundResult"){y+=30}
  p.style.pixelTop=y;
  // xŽ²’²®
  var pos=Math.min(event.x,document.body.clientWidth-event.x);
  var scLeft=document.body.scrollLeft+event.x;
- if(pos==event.x){var x=scLeft-2}  // ƒJ[ƒ\ƒ‹‚̉E‚Ö•\Ž¦
- else            {var x=scLeft-4-p.clientWidth;}  // ƒJ[ƒ\ƒ‹‚̍¶‚Ö•\Ž¦
+ if(pos==event.x){var x=scLeft-2}  // ‰E
+ else            {var x=scLeft-4-p.clientWidth;}  // ¶
  if(x<0){x=0}
  p.style.pixelLeft=x;
  // ‚‚³’²®iscrollBar‚ð—v‚·ê‡‚Æ—v‚µ‚È‚¢ê‡‚ª‚ ‚éj¨yŽ²’²®

--- a/res/skin/skin30-2G/chie_search.js
+++ b/res/skin/skin30-2G/chie_search.js
@@ -1,398 +1,243 @@
-beID=false; // be‚ɃƒOƒCƒ“o—ˆ‚éê‡‚́Atrue
-//==========ŒŸõÝ’è
-var expression="multiAND";	// ŒŸõ•û–@@@default:•W€AregExp:³‹K•\Œ»AmultiAnd:ANDŒŸõAmultiOR:ORŒŸõ
-var searchView="resList";	// ŒŸõŒ‹‰Ê•\Ž¦@@resList:ŠY“–ƒŒƒX”ԍ†•\Ž¦AresPopup:ŠY“–ƒŒƒXƒ|ƒbƒvƒAƒbƒvA
-var resultView=false;		// ŒŸõŒ‹‰Ê‚̏펞•\Ž¦@@true:íŽž•\Ž¦Afalse:ƒ}ƒEƒX‚ŋ߂¯‚½‚Æ‚«‚Ì‚Ý•\Ž¦
-var listLimit =10;  		// searchView‚ªresPopup‚Å‚È‚¢ê‡‚́AƒŒƒX”ԍ†‚Ì•\Ž¦§ŒÀ
-//==========ƒŒƒX”ԍ†A“ú•t•¶Žš—ñ‚Ì’…FÝ’è
-coloring=1;               // ’…F‚·‚é:1@’…F‚µ‚È‚¢:0
-threshold1=[2,"#0000ff"]; // ‘‚«ž‚Ý‚ª•¡”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold2=[5,"#aaaa00"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold3=[8,"#ff0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold4=[1,"#0000FF"]; // ‘‚«ž‚Ý‚ª‚ ‚é    ƒŒƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-threshold5=[4,"#aaaa00"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-threshold6=[7,"#ff0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-//==========–¼‘OEIDŒŸõ‚É‚æ‚郌ƒX‚̑т̐FŽw’èi16i”–”‚ÍWebŒ`Ž®‚̐F–¼‚ÅŽw’èB‚¢‚­‚‚łà‰ÂBƒAƒ‹ƒtƒ@ƒxƒbƒg‚͏¬•¶Žš‚Å‚¨Šè‚¢j
-var foundResColor =new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
-//==========’PŒêŒŸõ‚É‚æ‚éƒnƒCƒ‰ƒCƒgFŽw’èi“¯ãj
-var highlightColor=new Array("#ffff66","#a0ffff","#99ff99","#ff9999","#ff66ff","#880000","#00aa00","#886800","#004699","#990099");
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
-// ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonClick,onScroll,onMousemove
-// ŠO•”ŠÖ”FaddAnchor,checkAnchor,tohan,searchPopup
-// ŠO•”•Ï”FanchorHead,browser,fp
-// ‹tŽQÆ‚Ì“Á’¥FƒCƒxƒ“ƒg”­¶DT‚ɑΉž‚·‚éDD‰º‚ɁADL-DT-DD\‘¢‚ðì¬‚·‚éB
+// “ú•t•¶Žš—ñ‚Ì’…FÝ’è@’…F‚·‚é:1@’…F‚µ‚È‚¢:0
+coloring=1;
+threshold1=[2,"#0000FF"]; // ‘‚«ž‚Ý‚ª•¡”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
+threshold2=[5,"#FF0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
+threshold3=[1,"#0000FF"]; // ‘‚«ž‚Ý‚ª‚ ‚é    ƒŒƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
+threshold4=[4,"#FF0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
+// ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonClick
+// ŠO•”ŠÖ”FaddAnchor,checkAnchor,tohan
+// ŠO•”•Ï”FanchorHead,browser
+// “Á’¥FƒCƒxƒ“ƒg”­¶DT‚ɑΉž‚·‚éDD‰º‚ɁADL-DT-DD\‘¢‚ðì¬‚·‚éB
 //==========CSS‚̏o—Í
 var nCSS='';
-nCSS+='#foundPanel {position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999;visibility:hidden}';
-nCSS+='#foundPanel div{padding-left:5px;text-align:right;font-size:100%;}';
+nCSS+='#foundResult{position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999}';
 nCSS+='.refResult{margin:0.5em 0.3em; border:1px solid #666;padding-right:0px}';
 nCSS+='.refResult{border-top:none}';
 nCSS+='.refResult dt{margin-right:0px;}';
 nCSS+='.refResult dd{margin-left:0.8em;}';
 document.write('<style type="text/css">'+nCSS+'</style>\n');
+//==========ŒŸõ‚É‚æ‚éFŽw’èi16i”–”‚ÍWebŒ`Ž®‚̐F–¼‚ÅŽw’èB‚¢‚­‚‚łà‰Âj
+var foundColor = new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
 var nCSS='';
-for(var css in foundResColor){
- var c=foundResColor[css].replace(/#/,"");
- nCSS+='#COLOR'+c+" a{border-color:"+foundResColor[css]+"}\n";
- nCSS+='#COLOR'+c+" a:hover{border-color:red}\n";
+for(var css=0;css<foundColor.length;css++){
+ nCSS+='#COLOR'+css+" a{border-color:"+foundColor[css]+"}";
+ nCSS+='#COLOR'+css+" a:hover{border-color:red}";
 }
 document.write('<style type="text/css">'+nCSS+'</style>\n');
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
+//==========ƒOƒ[ƒoƒ‹•Ï”
 var dts=document.getElementsByTagName('DT');
 var dds=document.getElementsByTagName('DD');
-var idHash=new Array(); var refHash=new Array();
-var foundRes,highlight;
+var fR;
 //==========ID‚ÆŽQÆ‚ðƒnƒbƒVƒ…‚ÉŠi”[
-// ”z—ñ‚̃nƒbƒVƒ…‚æ‚èŒy‚¢‚Á‚Û‚¢‚̂ŁA‹ó”’‹æØ‚è‚Ì’l‚É‚æ‚é’Pƒ‚ȃnƒbƒVƒ…‚É‚µ‚Ä‚Ý‚éƒeƒXƒgB
-// setEndIdx:–{•¶‚Ì“¯ƒŒƒX‚ðd•¡ˆ—‚µ‚È‚¢‚悤‚ɁAHash‰»ˆÊ’u‚Æ‚µ‚Ä‚Ìdts‚̍ŏIindex‚ð‹L‰¯
-// setEndNum:–{•¶ˆÈŠOƒŒƒX‚ðd•¡ˆ—‚µ‚È‚¢‚悤‚ɁAÅIƒŒƒX”ԍ†‚ð‹L‰¯
-var setEndIdx=setEndNum=0;
+var idHash=new Array(); var refHash=new Array(); var searchEnd=0;
 function setHash(){
- //var t0=new Date();
- var l=Math.min(dts.length,dds.length);
- var lastNum=l ? parseInt(dts[l-1].firstChild.innerText) : 0;
- if(isNaN(lastNum)&&l>1){lastNum=parseInt(dts[l-2].firstChild.innerText)} //Footer‚ ‚è‚È‚çˆê‚‘O
- if(l==0 || lastNum<=setEndNum){return} // ÅŒã‚Ü‚Å’²¸Ï‚Ý‚È‚ç‰ñ”ð
- for(var i=setEndIdx;i<l;i++){
+ var l=dts.length;
+ if(dts[l-1].rel=="setEnd"){return} // ÅŒã‚Ü‚Å’²¸Ï‚Ý‚È‚ç‰ñ”ð
+ for(var i=searchEnd;i<l;i++){
   if(dds[i].parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDD‚È‚ç‰ñ”ð
   var num=dts[i].firstChild.innerText; var span=dts[i].lastChild;
   // ID
-  var t=getID(span); if(t&&t.length>3){idHash[t] = idHash[t] ? idHash[t]+" "+num : num;} // ???‚âID:0,ID:#(@ƒ]ƒk)‚̓Xƒ‹[B
-  // ‰æ‘œ”Â
-  var imgURL=getIMG(span);
-  if(imgURL){
-   var dd=dts[i].nextSibling;
-   if(tp && imgURL && !dd.getElementsByTagName("IMG").length){
-    var aObj=(dd.innerText)?'<br><a href="'+imgURL+'">'+imgURL+'</a>':'<a href="'+imgURL+'">'+imgURL+'</a>';
-    if(!beID && imgURL.match(/kako/)){/*dd.insertAdjacentHTML("beforeEnd","<br>Be‚ɃƒOƒCƒ“‚µ‚Ä‚È‚¢‚Ǝ擾‚Å‚«‚Ü‚¹‚ñ");*/}else{dd.insertAdjacentHTML("beforeEnd",aObj)}
-   }
-  }
-  // ref,IMG
+  var t=getID(span); idHash[t] = idHash[t] ? idHash[t]+" "+num : num;
+  // ref
   var ddAnc=dds[i].getElementsByTagName("A");
-  for(var j=0;j<ddAnc.length;j++){
-   if      (checkAnchor(ddAnc[j].href)==0){
-    continue;
-   }else if(checkAnchor(ddAnc[j].href)==1){
-    var anc=tohan(ddAnc[j].innerText.replace(/[>„]/g,""));var start,end;
-    if(anc.match(/(\d*)\D+(\d*)/)){
-     start=parseInt(RegExp.$1); end=parseInt(RegExp.$2);
-     if( (end-start>100) || (num-end<4 && start==1) ){continue} // >>1-1000‚Æ‚©>>1-n(’¼‘OƒŒƒX)‚Æ‚©‚͉ؗí‚ɃXƒ‹[
-    }else{
-     start=end=parseInt(anc);
+  for(var j=ddAnc.length;j--;){
+   if(checkAnchor(ddAnc[j].href)!=1){continue}
+   var anc=tohan(ddAnc[j].innerText.replace(/[>„]/g,""));
+   if(anc.match(/(\d*)\D+(\d*)/)){
+    var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);
+    if(end-start>100){continue} // >>1-1000‚Æ‚©‚͉ؗí‚ɃXƒ‹[
+    else if(num-end<3 && start==1){continue} // >>1-n(’¼‘OƒŒƒX)‚ÍŽ‚Ë,‚Æ‚©‚àƒXƒ‹[
+    for(var k=start;k<=end;k++){
+     if(refHash[k] && refHash[k].indexOf(num)!=-1){continue} // d•¡‚̓Xƒ‹[
+     if(num>=k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // –¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
     }
-    var k=start-1;do{k++;
-     if((!refHash[k] || refHash[k].indexOf(num)==-1) && num>k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // d•¡‚â–¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
-    }while(k<end);
-   }else if(imageExt2(ddAnc[j].href) && onOpenLoad!=0){
-    if(onOpenLoad==1){if(dds[i].previousSibling.className!="new"){continue}}
-    insButton(ddAnc[j],ddAnc[j].href);
+   }else{anc=parseInt(anc);
+     if(refHash[anc] && refHash[anc].indexOf(num)!=-1){continue} // d•¡‚̓Xƒ‹[
+     if(num>=anc){refHash[anc]=refHash[anc] ? refHash[anc]+" "+num : num;} // –¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
    }
   }
  }
- setEndIdx=l;setEndNum=lastNum;
- //var t1=new Date(); var t=(t1-t0)/1000; if(t){alert(t+"•b");}
-}
-// ƒXƒŒƒbƒhƒEƒBƒ“ƒhƒE’†S‚É‘OŒã5ƒŒƒX‚𒅐F
-var resUnit=new Array();
-function searchColoring(){
+ dts[l-1].rel="setEnd"; searchEnd=l;
  if(!coloring){return;} // ’…F•s—v‚È‚çI—¹
- if(!scr){scr=lightmode ? document.body : document.getElementById("dl");}
- var nowScrollPos=scr.scrollTop+document.body.clientHeight/2;
- var l=Math.min(dts.length,dds.length);var st,ed;
- // dt‚ÌoffsetTop‚ðŠi”[i25ƒŒƒX’PˆÊj
- if(resUnit.length<=Math.floor(dts.length/25)){resUnit[0]=0;
-  for(var i=25;i<l;i+=25){resUnit[i/25]=dts[i].offsetTop;}
- }
- // Œ»Ý‚Ç‚Ì‚ ‚½‚è‚܂ŃXƒNƒ[ƒ‹‚µ‚Ä‚é‚©’²¸
- var rul=resUnit.length-1;
- if     (rul==0)                   {st=0;ed=l-1;} //25–¢–ž
- else if(resUnit[0]>nowScrollPos)  {st=0;ed=24;}  //0-24
- else if(resUnit[rul]<nowScrollPos){st=l-26;ed=l-1;} // ÅI25ƒŒƒX
- else{
-  for(var i=rul;i--;){
-   if(resUnit[i+1]>nowScrollPos&&resUnit[i]<=nowScrollPos){st=i*25;ed=st+25;break}
+ for(var i=l;i--;){
+  if(!dts[i].innerText){continue}
+  //if(dts[i].innerText.match(/id:/i)){ // ID‚ª‚È‚¢”‚ŁA‚‘¬‰»‚·‚é‚©‚àH
+   var span=dts[i].lastChild; var t=getID(span); if(browser=="ƒzƒbƒgƒ]ƒk‚Q"){span=span.lastChild}
+   if(t && idHash[t] && span){
+    var idResult=idHash[t].split(/\s/); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
+    if     (idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
+    else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
+    else if(idResult.length==1){span.title="“¯ˆêID‚Í\n‚ ‚è‚Ü‚¹‚ñ"}
+   }
+  //}
+  var imgURL=getIMG(span);
+  if(imgURL){dds[i].insertAdjacentHTML("afterBegin",'<img src="'+imgURL+'"><br>')}
+  //
+  var numA=dts[i].firstChild; var num=numA.innerText; 
+  if(refHash[num]){
+   var refResult=refHash[num].split(/\s/);
+   if     (refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dts[i].title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
+   else if(refResult.length>=threshold3[0]){numA.style.color=threshold3[1];dts[i].title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
+   else{numA.title="‚±‚ê‚ւ̃ŒƒX‚Í‚È‚¢–Í—l"}
   }
  }
- // Œ»Ý‚Ì”ÍˆÍ“à‚©‚çƒEƒBƒ“ƒhƒE‚̐^‚ñ’†‚ ‚½‚è‚É•\Ž¦‚µ‚Ă郌ƒX‚ðŽæ“¾i‚±‚±‚Å’…F‚·‚é‚ƁA25ƒŒƒX’PˆÊ‚̐ؑ֎ž‚ɐ”ƒŒƒX‚ª’…F‚³‚ê‚È‚¢j
- var dtIdx=0; //if(cp){cp.childNodes[1].value=(st+1)+"-"+(ed+1);cp.style.visibility="visible";}
- for(var i=st;i<=ed;i++){if(!dts[i+1]){dtIdx=ed;break;}
-  if(dts[i+1].offsetTop>nowScrollPos && dts[i].offsetTop<=nowScrollPos){dtIdx=i;break;}
- }
- // dtIdx‚©‚ç‚»‚ÌŽü•Ó‚ð“Á’è
- var start=dtIdx-5;var end=dtIdx+5;//
- for(var i=start;i<=end;i++){
-  if(dts[i]){setSearchColor(dts[i])}
- }
 }
-// IDHashArefHash‚ðŒ³‚É’…F
-function setSearchColor(dt){
- if(!dt.innerText){return}
- // ID
- var span=dt.lastChild; var t=getID(span);//alert(t +"&&"+ idHash[t] +"&&"+ span);
- if     (browser=="ƒzƒbƒgƒ]ƒk‚Q"){span=span.lastChild}
- else if(browser=="A Bone")      {span=span.childNodes[1]}
- if(t && idHash[t] && span){
-  var idResult=idHash[t].split(" "); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
-  if     (idResult.length>=threshold3[0]){span.style.color=threshold3[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length==1){span.title="“¯ˆêID‚Í\n‚ ‚è‚Ü‚¹‚ñ"}
- }
- // ref
- var numA=dt.firstChild; var num=numA.innerText; 
- if(refHash[num]){
-  var refResult=refHash[num].split(" ");
-  if     (refResult.length>=threshold6[0]){numA.style.color=threshold6[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else if(refResult.length>=threshold5[0]){numA.style.color=threshold5[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else if(refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else{numA.title="‚±‚ê‚ւ̃ŒƒX‚Í‚È‚¢–Í—l"}
- }
+var regIMG=new RegExp(".*?\\s.*?\\s.*:.*?\\sIMG:(.*?)(\\s|$)"); // ‰æ‘œ‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
+function getIMG(obj){
+ if(regIMG.test(obj.innerText)){
+  var filename=RegExp.$1;
+  var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
+  var fileurl="http://up01.2ch.io/_img/"+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
+  return(fileurl)
+ }else{return(false)}
 }
 //==========–¼‘OEIDŒŸõ“™
-function searchPerson(obj){
- var by,thisDT,reg;
- if     (obj.tagName=="DT")  {by="ID";  thisDT=obj;              reg=getID(obj)}
- else if(obj.tagName=="SPAN"){by="ID";  thisDT=obj.parentElement;reg=getID(obj)}
- else if(obj.tagName=="U")   {by="NAME";thisDT=obj.parentElement;              reg=obj.innerHTML.replace(/<B>(.*?)<\/B>/ig,"");if(!reg){reg=RegExp.$1.replace(/<.*?A.*?>/ig,"")}/*–¼‘O‚ª”Žš*/}
- else if(obj.tagName=="B")   {by="NAME";thisDT=obj.parentElement.parentElement;reg=obj.innerText}
- else{return}
- if(!thisDT.rel){
-  var c=selectColor("res"); if(!c){return} var color=new Array(c); // ƒJƒ‰[‘I‘ð
-  if(by=="ID"){
-   if(!reg || !idHash[reg]){return} // ID‚È‚µAID:???A–{•¶’†‚Ì‘¼ƒXƒŒ‚̃RƒsƒyID
-   // ŒŸõƒnƒbƒVƒ…‚É’l‚ðÝ’肵‚āA‚»‚ê‚ÉŠî‚«ƒŒƒX’…F
-   foundRes[c]=idHash[reg].split(" "); foundRes[c].word="ID:"+reg;
-   for(i in foundRes[c]){var dt=getDTfromAnc(foundRes[c][i]);toggleResColor(dt,c);}
-  }else{
-   var us=document.getElementsByTagName("U"); var l=us.length;
-   var regName=new RegExp();regName.compile(reg);
-   // ƒ‹[ƒv’†‚ɃŒƒX’…FE’l‚̐ݒè‚𓯎žŽÀs
-   for(var i=l;i--;){var dt=us[i].parentElement;
-    if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
-    if(regName.test(us[i].innerText)){toggleResColor(dt,c);foundRes[c].unshift(dt.firstChild.innerText);}
-   }
-   foundRes[c].word=reg;
-  }
-  returnFound("res",color);
+// ID‚ÌŒŸõEíœ
+function searchID(obj){
+ var singleColor=event.altKey;
+ var decoy=obj.parentElement ? obj.parentElement : obj;
+ var reg=getID(obj);
+ if(!decoy.id.match(/^COLOR/)){
+  if(!idHash[reg]){return}
+  var target=new Array();target=idHash[reg].split(" ");
+  // ƒJƒ‰[‘I‘ð
+  var c = singleColor ? 0 : selectColor();
+  if  (c=="restart"){c=0;singleColor=true}
+  else if(c=="exit"){return;}
+  // ŒŸõ
+  for(i in target){var dt=getDTfromAnc(target[i]);activate(dt,c);}
+  foundReturn(target);
  }else{
-  clearColor("res",thisDT.style.backgroundColor);
+  clearResult(obj);return;
  }
 }
-// ID•¶Žš—ñ‚Ì’Šo
-var regID=new RegExp(); // HOST‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
-regID.compile(".*?\\s.*?\\s.*:(.*?)(\\s|$)"); // 1000res‚Å0.02•b‚قǍ‚‘¬
-function getID(span){
- if(regID.test(span.innerText)){return(RegExp.$1)}else{return(false)}
-}
-//==========FÝ’è‰ðœ
-// ƒIƒuƒWƒFƒNƒg‚̏‰Šú‰»
-function createHash(name,key,arr,word){
- name[key]=arr?arr:new Array();
- name[key].word=word?word:"";
- name[key].justMovedRes=undefined;
-}
-// F‘I‘ð(ŠY“–ƒŒƒX”ԍ†”z—ñ‚ðŽ‚½‚È‚¢ƒL[‚ð•Ô‚·)
-function selectColor(type){
- if(!foundRes) {foundRes =new Array();for(var i in foundResColor) {createHash(foundRes,foundResColor[i]);}}   // Hash foundRes  ={F:ŠY“–ƒŒƒX”ԍ†”z—ñ}
- if(!highlight){highlight=new Array();for(var i in highlightColor){createHash(highlight,highlightColor[i]);}} // Hash hightLight={F:ŠY“–ƒŒƒX”ԍ†”z—ñ}
- var cHash,cArray,cMess;
- if(type=="res"){cHash=foundRes; cArray=foundResColor; cMess="¡‚܂ł̃ŒƒX’…F‚ð‰ðœ‚µ‚Ü‚·‚©H";}
- else           {cHash=highlight;cArray=highlightColor;cMess="¡‚܂ł̃nƒCƒ‰ƒCƒg‚ð‰ðœ‚µ‚Ü‚·‚©H";}
- var i=0; while(cHash[cArray[i]].word){
-  i++; if(i==cArray.length){if(confirm(cMess)){clearColor(type);i=0;break}else{i=null;break}}
- }
- return(cArray[i]);
+// IDƒ|ƒbƒvƒAƒbƒv
+function searchPopup(obj){
+ var objs=document.getElementsByTagName(obj.tagName);
+ var reg=getID(obj);if(!reg){return}
+ var target=idHash[reg].split(" ");
+ if(target.length==1){return}
+ if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:";
+ var targetString=""; for(i in target){targetString+=returnString(target[i])} //’†g‚̐؂èo‚µ
+ if(targetString){popup(targetString);}else{obj.href=obj.rel;} //‘Ώۂª‘¶Ý‚µ‚½‚çrel‚É‘Þ”ð‚µ‚Äƒ|ƒbƒvƒAƒbƒv
 }
-// F‰ðœiƒnƒbƒVƒ…A‘ΏہAfoundPanelj
-function clearColor(type,color){
- var cHash=(type=="res")?foundRes:highlight;
- if(event && event.altKey){color=""}
- for(var i in cHash){
-  if(type=="res"){
-   if(color && i!=color){continue} // Žw’èF‚Å‚È‚¯‚ê‚΃Xƒ‹[
-   for(var j in cHash[i]){
-    if(event.srcElement.value=="DEL"){removeRes(getDTfromAnc(cHash[i][j]))}else{toggleResColor(getDTfromAnc(cHash[i][j]))}
-   }
-   cHash[i]=new Array();
-   document.getElementById("c"+i).removeNode(true);
-  }else{
-   var strongs=document.getElementsByTagName("STRONG");
-   var reg=new RegExp(i);
-   if(!color.match(i)){continue}  // Žw’èF‚Å‚È‚¯‚ê‚΃Xƒ‹[
-   for(var j=0;j<strongs.length;j++){
-    if(strongs[j].style.backgroundColor==i){
-     if(event.srcElement.value=="DEL"){removeRes(strongs[j].parentElement.previousSibling);j--}else{strongs[j].removeNode(false);j--}
-    }
-   }
-   cHash[i]=new Array();
-   if(document.getElementById("c"+i)){document.getElementById("c"+i).removeNode(true);} // and,orŒŸõ‚Å‚PF–Ú‚Ì‚Ý
+// –¼‘O‚ÌŒŸõEíœ
+function search(obj){
+ var singleColor=event.altKey;
+ var objs=document.getElementsByTagName(obj.tagName);
+ var reg=obj.innerText; var target="objs[i].innerText"; //–¼‘OEƒgƒŠƒbƒv
+ var decoy=obj.parentElement ? obj.parentElement : obj;
+ if(!decoy.id.match(/^COLOR/)){
+  // ƒJƒ‰[‘I‘ð
+  var c = singleColor ? 0 : selectColor();
+  if  (c=="restart"){c=0;singleColor=true}
+  else if(c=="exit"){return;}
+  // ŒŸõ
+  var found=new Array; var l=objs.length;
+  for(var i=l;i--;){
+   var dt=objs[i].parentElement; if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
+   if(eval(target)==reg){activate(dt,c);found.unshift(dt.firstChild.innerText);}
+   else if(singleColor) {deactivate(dt)}
   }
- }
- if(!fp.hasChildNodes()){fp.style.visibility="hidden";searched=false;}
-}
-// ƒŒƒXFƒgƒOƒ‹
-function toggleResColor(dt,c){
- if(!dt){return} // for-in‚Å‘—‚ç‚ê‚é”ԍ†ˆÈŠO‚Ìobj‚È‚çI—¹
- if(c){
-  dt.rev=dt.style.backgroundColor;
-  dt.rel="colored";
-  dt.id ="COLOR"+c.replace(/#/,"");
-  dt.style.backgroundColor=c;
+  foundReturn(found);
  }else{
-  dt.style.backgroundColor=dt.rev;
-  if(dt.id.match(/COLOR/)){dt.removeAttribute("id")}//else{alert("dt‚ÉCOLOR***ˆÈŠO‚Ìidi"+dt.id+"j‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚·")}
-  dt.removeAttribute("rev");
-  dt.removeAttribute("rel");
+  clearResult(obj);return;
  }
 }
-// ŒŸõŒ‹‰Ê‚ÉŠî‚«Á‹Ž
-function removeRes(dt){if(!dt){return} // cHash[i][j]=ID:xxxxxxxx‚Ì‚Æ‚«
- if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;} // Live‚Ì‚Ý-“§–¾‚ ‚ځ`‚ñ
- dt.nextSibling.removeNode(true);dt.removeNode(true);
+
+// ID•¶Žš—ñ‚Ì’Šo
+//var regID=new RegExp("ID:(.*)$");
+var regID=new RegExp(".*?\\s.*?\\s.*:(.*?)(\\s|$)"); // HOST‚â‚炵‚½‚ç‚΂à‰Â”\‚É‚µ‚Ä‚Ý‚é
+function getID(obj){
+ if(regID.test(obj.innerText)){return(RegExp.$1)}else{return(false)}
+}
+// FÝ’è
+function activate(obj,c){
+ var color=foundColor[c];
+ obj.rev=obj.style.backgroundColor;
+ obj.style.backgroundColor=color;
+ obj.id="COLOR"+c; // “¯ˆêid‚ª•¡”¶‚¶‚邪ByName‚Å‚Ídt‚Ìname‚©‚çŽæ“¾‚Å‚«‚È‚¢‚½‚ß‚â‚Þ‚È‚µ
 }
-//==========Œ‹‰Ê•\Ž¦
-// ƒŒƒX”ԍ†ƒŠƒXƒgiƒ|ƒbƒvƒAƒbƒvƒAƒ“ƒJ[‚ðŠÜ‚ށj
-function returnFound(type,color){
- var cHash=(type=="res")?foundRes:highlight;
- var nDIV="";var numArray=cHash[color[0]]; var display=new Array(["none","POP"],["inline","LST"]);
- if(searchView=="resPopup" || numArray.length>=listLimit){display=display.reverse();}
- // ƒ|ƒbƒvƒAƒbƒv
- var nTT="";for(var i=0;i<color.length;i++){nTT+='<tt style="background-color:'+color[i]+'"> '+cHash[color[i]].word+'</tt>';}
- nDIV+='<span rel="'+type+'" style="display:'+display[0][0]+'">'+nTT+'</span>';
- // ƒŠƒXƒg
- var nA="";for(var i=0;i<numArray.length;i++){nA+=addAnchor(numArray[i],numArray[i])+" "}
- nDIV+='<tt style="background-color:'+color[0]+'" style="display:'+display[1][0]+'"> '+nA+'</tt>';
- // ŒÂ”
- nDIV+='&nbsp;'+numArray.length+' ';
- var buttons='<input type="button" value="'+display[0][1]+'" onclick="changeSearchView();blur()"><input type="button" value="É" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="‰º‚ÖŒŸõ"><input type="button" value="È" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ã‚ÖŒŸõ"><input type="button" value="CLR" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä"><input type="button" value="DEL" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä">';
- fp.innerHTML+='<div id="c'+color[0]+'">'+nDIV+buttons+'</div>';
- fp.style.visibility="visible";searched=true;
+// F•œ‹A
+function deactivate(obj){if(!obj){return}
+ obj.style.backgroundColor=obj.rev;
+ if(obj.id!="sizeinfo"){obj.removeAttribute("id");}
+ obj.removeAttribute("rev");
+ obj.removeAttribute("title");
 }
-// ‘ΏۃŒƒX‚ɃWƒƒƒ“ƒv
-var markedDT;
-function moveToSearchRes(type,color){
- if(color.match(/(.*?),/)){color=RegExp.$1}
- var scope   = (event && event.srcElement.value=="È") ? false : true ;
- var numArray= (type=="res") ? foundRes[color] : highlight[color];
- if(isNaN(numArray.justMovedRes)){numArray.justMovedRes=0}
- else{
-  markedDT.style.borderColor="#999";
-  if(scope){numArray.justMovedRes++;if(numArray.justMovedRes>=numArray.length){numArray.justMovedRes--;alert("‚±‚ê‚æ‚艺‚É‚Í‚ ‚è‚Ü‚¹‚ñ")}}
-  else     {numArray.justMovedRes--;if(numArray.justMovedRes<0){numArray.justMovedRes++;alert("‚±‚ê‚æ‚èã‚É‚Í‚ ‚è‚Ü‚¹‚ñ")}}
+// ƒJƒ‰[‘I‘ð
+function selectColor(){
+ var c=0;
+ while(document.getElementById("COLOR"+c)){
+  c++;
+  if(!foundColor[c]){if(confirm("F‚ð‰Šú‰»‚µ‚Ü‚·‚©H")){return("restart")}else{return("exit")}}
  }
- markedDT=getDTfromAnc(numArray[numArray.justMovedRes]);   markedDT.style.borderColor="red";
- markedDT.scrollIntoView(true);
- setTimeout('markedDT.style.borderColor="#999"',5000);
+ return(c);
 }
-// ƒ|ƒbƒvƒAƒbƒv‚ƃŠƒXƒg•\Ž¦Ø‚è‘Ö‚¦
-function changeSearchView(){
- var e=event.srcElement;
- if(e.value=="POP"){
-  e.value="LST";
-  e.parentElement.childNodes[0].style.display="inline";
-  e.parentElement.childNodes[1].style.display="none";
+// Œ‹‰Ê•\Ž¦
+function foundReturn(found){
+ if(!fR){document.body.insertAdjacentHTML('afterBegin','<div id="foundResult"></div>');fR=document.getElementById("foundResult");}
+ //dt‚Ìtitle‚É
+ for(var i=found.length;i--;){dt=getDTfromAnc(found[i]);dt.title=found.join(" ");}
+ //foundResult‚É
+ var buttons='<input type="button" value="CLR" onclick="clearResult(this)" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä"><input type="button" value="DEL" onclick="clearResult(this)" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä">';
+ if(found.length>=20 && confirm("20ˆÈã‚ ‚邯‚Ç•\Ž¦‚·‚éH")==false){
+  fR.innerHTML=buttons;	fR.title=found.join(" ");
  }else{
-  e.value="POP";
-  e.parentElement.childNodes[0].style.display="none";
-  e.parentElement.childNodes[1].style.display="inline";
+  for(var i=0;i<found.length;i++){found[i] = addAnchor(found[i],found[i])}
+  fR.innerHTML=found.join(" ")+buttons;
  }
+ fR.style.visibility="visible";
 }
-
-//==========’PŒêŒŸõ
-function findIt(arg){createSearchPanel(arg);}
-var searchWindow=null;
-// ŒŸõƒEƒBƒ“ƒhƒE‚Ì•\Ž¦
-function createSearchPanel(arg){ // ê—pƒuƒ‰ƒEƒU‚Å‚ÌmodelessDialog‚Ö‚ÌŠO•”“ǂݍž‚݂ł́AdialogArguments‚ª‘—‚ê‚È‚¢‚Ì‚Å’¼Ú‘‚«o‚·
- if(arg){word=arg}
- if(searchWindow && !searchWindow.closed){return}
- var skinPath=document.getElementsByName("SkinPath")[0].content;
- searchWindow=showModelessDialog("",window,'dialogWidth:500px;dialogHeight:200px;dialogTop:0px;dialogLeft:0px;help:no;resizable:yes;status:no;unadorned:yes;');
- var nWin='<html><head><title>’PŒê‚ÌŒŸõ<\/title>'
-         +'<script type="text/javascript">function submitEvent(){var fo=document.forms[0]; dialogArguments.word=fo.word.value; var i=-1;do{i++;dialogArguments.expression  =fo.expression[i].value;}while(!fo.expression[i].checked); var i=0; while(fo.searchTarget[i]){dialogArguments.searchTarget[fo.searchTarget[i].value]=fo.searchTarget[i].checked;i++;} var i=-1;do{i++;dialogArguments.searchView  =fo.searchView[i].value;}while(!fo.searchView[i].checked); dialogArguments.searchWord();}</script>'
-         +'<style type="text/css">body{background:ThreeDFace;padding:0.5em;overflow:auto} fieldset{padding:0.5em;margin-top:0.5em;} legend,label,input{font:message-box;}</style>'
-         +'<\/head><body onunload="unloadEvent()"><form onsubmit="submitEvent();return false;"><table width="100%"><tr><td valign="top" colspan="3">'
-         +'<label for="word">ŒŸõ•¶Žš—ñF</label><input type="text" name="word" id="word" size="50" value="'+word+'" tabindex="0"><br>'
-         +'</td><td align="right" valign="top" rowspan="2">'
-         +'<input type="submit" name="submit" value="@ŒŸ@õ@" tabindex="7"><br><br><input type="button" name="cancel" value="ƒLƒƒƒ“ƒZƒ‹" onclick="window.close()" tabindex="8">'
-         +'</td></tr><tr valign="top">'
-         +'<td><fieldset><legend>ŒŸõ•û–@</legend><input type="radio"    name="expression"   value="default" id="tDef" tabindex="1"> <label for="tDef">’ʏ팟õ</label><br><input type="radio" name="expression" value="regExp" id="tReg"> <label for="tReg">³‹K•\Œ»</label><br><input type="radio" name="expression" value="multiAND" id="tAND"> <label for="tAND">ANDŒŸõ</label><br><input type="radio" name="expression" value="multiOR" id="tOR"> <label for="tOR">ORŒŸõ</label></fieldset></td>'
-         +'<td><fieldset><legend>ŒŸõ‘ΏÛ</legend><input type="checkbox" name="searchTarget" value="name" id="tName" tabindex="2" checked> <label for="tName">–¼‘O</label><br><input type="checkbox" name="searchTarget" value="mail" id="tMail" tabindex="3" checked> <label for="tMail">ƒ[ƒ‹</label><br><input type="checkbox" name="searchTarget" value="id" id="tID" tabindex="4" checked> <label for="tID">“ú•t‚ÆID</label><br><input type="checkbox" name="searchTarget" value="mess" id="tMess" tabindex="5" checked> <label for="tMess">–{•¶</label></fieldset></td>'
-         +'<td><fieldset><legend>Œ‹‰Ê•\Ž¦</legend><input type="radio"    name="searchView"   value="resList" id="rList" tabindex="6"> <label for="rList">ƒŒƒX”ԍ†‚ð•\Ž¦</label><br><input type="radio" name="searchView" value="resPopup" id="rPop"> <label for="rPop">ƒŒƒX‚ðƒ|ƒbƒvƒAƒbƒv</label><br><input type="radio" name="searchView" value="resJump" id="rJump"> <label for="rJump">ƒŒƒX‚ÖƒWƒƒƒ“ƒv</label></fieldset></td>'
-         +'</tr></table></form><\/body><\/html>';
- searchWindow.document.write(nWin);
- sdf=searchWindow.document.forms[0]; sdf.elements[0].select();
- var ex=sdf.expression;for(var i=0;i<ex.length;i++){if(ex[i].value==expression){ex[i].checked=true}}
- var sv=sdf.searchView;for(var i=0;i<sv.length;i++){if(sv[i].value==searchView){sv[i].checked=true}}
- range=document.body.createTextRange();
-}
-// ŒŸõˆ—ƒƒCƒ“
-var word="";var range;var searchTarget={"word":true};
-function searchWord(){
- if(!word){return}
- var matchs=new Array(); var color=new Array();
- // ŒŸõ•û–@
- if(expression=="regExp" || expression=="default" || (expression.match(/multi/) && !word.match(/\s/))){ // AND/OR‚ňê’PŒê‚È‚çdefault‚ÅŒŸõ
-  // ŒŸõŒêŽw’èid•¡”rœ‚ō‚‘¬‰»Hj
-  if(expression=="regExp"){
-   var regWord=word.replace(/[\^\$]/g,"");
-   var reg=new RegExp(regWord,"g"); var tmpArr=range.text.match(reg); var tmp;
-   if(!tmpArr || !tmpArr.length){tmpArr=new Array(tmpArr)} // ŒŸõŒ‹‰Ê0or1‚È‚çA”z—ñì¬
-   tmpArr.sort();for(var i=0;i<tmpArr.length;i++){if(tmp!=tmpArr[i]){matchs.push(tmpArr[i])}tmp=tmpArr[i]}
-   if(!matchs || !matchs.length){matchs[0]=word} // ŒŸõŒ‹‰Ê0or1‚È‚çA”z—ñì¬
-  }else{matchs[0]=word}
-  // ƒnƒCƒ‰ƒCƒg
-  for(var i=0;i<matchs.length;i++){color.push(setHighlight(matchs[i]));}
-  highlight[color[0]].word=word;
+// Œ‹‰ÊÁ‹ŽAŒ‹‰Êíœ
+function clearResult(obj){
+ var fromObj=obj.parentElement;
+ var singleColor=event.altKey;
+ var result=new Array();var arrayElement; var numbers=fromObj.title ? fromObj.title : fromObj.innerText;
+ if(singleColor){result=dts;               arrayElement="result[i]";}
+ else           {result=numbers.split(" ");arrayElement="getDTfromAnc(result[i])";}
+ var l=result.length;
+ if(!result[0]){
+  /* ŒŸõŒ‹‰Êƒ[ƒ‚Å‚àresult‚ªnull‚É‚È‚ç‚È‚¢‘΍ô */
+ }else if(event.srcElement.value!="DEL"){
+  for(var i=l;i--;){
+   var dt=eval(arrayElement);
+   deactivate(dt);
+  }
  }else{
-  // ŒŸõŒêŽw’è
-  var matchs=word.split(" "); var tmpArr=new Array(); var tmp;
-  // ƒnƒCƒ‰ƒCƒg¨d•¡ˆ—
-  for(var i=0;i<matchs.length;i++){
-   color.unshift(setHighlight(matchs[i]));
-   highlight[color[0]].word=matchs[i];
-   tmpArr=tmpArr.concat(highlight[color[0]])
+  for(var i=l;i--;){
+   var dt=eval(arrayElement); var dd=dt.nextSibling;
+    //Live‹@”\’ljÁ - “§–¾‚ ‚ځ`‚ñ
+   if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;}
+   dt.removeNode(true); dd.removeNode(true);
   }
-  color.reverse();tmpArr.sort();createHash(highlight,color[0],"",matchs[0]); // ˆê’U‰Šú‰»
-  var judge = (expression=="multiAND") ? "tmp==tmpArr[i]" : "tmp!=tmpArr[i]";
-  for(var i=0;i<tmpArr.length;i++){if(eval(judge)){highlight[color[0]].push(tmpArr[i])}tmp=tmpArr[i]} // ŒŸõŒ‹‰Ê‚Íhighlight[color[0]]‚É“ü‚ê‚é
  }
- // Œ‹‰Ê•\Ž¦
- if     (searchView=="resList") {returnFound("search",color);searchWindow.close();}
- else if(searchView=="resPopup"){returnFound("search",color);searchWindow.close();}
- else if(searchView=="resJump") {returnFound("search",color);searchWindow.close();if(highlight[color[0]].length){moveToSearchRes("search",color.join(","))}}
+ if(fR){fR.innerText="";fR.style.visibility="hidden";}
 }
-// ƒnƒCƒ‰ƒCƒgŒŸõ
-function setHighlight(reg){
+
+//==========’PŒêŒŸõ
+function findIt(word){
+ if(!word){
+  var word = prompt("ŒŸõ‚·‚镶Žš‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B","");
+  word = unescape(escape(word).split("%00")[0]); //IE5‚̃oƒO‘΍ô
+ }
+ if(!word || word=="null"){return}
  // ƒJƒ‰[‘I‘ð
- var c=selectColor("highlight"); if(!c){return}
+ var singleColor=event.altKey;
+ var c = singleColor ? 0 : selectColor();
+ if  (c=="restart"){c=0;singleColor=true}
+ else if(c=="exit"){return;}
  // ŒŸõ
- while(range.findText(reg)){
-  var dt=range.parentElement();var tag=dt.tagName; var thisRange;
-  // ŒŸõ‘Ώۂōi‚荞‚Ý
-  if(tag=="B"||tag=="U"){thisRange="name"}
-  else if(tag=="DT")    {thisRange="mail"}
-  else if(tag=="SPAN")  {thisRange="id"}
-  else if(tag=="DD" || tag=="A" && dt.parentElement.tagName=="DD"){thisRange="mess"}
-  else if(tag=="STRONG"){thisRange="word"}
-  else{/*alert("tagF"+tag+"\ndt:"+dt.outerHTML);*/range.collapse(false);continue;} // ƒŒƒX”ԍ†(A)‚⌟õŒ‹‰ÊŽ©‘Ì(TT)
-  if(!searchTarget[thisRange]){range.collapse(false);continue;}
-  // ³‹K•\Œ»‚̈ʒuŽw’èŽq‚ª‚ ‚éê‡A•ïŠÜ—v‘f“à•”‚ōČŸõ
-  if(expression=="regExp" && word.match(/[\^|\$]/)){
-   var thisReg=new RegExp(word); var targetText=(tag=="STRONG") ? dt.parentElement.innerText : dt.innerText;
-   if(!targetText.match(thisReg)){range.collapse(false);continue}
-  }
-  // dtŽæ“¾¨ƒŒƒX”ԍ†Žæ“¾¨ƒnƒCƒ‰ƒCƒg
-  if(dt.tagName!="DT"){
-   while(dt.tagName!="DT" && dt.tagName!="DD"){dt=dt.parentElement}
-   if(dt.tagName=="DD"){dt=dt.previousSibling}
-  }
-  var num=dt.firstChild.innerText;
-  if(dt.parentElement.className!="refResult" && num!=highlight[c][highlight[c].length-1]){highlight[c].push(num)} // ‹tŽQÆ“à‚ÌDT,“¯ˆê”ԍ†‚È‚ç‰ñ”ð
-  range.pasteHTML('<strong style="background-color:'+c+'">'+range.text+'</strong>');
-  range.collapse(false);
+ var found=new Array; var l=dds.length;
+ var bodyText=document.body.createTextRange();
+ for(var i=l;i--;){
+  var dt=dts[i]; var dd=dds[i];  if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
+  bodyText.moveToElementText(dt);  var checkDT=bodyText.findText(word,0);
+  bodyText.moveToElementText(dd);  var checkDD=bodyText.findText(word,0);
+  if(checkDT || checkDD){activate(dt,c);found.unshift(dt.firstChild.innerText)}
+  else if(singleColor)  {deactivate(dt);}
  }
- range=document.body.createTextRange(); // ƒŒƒ“ƒW‚ðŒ³‚É–ß‚µ‚Ä‚¨‚­
- return(c);
+ if(found){foundReturn(found)}
 }
 //==========‹tŽQÆ
 function searchRef(obj){
@@ -400,7 +245,16 @@ function searchRef(obj){
   var num=obj.firstChild.innerText;
   if(refHash[num]){
    var refArr=refHash[num].split(/\s/); var refs="";
-   for(var i=0;i<refArr.length;i++){refs+=returnString(refArr[i]);}
+   for(var i=0;i<refArr.length;i++){
+    var dtOrg=getDTfromAnc(refArr[i]); var dt=dtOrg.cloneNode(true); var dd=dtOrg.nextSibling.cloneNode(true);
+    // –{•¶ˆÈŠO‚ðíœ
+    if(dd.lastChild){
+     if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true);} //‹tŽQÆ‚̏œ‹Ž
+     if(dd.lastChild.name){dd.lastChild.removeNode(true);} // LABELNUMBER‚ª‚È‚¢‚à‚Ì‚ÉŒW‚é•s—vƒAƒ“ƒJ[‚̏œ‹Ž
+    }
+    // –{•¶‚ðŠi”[
+    refs+=dt.outerHTML.replace(/name=.*?>/,">")+dd.outerHTML.replace(/<a name=.*>/i,"");
+   }
    obj.nextSibling.insertAdjacentHTML("beforeEnd",'<dl class="refResult">'+refs+'</dl>')
    obj.name="referred";
   }
@@ -428,26 +282,9 @@ function getDTfromAnc(num){
  var anc=ancs(anchorHead+num);
  if(!anc){return("")} //LABELNUMBER‘Ήž‚Ì‚ ‚ځ`‚ñŽá‚µ‚­‚Í–¢o”ԍ†‚È‚çI—¹
  var obj=anc.parentElement; //LABELNUMBER‘Ήž‚Ì‚à‚Ì
- if(!obj || !obj.tagName){return false;}
  if(obj.tagName!="DT"){ //LABELNUMBER”ñ‘Ήž‚Ì‚à‚Ì
   if(num==1){if(anc){obj=anc.nextSibling}                           else{return("")}}
   else      {if(!anc.nextSibling){obj=anc.parentElement.nextSibling}else{return("")}}
  }
  return(obj);
-}
-
-// ‰æ‘œ”Š֘A
-var regIMG=new RegExp(".*?\\s.*?\\s.*:.*?\\sIMG:(.*?)(\\s|$)"); // ‰æ‘œ‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
-function getIMG(obj){
- if(regIMG.test(obj.innerText)){
-  var filename=RegExp.$1;
-  var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
-  var today=new Date();var last=new Date(today-7*24*60*60*1000);var date="";
-  date+=last.getMonth()<9 ? "0"+(last.getMonth()+1) : last.getMonth()+1;
-  date+=last.getDate()<10 ? "0"+last.getDate()      : last.getDate();
-  var log= (RegExp.$1+""+RegExp.$2 < last.getYear()+""+date) ? "_kako/" : "_img/";
-  var fileurl="http://up01.2ch.io/"+log+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
-  return(fileurl)
- }else{return(false)}
-}
-
+}
\ No newline at end of file

--- a/res/skin/skin30-3G/Header.html
+++ b/res/skin/skin30-3G/Header.html
@@ -15,7 +15,7 @@
 var start_time = new Date();
 //==========ƒOƒ[ƒoƒ‹•Ï”
 var anchorHead="";
-var skinName="skin30-3 v3.6.1231";
+var skinName="skin30-3 v3.5.0704";
 var browser="ƒMƒRƒiƒr";
 //==========ƒMƒRƒiƒr—pƒAƒ“ƒJ[‚Ì”»’èi0:ˆ—–³‚µ,1:ƒ|ƒbƒvƒAƒbƒv,2:ƒ{ƒ^ƒ“‘}“üj
 // ƒMƒRƒiƒr‚ł́AƒŒƒXƒAƒ“ƒJ[‚Í‘Š‘΃AƒhƒŒƒX‚Å‹Lq‚³‚ê‚é
@@ -47,16 +47,6 @@ function threadurl(){
  t_bbs=RegExp.$1;
  t_key=RegExp.$2;
 }
-//==========”ñ•\Ž¦ƒŒƒX‚Ì•\Ž¦-ƒMƒRƒiƒr‚Ì‚Ý
-function hiddenRes(e){ 
- var number=tohan(event.srcElement.innerText.replace(/>|„/g,""));
- var i=0;while(document.anchors[i].name.match(/\D/)){i++}
- var startRes=parseInt(document.anchors[i+1].name.replace(/\D/g,""));
- if(number.match(/(\d*)\D+(\d*)/)){var start=parseInt(RegExp.$1);}
- else {var start=parseInt(number);}
- //alert(startRes+">"+start+" && "+start+"!="+1);
- if(startRes>start && start!=1){return true}else{return false}
-}
 </script>
 </head>
 <body>

--- a/res/skin/skin30-3G/chie_base.css
+++ b/res/skin/skin30-3G/chie_base.css
@@ -7,11 +7,8 @@ dt a{text-decoration:none;}
 dd a{text-decoration:underline;line-height:1.1}
 
 /* ŒŸõŒ‹‰Ê */
-#foundPanel{color:LightSlateGray;}
-#foundPanel div {font-family:"‚l‚r ƒSƒVƒbƒN";}
-#foundPanel div span{font-family:Times;cursor:hand;}
-#foundPanel a      {color:LightSlateGray;}
-#foundPanel a:hover{color:#000;}
+#foundResult a      {color:LightSlateGray;}
+#foundResult a:hover{color:#000;}
 
 /* dt */
 dt{

--- a/res/skin/skin30-3G/chie_event.js
+++ b/res/skin/skin30-3G/chie_event.js
@@ -1,22 +1,18 @@
-//========V’…ƒWƒƒƒ“ƒvÝ’è
-var buffer=1;     // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
-var newResJump=1; // V’…ƒŒƒXƒWƒƒƒ“ƒvi0:ƒuƒ‰ƒEƒU”C‚¹A1:“Ç—¹Žž‚̂݁A2:íŽžj–‚©‚¿‚ãAOpenJaneAtwintail‚݂̂̐ݒè
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
 //ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰’è‹`
 //ŠO•”ŠÖ”Ftohan
 //ŠO•”•Ï”FanchorHead,lightmode,getID,skinName,browser,dts
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
-var waited=false;//command•\Ž¦Œãtrue‚É‚µA‘I‘ðŒã‚Éfalse‚É‚·‚éB
-var viewed=false;//thumb“Ǎž‚ÝŒãtrue‚É‚µAthumbPanel‚ɏæ~Œãfalse‚É‚·‚éB
-var searched=false; //ŒŸõŒã‚ɁAtrue‚É‚µAfoundPanel‚ɏæ~Œãfalse‚É‚·‚éB
-var cp,tp,vp,fp;
+//ƒOƒ[ƒoƒ‹•Ï”
+var buffer=1;     // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
+var newResJump=1; // V’…ƒŒƒXƒWƒƒƒ“ƒvi0:ƒuƒ‰ƒEƒU”C‚¹A1:“Ç—¹Žž‚̂݁A2:íŽžj–‚©‚¿‚ãAOpenJaneAtwintail‚݂̂̐ݒè
 //========Clickˆ—¨search,‘¼
 	document.onclick = clickEvent;
 function clickEvent(){
  if(clickCancel){return false}else{clearTimeout(clickTimer);if(document.getElementById("context")){document.getElementById("context").removeNode(true);}}
  var obj=window.event.srcElement;
  var tag=obj.tagName;
- if(tag=="B"||tag=="U"||tag=="SPAN"){searchPerson(obj)} //–¼‘O,ƒgƒŠƒbƒv,ID
+ if     (tag=="B")   {search(obj.parentElement)}   //–¼‘O
+ else if(tag=="U")   {search(obj)}                 //ƒgƒŠƒbƒv
+ else if(tag=="SPAN"){if(getID(obj)){searchID(obj)}} //ID
  else if(tag=="DT")  {searchRef(obj)}
  else if(tag=="DD")  {defaultPopup()}
  else if(tag=="A"){
@@ -27,7 +23,7 @@ function clickEvent(){
    if(obj.href.match(/^http:.*#/)){window.open(obj.href,"_parent");return false}
   }
   //A Bone•â³i”ñ•\Ž¦ƒŒƒX‚Ì•\Ž¦j
-  if((browser=="A Bone"||browser=="ƒMƒRƒiƒr") && hiddenRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content.replace(/\/l50$/,"/")+tohan(obj.innerText.replace(/[>„]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
+  if(browser=="A Bone" && hidedRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content+tohan(obj.innerText.replace(/[>„]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
   //Jane,Live,ƒMƒRƒiƒr•â³iskin30-2Normal‹y‚уMƒRƒiƒrj–ƒŒƒXƒWƒƒƒ“ƒv‚ªscrollIntoView‚Å‚È‚¢‚à‚Ì‚ÉŒW‚é•â³
   if(browser=="A Bone" || browser=="OpenJane" || browser=="Live2ch" || browser=="ƒMƒRƒiƒr"){if(obj.href.match(/^about|jumpres/)){
    var h=tohan(obj.innerText.replace(/[>„]/g,""));
@@ -36,17 +32,17 @@ function clickEvent(){
   }}
   return true;
  }
- else{panelOver();return}
+ else{return}
 }
 
 //=========MouseOverˆ—¨image,popup
 	document.onmouseover = mouseOverEvent;
 function mouseOverEvent() {
  var e = window.event.srcElement;
- if(e.tagName=='B'){if(browser!="twintail2"){
+ if(e.tagName=='B'){
   if(e.innerText.match(/^([^\d‚O-‚X]*)([\d‚O-‚X]+)([^\d‚O-‚X]*.*)/)){namePopup(e,RegExp.$1,RegExp.$2,RegExp.$3);}
   else if(e.innerText.match(/^‚ ‚ځ`‚ñ$/))                          {abonePopup(e);}
- }}
+ }
  if(e.tagName=='A'){
   if(!e.innerText.match(/%/)){ // URLƒGƒ“ƒR[ƒh‚Å‚ ‚肪‚¿‚È%‚ª‚È‚¯‚ê‚Î
    //e.href=e.href.replace(/>/g,"");
@@ -59,8 +55,9 @@ function mouseOverEvent() {
    }
   }
   if     (checkAnchor(e.href)==2){insButton(e);return;}
-  else if(checkAnchor(e.href)==1){  // ‘½’iƒ|ƒbƒvƒAƒbƒv
+  else if(checkAnchor(e.href)==1){
    if(event.shiftKey){if(e.rel){e.href=e.rel}return}
+   // ‘½’iƒ|ƒbƒvƒAƒbƒv
    var parent=e.parentElement;
    var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText;
    if(!document.getElementById("p"+aNum)){
@@ -69,48 +66,49 @@ function mouseOverEvent() {
     if(!onPopup){removePopup()}
     makePopContent(e);return;
    }
-  }else if(checkAnchor(e.href)==0){ // ‹tŽQÆƒ|ƒbƒvƒAƒbƒv
-   if(e.href.match(/menu:/) && event.shiftKey){searchPopup(e)}
   }
- }else if(e.tagName=="SPAN"||e.tagName=="TT"){
-  var obj=e;var onPopup;
-  while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
-  if(e.tagName=="SPAN"){
-   if(!onPopup && event.shiftKey){searchPopup(e)}
-  }else{searchPopup(e)}
  }else{ // ‘½’iƒ|ƒbƒvƒAƒbƒvÁ‹Ž
   var obj=e;var onPopup;
   if(obj.sourceIndex<0){obj=document.body;if(document.getElementById("popupBase")){onPopup=true;}} // namePopup‚Æ‚Ì‹£‡‚Ńm[ƒh‚ªŠO‚ê‚éuŠÔ‚̉ñ”ð
-  while(obj.tagName!="BODY"){if(obj.id.match(/(p\d+)/)){onPopup=true;break}else{obj=obj.parentElement;}}
+  while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement;}}
   if(onPopup){while(obj.id!=obj.parentElement.lastChild.id){obj.parentElement.lastChild.removeNode(true)}}
   else       {removePopup()}
  }
+ if(e.tagName=="DT"){setHash();}
+ if(e.tagName=="SPAN"){
+   var obj=e;var onPopup;
+   while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
+   if(!onPopup && event.shiftKey){searchPopup(event.toElement);} return;
+ }
 }
-//=========MouseMoveˆ—¨panelOver()
+//=========MouseMoveˆ—¨menuOver(),tpOver()
 	document.onmousemove=mouseMoveEvent;
+var waited=false;//command•\Ž¦Œãtrue‚É‚µA‘I‘ðŒã‚Éfalse‚É‚·‚éB
+var viewed=false;//thumb“Ǎž‚ÝŒãtrue‚É‚µAthumbPanel‚ɏæ~Œãfalse‚É‚·‚éB
+var cp,tp,vp;
 function mouseMoveEvent() {
  if(!cp){
-  var nHTML ='<div id="controlPanel"><input type="button" value="TOP" onclick="scroll_Top();blur()"><input type="button" value="END" onclick="scroll_End();blur()"><input type="button" value="IMG" onmouseup="imgCommand();blur()"><input type="button" value="FND" onclick="fndCommand();blur();"></div><div id="foundPanel" onmouseout="searched=false"></div>';
-  if(skinName.match(/30-2/)){nHTML+='<div id="thumbPanel" onmouseout="viewed=false"></div><div id="viewPanel"></div>';}
-  document.body.insertAdjacentHTML("afterBegin",nHTML);
-  cp=document.getElementById("controlPanel");fp=document.getElementById("foundPanel");
-  if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}else{tp=vp=new Object()}
-  cp.condition="waited";tp.condition="vp.firstChild || viewed || !lightmode";fp.condition=resultView ? "fp.hasChildNodes()" : "searched";
-  cp.territory="<25";   tp.territory=">20";                                  fp.territory="<(30+fp.clientHeight) && fp.hasChildNodes()";
+  var nHTML ="<div id='controlPanel'><input type='button' value='TOP' onclick='scroll_Top();blur()'><input type='button' value='END' onclick='scroll_End();blur()'><input type='button' value='IMG' onmouseup='imgCommand();blur()'><input type='button' value='FND' onclick='findIt(document.selection.createRange().text);blur()'></div>";
+  if(skinName.match(/30-2/)){nHTML+="<div id='thumbPanel' onmouseout='viewed=false'></div><div id='viewPanel'></div>";}
+  document.body.insertAdjacentHTML('afterBegin',nHTML);
+  cp=document.getElementById("controlPanel");
+  if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}
  }
- if(event){panelOver();}
- if(!idHash.length){setHash();searchColoring();}
+ cpOver();
+ tpOver();
 }
-// Šeƒpƒlƒ‹
-function panelOver(){
+// ƒRƒ“ƒgƒ[ƒ‹ƒpƒlƒ‹
+function cpOver(){
  var territoryW=document.body.clientWidth-120;var territoryH=25;
- var panels=new Array("cp","tp","fp");
- for(var i in panels){
-  if(skinName.match(/30-3/)&&panels[i]=="tp"){continue}
-  var panel=eval(panels[i]); var territoryY=eval("event.y"+panel.territory); var territoryX=eval(event.x>document.body.clientWidth-panel.offsetWidth-15);
-  if(eval(panel.condition)){panel.style.visibility="visible";return}
-  if(territoryY && territoryX){panel.style.visibility="visible";}else{panel.style.visibility="hidden";}
- }
+ if(waited){cp.style.visibility="visible";return}
+ if(event.y<territoryH && event.x>territoryW){cp.style.visibility="visible";}else{cp.style.visibility="hidden";}
+}
+// ƒTƒ€ƒlƒCƒ‹ƒpƒlƒ‹
+function tpOver(){
+ if(skinName.match(/30-3/) || !lightmode){return}
+ var territoryW=document.body.clientWidth-120;var territoryH=20;
+ if(document.getElementById("viewPanel").firstChild || viewed){tp.style.visibility="visible";return}
+ if(event.y>territoryH && event.x>territoryW){tp.style.visibility="visible";}else{tp.style.visibility="hidden";}
 }
 // TOP,END
 function scroll_Top(){document.getElementsByTagName("DL")[0].firstChild.scrollIntoView(true);}
@@ -129,14 +127,6 @@ function imgCommand(mode,s){
   clearCommand();
  }
 }
-function fndCommand(mode,s){
- if(!waited){
-  findIt(document.selection.createRange().text);
-  event.cancelBubble=true;
- }else{
-  clearCommand();
- }
-}
 function clearCommand(){
  waited=false;
  document.getElementById("command").removeNode(true);
@@ -184,7 +174,7 @@ function key(){
  else if(code=="36"){scroll_Top()}
  else if(code=="35"){scroll_End()}
  else if(code=="73" && event.shiftKey){changePanel();return false;} // shift+I
- else if(code=="70" && event.shiftKey){findIt(document.selection.createRange().text);return false;} // shift+F
+ else if(code=="70" && event.shiftKey){cp.childNodes[3].click();return false;} // shift+F
  else if(code=="78" && event.shiftKey && firstNew){firstNew.scrollIntoView(true)} // shift+N
  else if(code=="82" && event.shiftKey && event.ctrlKey){ // ctrl+shift+R
   //‚©‚¿‚ã`‚µ‚á•â³i”XV‚̃Vƒ‡[ƒgƒJƒbƒgƒL[j
@@ -200,7 +190,7 @@ function key(){
 //=========‚©‚¿‚ãAABoneAƒ]ƒk‚Q
 var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
 var k=0;
-function loadEvent(num){
+function loadEvent(num){ //setTimeout("setHash();",100);
  //====V’…ƒŒƒXƒWƒƒƒ“ƒv
  if(newResJump==0){clearInterval(timerID);return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
  //V’…ƒŒƒX‚ÌŠJŽn”ԍ†‚ðŽæ“¾
@@ -219,7 +209,7 @@ function loadEvent(num){
 //=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“‘Ήžƒuƒ‰ƒEƒU—pj©NewMark‚©‚çŒÄ‚яo‚µ
 //=========OpenJAtwin
 var scr,viewPos,endPos=0;
-function reloadEvent(){
+function reloadEvent(){ //setTimeout("setHash();",100);
  //====Šù“lj»
  var lastDt=dts[dts.length-2];if(!lastDt){return}// ‘S•”V’…‚È‚çI—¹
  while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}
@@ -252,10 +242,10 @@ function defaultPopup(){
   obj.innerText=num;
   obj.href="#"+hnum;
   makePopContent(obj);
- }else if(num.match(/\w{8,9}/)){ //\w{8}‚Å‚Í‚¾‚߂ہH
-  var obj=document.createElement("DT");
-  obj.innerHTML="<span>date time ID:"+num+"</span>";
-  searchPerson(obj.firstChild);
+ }else if(num.match(/\w/) && num.length==8){ //\w{8}‚Å‚Í‚¾‚߂ہH
+  var obj=document.createElement("span");
+  obj.innerText="date time ID:"+num;
+  setHash();searchID(obj);
  }
 }
 
@@ -270,14 +260,5 @@ function copyEvent(){
  copyText.execCommand("Copy");
  return false; 
 }
-//=========onScrollˆ—
-//window.onscroll=function(){clearInterval(beforeScrollTimer);onLoadEvent()}
-window.onscroll=function(){onLoadEvent()}
-if(document.getElementById("dl")){
- document.getElementById("dl").onscroll=function(){onLoadEvent()}
-}
-//=========onLoadˆ—
-window.onload=onLoadEvent;
-function onLoadEvent(){mouseMoveEvent();setHash();searchColoring();}
-setTimeout("onLoadEvent()",1000); // ˆê‰ñ‚¾‚¯’…F
-
+//=========onLoadˆ—iDAT2HTML‚̂݁j
+window.onload=function(){setHash()}

--- a/res/skin/skin30-3G/chie_image2.js
+++ b/res/skin/skin30-3G/chie_image2.js
@@ -1,8 +1,7 @@
 // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonMouseover
 // ŠO•”•Ï”FanchorHead,dds
-//======‰æ‘œ“ǂݍž‚Ý‚ÌÝ’è  i’jWindowsXP SP2‚Å‚Í‚±‚ê‚ç‚̐ݒè‚Í—LŒø‚É‹@”\‚µ‚Ü‚¹‚ñB
-var onOpenLoad =1;  	// 0:“ǂݍž‚Ü‚È‚¢A1:V’…ƒŒƒX‚̂݁A2:‘S•”
-var onMouseLoad=true;	// true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
+//======‰æ‘œ“ǂݍž‚݂̐ݒè
+var onMouseLoad=true;   // true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
 //==========ƒOƒ[ƒoƒ‹•Ï”
 var lightmode=true; // Live,twin‚̃Wƒƒƒ“ƒv—p”»’è‚Å—p‚¢‚Ä‚¢‚é‚Ì‚Å•K{
 //==========‰æ‘œˆ—“™

--- a/res/skin/skin30-3G/chie_popup.js
+++ b/res/skin/skin30-3G/chie_popup.js
@@ -1,6 +1,4 @@
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
 // ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonMouseover
-// ŠO•”•Ï”FidHash,refHash,foudRes,highlight
 // ŠO•”ŠÖ”FaddAnchor,getDTfromAnc
 // “Á’¥FDIV#popupBase‰º‚Ɂuƒtƒ‰ƒbƒg‚ŃŠƒjƒAv‚ÉDL#p\d‚ðì¬‚·‚éB
 //==========CSS‚̏o—Í
@@ -11,65 +9,65 @@ nCSS+='#popupBase dl{position:absolute; background-color:window; border:outset 1
 nCSS+='#popupBase dt span{float:none; margin-left:1em;}';
 nCSS+='#popupBase dd{margin:auto 1em}';
 document.write('<style type="text/css">'+nCSS+'</style>\n');
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
+//=========ƒOƒ[ƒoƒ‹•Ï”
+var pb;
 //=========ƒiƒ“ƒo[‚È–¼‘O‚̃|ƒbƒvƒAƒbƒv
 function namePopup(e,before,num,after){
  var hnum=tohan(num);
- if(hnum==774 || hnum==21 || hnum==1 || hnum==30){return} // Socket774A774KBA21‹ÖA[1-30]A‚È‚Ç‚Í–³Ž‹
- if(before && before.match(/–¼–³/)){return} //–¼–³‚µ‚Á‚Û‚¢‚Ì‚Í–³Ž‹
- if(after) {if(after=="Žü”N"){return}} // ƒfƒtƒHƒ‹ƒg‚È"‚ŽŽü”N"‚Í–³Ž‹
+ //‚RŽü”NA‚SŽü”NASocket774A774KBA21‹ÖA[1-30]A‚È‚Ç‚Í–³Ž‹
+ if(before){if(hnum==5 || hnum==774 || hnum==4 || hnum==21 || hnum==1 || hnum==30){return}}
  var nB = before ? "<b>"+before+"</b><b>":"<b>"; nB+=addAnchor(hnum,num); nB+=after ? "</b><b>"+after+"</b>":"</b>";
  e.outerHTML=nB;
 }
 //=========Žã‚ ‚ځ`‚ñ‚̃|ƒbƒvƒAƒbƒv
-function abonePopup(e){e.outerHTML = "<b>"+addAnchor(e.parentElement.previousSibling.innerText,'‚ ‚ځ`‚ñ')+"</b>";}
-//=========ŒŸõ‚µ‚½ƒŒƒX‚̃|ƒbƒvƒAƒbƒv
-function searchPopup(obj){
- var reg,cArray;var tag=obj.tagName;
- /*ref Popup*/if     (tag=="A")   {if(refHash[obj.innerText]){cArray=refHash[obj.innerText].split(" ")}else{return}}
- /*ID Popup*/ else if(tag=="SPAN"){reg=getID(obj);if(reg&&reg.length>3){cArray=idHash[reg].split(" ");}else{return} if(cArray.length==1){return}}
- /*ŒŸõPopup*/else if(tag=="TT")  {var cHash=(obj.parentElement.rel=="res")?foundRes:highlight;cArray=cHash[obj.parentElement.firstChild.style.backgroundColor];if(!cArray){return}}
- var targetString=""; for(var i=0;i<cArray.length;i++){targetString+=returnString(cArray[i]);} //’†g‚̐؂èo‚µ
- if(targetString){popup(targetString);} //‘Ώۂª‘¶Ý‚µ‚½‚çƒ|ƒbƒvƒAƒbƒv
+function abonePopup(e){
+ var hnum=e.parentElement.previousSibling.innerText;
+ e.outerHTML = "<b>"+addAnchor(hnum,'‚ ‚ځ`‚ñ')+"</b>";
 }
 //=========‘½’iƒ|ƒbƒvƒAƒbƒv
 //Eƒ|ƒbƒvƒAƒbƒv‚̍쐬
+var startRes;
 function makePopContent(obj){
  //Ž–‘O€”õ
- var num=obj.innerText.replace(/[>„]/g,""); var number=tohan(num);
- if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:"; // ƒuƒ‰ƒEƒU–{‘̂̃|ƒbƒvƒAƒbƒv‰ñ”ð
- //”ԍ†’²¸
+ var num=obj.innerText.replace(/[>„]/g,"");
+ var number=tohan(num);
+ if(!obj.rel){obj.rel=obj.href;}
+ obj.href="decoy:";
+ //’²¸
+ if(document.anchors.length==1){return} //ƒŒƒX”‚ª1‚È‚çI—¹
+ if(!startRes){startRes=parseInt(document.anchors[1].name.replace(/\D/g,""))}
  if(number.match(/(\d*)\D+(\d*)/)){var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);}
  else                             {var start=end=parseInt(number);}
- if(end-start>100){end=start+100} // 100ˆÈã•\Ž¦‚µ‚È‚¢
+// alert(startRes+">"+end+" && "+end+"!=1")
+ if(startRes>end && end!=1){obj.href=obj.rel;return}//‘¶Ý‚µ‚Ä‚¢‚È‚¯‚ê‚ΏI—¹
  //’†g‚̐؂èo‚µ
- var targetString=""; for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}
+ var targetString=""; if(end-start>100){end=start+100}
+ if(start==end){targetString=returnString(start)}
+ else          {for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}}
  //‘Ώۂª‘¶Ý‚µ‚½‚çrel‚É‘Þ”ð‚µ‚Äƒ|ƒbƒvƒAƒbƒv
  if(targetString){popup(targetString);}else{obj.href=obj.rel;}
 }
 //E’†g‚̐؂èo‚µ
 function returnString(num){
  var obj=getDTfromAnc(num);
- setSearchColor(obj);//ƒ|ƒbƒvƒAƒbƒvæ‚Ì’…F
  if(!obj){return("")} //‘Ώۂª“§–¾‚ ‚ځ`‚ñ‚È‚çI—¹
- var dt=obj.cloneNode(true);
-  var dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBER‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
- var dd=obj.nextSibling.cloneNode(true);
+ var dt,dd,dtOuter,ddOuter;
+ dt=obj.cloneNode(true);
+  dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBER‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
+ dd=obj.nextSibling.cloneNode(true);
   if(dd.hasChildNodes()){
    while(dd.lastChild.name){dd.lastChild.removeNode(true)} // LABELNUMBER”ñ‘Ήž‚Ì‚à‚Ì‚ÉŒW‚郊ƒ“ƒNƒAƒ“ƒJ[‚̏œ‹Ž
    if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true)} // ‹tŽQÆ‚̏œ‹Ž
   }
-  var ddOuter=dd.outerHTML;
+  ddOuter=dd.outerHTML;
  return(dtOuter+ddOuter);
 }
 //Eƒ|ƒbƒvƒAƒbƒv
-var pb;
 function popup(inner){
  if(!pb){document.body.insertAdjacentHTML('afterBegin','<div id="popupBase"></div>');pb=document.getElementById("popupBase")}
  //—v‘f‚̍쐬
  var parent=event.srcElement.parentElement;
- //var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDˆÈŠO–¼‘O—“A‰æ‘œAIDŒŸõ
- var aNum=event.srcElement.sourceIndex;if(!aNum){alert("aNumŽæ“¾ƒGƒ‰[")}
+ var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDˆÈŠO–¼‘O—“A‰æ‘œAIDŒŸõ
  if(document.getElementById('p'+aNum)){return} // ƒ|ƒbƒvƒAƒbƒv‚µ‚Ä‚½‚çI—¹
  pb.insertAdjacentHTML("beforeEnd",'<dl id="p'+aNum+'">'+inner+'</dl>');
  //—v‘f‚Ì”z’u
@@ -77,16 +75,16 @@ function popup(inner){
  // yŽ²’²®
  var pos=Math.min(event.y,document.body.clientHeight-event.y);
  var scTop=document.body.scrollTop+event.y;
- if(pos==event.y){var y=scTop-30;}  // ƒJ[ƒ\ƒ‹‚̉º‚Ö•\Ž¦
- else            {var y=scTop+10-p.clientHeight;}  // ƒJ[ƒ\ƒ‹‚̏ã‚Ö•\Ž¦
+ if(pos==event.y){var y=scTop-30;}  // ‰º
+ else            {var y=scTop+10-p.clientHeight;}  // ã
  if(y<0){y=0}
- if(event.srcElement.parentElement.tagName=="TT"){y+=35;}
+ if(event.srcElement.parentElement.id=="foundResult"){y+=30}
  p.style.pixelTop=y;
  // xŽ²’²®
  var pos=Math.min(event.x,document.body.clientWidth-event.x);
  var scLeft=document.body.scrollLeft+event.x;
- if(pos==event.x){var x=scLeft-2}  // ƒJ[ƒ\ƒ‹‚̉E‚Ö•\Ž¦
- else            {var x=scLeft-4-p.clientWidth;}  // ƒJ[ƒ\ƒ‹‚̍¶‚Ö•\Ž¦
+ if(pos==event.x){var x=scLeft-2}  // ‰E
+ else            {var x=scLeft-4-p.clientWidth;}  // ¶
  if(x<0){x=0}
  p.style.pixelLeft=x;
  // ‚‚³’²®iscrollBar‚ð—v‚·ê‡‚Æ—v‚µ‚È‚¢ê‡‚ª‚ ‚éj¨yŽ²’²®

--- a/res/skin/skin30-3G/chie_search.js
+++ b/res/skin/skin30-3G/chie_search.js
@@ -1,398 +1,243 @@
-beID=false; // be‚ɃƒOƒCƒ“o—ˆ‚éê‡‚́Atrue
-//==========ŒŸõÝ’è
-var expression="multiAND";	// ŒŸõ•û–@@@default:•W€AregExp:³‹K•\Œ»AmultiAnd:ANDŒŸõAmultiOR:ORŒŸõ
-var searchView="resList";	// ŒŸõŒ‹‰Ê•\Ž¦@@resList:ŠY“–ƒŒƒX”ԍ†•\Ž¦AresPopup:ŠY“–ƒŒƒXƒ|ƒbƒvƒAƒbƒvA
-var resultView=false;		// ŒŸõŒ‹‰Ê‚̏펞•\Ž¦@@true:íŽž•\Ž¦Afalse:ƒ}ƒEƒX‚ŋ߂¯‚½‚Æ‚«‚Ì‚Ý•\Ž¦
-var listLimit =10;  		// searchView‚ªresPopup‚Å‚È‚¢ê‡‚́AƒŒƒX”ԍ†‚Ì•\Ž¦§ŒÀ
-//==========ƒŒƒX”ԍ†A“ú•t•¶Žš—ñ‚Ì’…FÝ’è
-coloring=1;               // ’…F‚·‚é:1@’…F‚µ‚È‚¢:0
-threshold1=[2,"#0000ff"]; // ‘‚«ž‚Ý‚ª•¡”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold2=[5,"#aaaa00"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold3=[8,"#ff0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
-threshold4=[1,"#0000FF"]; // ‘‚«ž‚Ý‚ª‚ ‚é    ƒŒƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-threshold5=[4,"#aaaa00"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-threshold6=[7,"#ff0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
-//==========–¼‘OEIDŒŸõ‚É‚æ‚郌ƒX‚̑т̐FŽw’èi16i”–”‚ÍWebŒ`Ž®‚̐F–¼‚ÅŽw’èB‚¢‚­‚‚łà‰ÂBƒAƒ‹ƒtƒ@ƒxƒbƒg‚͏¬•¶Žš‚Å‚¨Šè‚¢j
-var foundResColor =new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
-//==========’PŒêŒŸõ‚É‚æ‚éƒnƒCƒ‰ƒCƒgFŽw’èi“¯ãj
-var highlightColor=new Array("#ffff66","#a0ffff","#99ff99","#ff9999","#ff66ff","#880000","#00aa00","#886800","#004699","#990099");
-//==========ˆÈ‰º‚̓XƒNƒŠƒvƒg–{•¶‚Å‚·‚æB
-// ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonClick,onScroll,onMousemove
-// ŠO•”ŠÖ”FaddAnchor,checkAnchor,tohan,searchPopup
-// ŠO•”•Ï”FanchorHead,browser,fp
-// ‹tŽQÆ‚Ì“Á’¥FƒCƒxƒ“ƒg”­¶DT‚ɑΉž‚·‚éDD‰º‚ɁADL-DT-DD\‘¢‚ðì¬‚·‚éB
+// “ú•t•¶Žš—ñ‚Ì’…FÝ’è@’…F‚·‚é:1@’…F‚µ‚È‚¢:0
+coloring=1;
+threshold1=[2,"#0000FF"]; // ‘‚«ž‚Ý‚ª•¡”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
+threshold2=[5,"#FF0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚éID ‚Ì‚µ‚«‚¢’l‚ƐF
+threshold3=[1,"#0000FF"]; // ‘‚«ž‚Ý‚ª‚ ‚é    ƒŒƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
+threshold4=[4,"#FF0000"]; // ‘‚«ž‚Ý‚ª‘½”‚ ‚郌ƒX ‚Ì‚µ‚«‚¢’l‚ƃŒƒX”ԍ†‚̐F
+// ƒCƒxƒ“ƒgƒnƒ“ƒhƒ‰FonClick
+// ŠO•”ŠÖ”FaddAnchor,checkAnchor,tohan
+// ŠO•”•Ï”FanchorHead,browser
+// “Á’¥FƒCƒxƒ“ƒg”­¶DT‚ɑΉž‚·‚éDD‰º‚ɁADL-DT-DD\‘¢‚ðì¬‚·‚éB
 //==========CSS‚̏o—Í
 var nCSS='';
-nCSS+='#foundPanel {position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999;visibility:hidden}';
-nCSS+='#foundPanel div{padding-left:5px;text-align:right;font-size:100%;}';
+nCSS+='#foundResult{position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999}';
 nCSS+='.refResult{margin:0.5em 0.3em; border:1px solid #666;padding-right:0px}';
 nCSS+='.refResult{border-top:none}';
 nCSS+='.refResult dt{margin-right:0px;}';
 nCSS+='.refResult dd{margin-left:0.8em;}';
 document.write('<style type="text/css">'+nCSS+'</style>\n');
+//==========ŒŸõ‚É‚æ‚éFŽw’èi16i”–”‚ÍWebŒ`Ž®‚̐F–¼‚ÅŽw’èB‚¢‚­‚‚łà‰Âj
+var foundColor = new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
 var nCSS='';
-for(var css in foundResColor){
- var c=foundResColor[css].replace(/#/,"");
- nCSS+='#COLOR'+c+" a{border-color:"+foundResColor[css]+"}\n";
- nCSS+='#COLOR'+c+" a:hover{border-color:red}\n";
+for(var css=0;css<foundColor.length;css++){
+ nCSS+='#COLOR'+css+" a{border-color:"+foundColor[css]+"}";
+ nCSS+='#COLOR'+css+" a:hover{border-color:red}";
 }
 document.write('<style type="text/css">'+nCSS+'</style>\n');
-//=========ŠO•”ƒtƒ@ƒCƒ‹‹¤—p‚̃Oƒ[ƒoƒ‹•Ï”
+//==========ƒOƒ[ƒoƒ‹•Ï”
 var dts=document.getElementsByTagName('DT');
 var dds=document.getElementsByTagName('DD');
-var idHash=new Array(); var refHash=new Array();
-var foundRes,highlight;
+var fR;
 //==========ID‚ÆŽQÆ‚ðƒnƒbƒVƒ…‚ÉŠi”[
-// ”z—ñ‚̃nƒbƒVƒ…‚æ‚èŒy‚¢‚Á‚Û‚¢‚̂ŁA‹ó”’‹æØ‚è‚Ì’l‚É‚æ‚é’Pƒ‚ȃnƒbƒVƒ…‚É‚µ‚Ä‚Ý‚éƒeƒXƒgB
-// setEndIdx:–{•¶‚Ì“¯ƒŒƒX‚ðd•¡ˆ—‚µ‚È‚¢‚悤‚ɁAHash‰»ˆÊ’u‚Æ‚µ‚Ä‚Ìdts‚̍ŏIindex‚ð‹L‰¯
-// setEndNum:–{•¶ˆÈŠOƒŒƒX‚ðd•¡ˆ—‚µ‚È‚¢‚悤‚ɁAÅIƒŒƒX”ԍ†‚ð‹L‰¯
-var setEndIdx=setEndNum=0;
+var idHash=new Array(); var refHash=new Array(); var searchEnd=0;
 function setHash(){
- //var t0=new Date();
- var l=Math.min(dts.length,dds.length);
- var lastNum=l ? parseInt(dts[l-1].firstChild.innerText) : 0;
- if(isNaN(lastNum)&&l>1){lastNum=parseInt(dts[l-2].firstChild.innerText)} //Footer‚ ‚è‚È‚çˆê‚‘O
- if(l==0 || lastNum<=setEndNum){return} // ÅŒã‚Ü‚Å’²¸Ï‚Ý‚È‚ç‰ñ”ð
- for(var i=setEndIdx;i<l;i++){
+ var l=dts.length;
+ if(dts[l-1].rel=="setEnd"){return} // ÅŒã‚Ü‚Å’²¸Ï‚Ý‚È‚ç‰ñ”ð
+ for(var i=searchEnd;i<l;i++){
   if(dds[i].parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDD‚È‚ç‰ñ”ð
   var num=dts[i].firstChild.innerText; var span=dts[i].lastChild;
   // ID
-  var t=getID(span); if(t&&t.length>3){idHash[t] = idHash[t] ? idHash[t]+" "+num : num;} // ???‚âID:0,ID:#(@ƒ]ƒk)‚̓Xƒ‹[B
-  // ‰æ‘œ”Â
-  var imgURL=getIMG(span);
-  if(imgURL){
-   var dd=dts[i].nextSibling;
-   if(tp && imgURL && !dd.getElementsByTagName("IMG").length){
-    var aObj=(dd.innerText)?'<br><a href="'+imgURL+'">'+imgURL+'</a>':'<a href="'+imgURL+'">'+imgURL+'</a>';
-    if(!beID && imgURL.match(/kako/)){/*dd.insertAdjacentHTML("beforeEnd","<br>Be‚ɃƒOƒCƒ“‚µ‚Ä‚È‚¢‚Ǝ擾‚Å‚«‚Ü‚¹‚ñ");*/}else{dd.insertAdjacentHTML("beforeEnd",aObj)}
-   }
-  }
-  // ref,IMG
+  var t=getID(span); idHash[t] = idHash[t] ? idHash[t]+" "+num : num;
+  // ref
   var ddAnc=dds[i].getElementsByTagName("A");
-  for(var j=0;j<ddAnc.length;j++){
-   if      (checkAnchor(ddAnc[j].href)==0){
-    continue;
-   }else if(checkAnchor(ddAnc[j].href)==1){
-    var anc=tohan(ddAnc[j].innerText.replace(/[>„]/g,""));var start,end;
-    if(anc.match(/(\d*)\D+(\d*)/)){
-     start=parseInt(RegExp.$1); end=parseInt(RegExp.$2);
-     if( (end-start>100) || (num-end<4 && start==1) ){continue} // >>1-1000‚Æ‚©>>1-n(’¼‘OƒŒƒX)‚Æ‚©‚͉ؗí‚ɃXƒ‹[
-    }else{
-     start=end=parseInt(anc);
+  for(var j=ddAnc.length;j--;){
+   if(checkAnchor(ddAnc[j].href)!=1){continue}
+   var anc=tohan(ddAnc[j].innerText.replace(/[>„]/g,""));
+   if(anc.match(/(\d*)\D+(\d*)/)){
+    var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);
+    if(end-start>100){continue} // >>1-1000‚Æ‚©‚͉ؗí‚ɃXƒ‹[
+    else if(num-end<3 && start==1){continue} // >>1-n(’¼‘OƒŒƒX)‚ÍŽ‚Ë,‚Æ‚©‚àƒXƒ‹[
+    for(var k=start;k<=end;k++){
+     if(refHash[k] && refHash[k].indexOf(num)!=-1){continue} // d•¡‚̓Xƒ‹[
+     if(num>=k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // –¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
     }
-    var k=start-1;do{k++;
-     if((!refHash[k] || refHash[k].indexOf(num)==-1) && num>k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // d•¡‚â–¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
-    }while(k<end);
-   }else if(imageExt2(ddAnc[j].href) && onOpenLoad!=0){
-    if(onOpenLoad==1){if(dds[i].previousSibling.className!="new"){continue}}
-    insButton(ddAnc[j],ddAnc[j].href);
+   }else{anc=parseInt(anc);
+     if(refHash[anc] && refHash[anc].indexOf(num)!=-1){continue} // d•¡‚̓Xƒ‹[
+     if(num>=anc){refHash[anc]=refHash[anc] ? refHash[anc]+" "+num : num;} // –¢—ˆ‚ւ̃Aƒ“ƒJ[‚̓Xƒ‹[
    }
   }
  }
- setEndIdx=l;setEndNum=lastNum;
- //var t1=new Date(); var t=(t1-t0)/1000; if(t){alert(t+"•b");}
-}
-// ƒXƒŒƒbƒhƒEƒBƒ“ƒhƒE’†S‚É‘OŒã5ƒŒƒX‚𒅐F
-var resUnit=new Array();
-function searchColoring(){
+ dts[l-1].rel="setEnd"; searchEnd=l;
  if(!coloring){return;} // ’…F•s—v‚È‚çI—¹
- if(!scr){scr=lightmode ? document.body : document.getElementById("dl");}
- var nowScrollPos=scr.scrollTop+document.body.clientHeight/2;
- var l=Math.min(dts.length,dds.length);var st,ed;
- // dt‚ÌoffsetTop‚ðŠi”[i25ƒŒƒX’PˆÊj
- if(resUnit.length<=Math.floor(dts.length/25)){resUnit[0]=0;
-  for(var i=25;i<l;i+=25){resUnit[i/25]=dts[i].offsetTop;}
- }
- // Œ»Ý‚Ç‚Ì‚ ‚½‚è‚܂ŃXƒNƒ[ƒ‹‚µ‚Ä‚é‚©’²¸
- var rul=resUnit.length-1;
- if     (rul==0)                   {st=0;ed=l-1;} //25–¢–ž
- else if(resUnit[0]>nowScrollPos)  {st=0;ed=24;}  //0-24
- else if(resUnit[rul]<nowScrollPos){st=l-26;ed=l-1;} // ÅI25ƒŒƒX
- else{
-  for(var i=rul;i--;){
-   if(resUnit[i+1]>nowScrollPos&&resUnit[i]<=nowScrollPos){st=i*25;ed=st+25;break}
+ for(var i=l;i--;){
+  if(!dts[i].innerText){continue}
+  //if(dts[i].innerText.match(/id:/i)){ // ID‚ª‚È‚¢”‚ŁA‚‘¬‰»‚·‚é‚©‚àH
+   var span=dts[i].lastChild; var t=getID(span); if(browser=="ƒzƒbƒgƒ]ƒk‚Q"){span=span.lastChild}
+   if(t && idHash[t] && span){
+    var idResult=idHash[t].split(/\s/); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
+    if     (idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
+    else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
+    else if(idResult.length==1){span.title="“¯ˆêID‚Í\n‚ ‚è‚Ü‚¹‚ñ"}
+   }
+  //}
+  var imgURL=getIMG(span);
+  if(imgURL){dds[i].insertAdjacentHTML("afterBegin",'<img src="'+imgURL+'"><br>')}
+  //
+  var numA=dts[i].firstChild; var num=numA.innerText; 
+  if(refHash[num]){
+   var refResult=refHash[num].split(/\s/);
+   if     (refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dts[i].title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
+   else if(refResult.length>=threshold3[0]){numA.style.color=threshold3[1];dts[i].title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
+   else{numA.title="‚±‚ê‚ւ̃ŒƒX‚Í‚È‚¢–Í—l"}
   }
  }
- // Œ»Ý‚Ì”ÍˆÍ“à‚©‚çƒEƒBƒ“ƒhƒE‚̐^‚ñ’†‚ ‚½‚è‚É•\Ž¦‚µ‚Ă郌ƒX‚ðŽæ“¾i‚±‚±‚Å’…F‚·‚é‚ƁA25ƒŒƒX’PˆÊ‚̐ؑ֎ž‚ɐ”ƒŒƒX‚ª’…F‚³‚ê‚È‚¢j
- var dtIdx=0; //if(cp){cp.childNodes[1].value=(st+1)+"-"+(ed+1);cp.style.visibility="visible";}
- for(var i=st;i<=ed;i++){if(!dts[i+1]){dtIdx=ed;break;}
-  if(dts[i+1].offsetTop>nowScrollPos && dts[i].offsetTop<=nowScrollPos){dtIdx=i;break;}
- }
- // dtIdx‚©‚ç‚»‚ÌŽü•Ó‚ð“Á’è
- var start=dtIdx-5;var end=dtIdx+5;//
- for(var i=start;i<=end;i++){
-  if(dts[i]){setSearchColor(dts[i])}
- }
 }
-// IDHashArefHash‚ðŒ³‚É’…F
-function setSearchColor(dt){
- if(!dt.innerText){return}
- // ID
- var span=dt.lastChild; var t=getID(span);//alert(t +"&&"+ idHash[t] +"&&"+ span);
- if     (browser=="ƒzƒbƒgƒ]ƒk‚Q"){span=span.lastChild}
- else if(browser=="A Bone")      {span=span.childNodes[1]}
- if(t && idHash[t] && span){
-  var idResult=idHash[t].split(" "); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
-  if     (idResult.length>=threshold3[0]){span.style.color=threshold3[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="“¯ˆêID ("+idResult.length+"‰ñ)\n"+idHash[t]}
-  else if(idResult.length==1){span.title="“¯ˆêID‚Í\n‚ ‚è‚Ü‚¹‚ñ"}
- }
- // ref
- var numA=dt.firstChild; var num=numA.innerText; 
- if(refHash[num]){
-  var refResult=refHash[num].split(" ");
-  if     (refResult.length>=threshold6[0]){numA.style.color=threshold6[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else if(refResult.length>=threshold5[0]){numA.style.color=threshold5[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else if(refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dt.title="‚±‚ê‚ւ̃ŒƒX ("+refResult.length+"ŒÂ)\n"+refHash[num];}
-  else{numA.title="‚±‚ê‚ւ̃ŒƒX‚Í‚È‚¢–Í—l"}
- }
+var regIMG=new RegExp(".*?\\s.*?\\s.*:.*?\\sIMG:(.*?)(\\s|$)"); // ‰æ‘œ‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
+function getIMG(obj){
+ if(regIMG.test(obj.innerText)){
+  var filename=RegExp.$1;
+  var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
+  var fileurl="http://up01.2ch.io/_img/"+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
+  return(fileurl)
+ }else{return(false)}
 }
 //==========–¼‘OEIDŒŸõ“™
-function searchPerson(obj){
- var by,thisDT,reg;
- if     (obj.tagName=="DT")  {by="ID";  thisDT=obj;              reg=getID(obj)}
- else if(obj.tagName=="SPAN"){by="ID";  thisDT=obj.parentElement;reg=getID(obj)}
- else if(obj.tagName=="U")   {by="NAME";thisDT=obj.parentElement;              reg=obj.innerHTML.replace(/<B>(.*?)<\/B>/ig,"");if(!reg){reg=RegExp.$1.replace(/<.*?A.*?>/ig,"")}/*–¼‘O‚ª”Žš*/}
- else if(obj.tagName=="B")   {by="NAME";thisDT=obj.parentElement.parentElement;reg=obj.innerText}
- else{return}
- if(!thisDT.rel){
-  var c=selectColor("res"); if(!c){return} var color=new Array(c); // ƒJƒ‰[‘I‘ð
-  if(by=="ID"){
-   if(!reg || !idHash[reg]){return} // ID‚È‚µAID:???A–{•¶’†‚Ì‘¼ƒXƒŒ‚̃RƒsƒyID
-   // ŒŸõƒnƒbƒVƒ…‚É’l‚ðÝ’肵‚āA‚»‚ê‚ÉŠî‚«ƒŒƒX’…F
-   foundRes[c]=idHash[reg].split(" "); foundRes[c].word="ID:"+reg;
-   for(i in foundRes[c]){var dt=getDTfromAnc(foundRes[c][i]);toggleResColor(dt,c);}
-  }else{
-   var us=document.getElementsByTagName("U"); var l=us.length;
-   var regName=new RegExp();regName.compile(reg);
-   // ƒ‹[ƒv’†‚ɃŒƒX’…FE’l‚̐ݒè‚𓯎žŽÀs
-   for(var i=l;i--;){var dt=us[i].parentElement;
-    if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
-    if(regName.test(us[i].innerText)){toggleResColor(dt,c);foundRes[c].unshift(dt.firstChild.innerText);}
-   }
-   foundRes[c].word=reg;
-  }
-  returnFound("res",color);
+// ID‚ÌŒŸõEíœ
+function searchID(obj){
+ var singleColor=event.altKey;
+ var decoy=obj.parentElement ? obj.parentElement : obj;
+ var reg=getID(obj);
+ if(!decoy.id.match(/^COLOR/)){
+  if(!idHash[reg]){return}
+  var target=new Array();target=idHash[reg].split(" ");
+  // ƒJƒ‰[‘I‘ð
+  var c = singleColor ? 0 : selectColor();
+  if  (c=="restart"){c=0;singleColor=true}
+  else if(c=="exit"){return;}
+  // ŒŸõ
+  for(i in target){var dt=getDTfromAnc(target[i]);activate(dt,c);}
+  foundReturn(target);
  }else{
-  clearColor("res",thisDT.style.backgroundColor);
+  clearResult(obj);return;
  }
 }
-// ID•¶Žš—ñ‚Ì’Šo
-var regID=new RegExp(); // HOST‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
-regID.compile(".*?\\s.*?\\s.*:(.*?)(\\s|$)"); // 1000res‚Å0.02•b‚قǍ‚‘¬
-function getID(span){
- if(regID.test(span.innerText)){return(RegExp.$1)}else{return(false)}
-}
-//==========FÝ’è‰ðœ
-// ƒIƒuƒWƒFƒNƒg‚̏‰Šú‰»
-function createHash(name,key,arr,word){
- name[key]=arr?arr:new Array();
- name[key].word=word?word:"";
- name[key].justMovedRes=undefined;
-}
-// F‘I‘ð(ŠY“–ƒŒƒX”ԍ†”z—ñ‚ðŽ‚½‚È‚¢ƒL[‚ð•Ô‚·)
-function selectColor(type){
- if(!foundRes) {foundRes =new Array();for(var i in foundResColor) {createHash(foundRes,foundResColor[i]);}}   // Hash foundRes  ={F:ŠY“–ƒŒƒX”ԍ†”z—ñ}
- if(!highlight){highlight=new Array();for(var i in highlightColor){createHash(highlight,highlightColor[i]);}} // Hash hightLight={F:ŠY“–ƒŒƒX”ԍ†”z—ñ}
- var cHash,cArray,cMess;
- if(type=="res"){cHash=foundRes; cArray=foundResColor; cMess="¡‚܂ł̃ŒƒX’…F‚ð‰ðœ‚µ‚Ü‚·‚©H";}
- else           {cHash=highlight;cArray=highlightColor;cMess="¡‚܂ł̃nƒCƒ‰ƒCƒg‚ð‰ðœ‚µ‚Ü‚·‚©H";}
- var i=0; while(cHash[cArray[i]].word){
-  i++; if(i==cArray.length){if(confirm(cMess)){clearColor(type);i=0;break}else{i=null;break}}
- }
- return(cArray[i]);
+// IDƒ|ƒbƒvƒAƒbƒv
+function searchPopup(obj){
+ var objs=document.getElementsByTagName(obj.tagName);
+ var reg=getID(obj);if(!reg){return}
+ var target=idHash[reg].split(" ");
+ if(target.length==1){return}
+ if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:";
+ var targetString=""; for(i in target){targetString+=returnString(target[i])} //’†g‚̐؂èo‚µ
+ if(targetString){popup(targetString);}else{obj.href=obj.rel;} //‘Ώۂª‘¶Ý‚µ‚½‚çrel‚É‘Þ”ð‚µ‚Äƒ|ƒbƒvƒAƒbƒv
 }
-// F‰ðœiƒnƒbƒVƒ…A‘ΏہAfoundPanelj
-function clearColor(type,color){
- var cHash=(type=="res")?foundRes:highlight;
- if(event && event.altKey){color=""}
- for(var i in cHash){
-  if(type=="res"){
-   if(color && i!=color){continue} // Žw’èF‚Å‚È‚¯‚ê‚΃Xƒ‹[
-   for(var j in cHash[i]){
-    if(event.srcElement.value=="DEL"){removeRes(getDTfromAnc(cHash[i][j]))}else{toggleResColor(getDTfromAnc(cHash[i][j]))}
-   }
-   cHash[i]=new Array();
-   document.getElementById("c"+i).removeNode(true);
-  }else{
-   var strongs=document.getElementsByTagName("STRONG");
-   var reg=new RegExp(i);
-   if(!color.match(i)){continue}  // Žw’èF‚Å‚È‚¯‚ê‚΃Xƒ‹[
-   for(var j=0;j<strongs.length;j++){
-    if(strongs[j].style.backgroundColor==i){
-     if(event.srcElement.value=="DEL"){removeRes(strongs[j].parentElement.previousSibling);j--}else{strongs[j].removeNode(false);j--}
-    }
-   }
-   cHash[i]=new Array();
-   if(document.getElementById("c"+i)){document.getElementById("c"+i).removeNode(true);} // and,orŒŸõ‚Å‚PF–Ú‚Ì‚Ý
+// –¼‘O‚ÌŒŸõEíœ
+function search(obj){
+ var singleColor=event.altKey;
+ var objs=document.getElementsByTagName(obj.tagName);
+ var reg=obj.innerText; var target="objs[i].innerText"; //–¼‘OEƒgƒŠƒbƒv
+ var decoy=obj.parentElement ? obj.parentElement : obj;
+ if(!decoy.id.match(/^COLOR/)){
+  // ƒJƒ‰[‘I‘ð
+  var c = singleColor ? 0 : selectColor();
+  if  (c=="restart"){c=0;singleColor=true}
+  else if(c=="exit"){return;}
+  // ŒŸõ
+  var found=new Array; var l=objs.length;
+  for(var i=l;i--;){
+   var dt=objs[i].parentElement; if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
+   if(eval(target)==reg){activate(dt,c);found.unshift(dt.firstChild.innerText);}
+   else if(singleColor) {deactivate(dt)}
   }
- }
- if(!fp.hasChildNodes()){fp.style.visibility="hidden";searched=false;}
-}
-// ƒŒƒXFƒgƒOƒ‹
-function toggleResColor(dt,c){
- if(!dt){return} // for-in‚Å‘—‚ç‚ê‚é”ԍ†ˆÈŠO‚Ìobj‚È‚çI—¹
- if(c){
-  dt.rev=dt.style.backgroundColor;
-  dt.rel="colored";
-  dt.id ="COLOR"+c.replace(/#/,"");
-  dt.style.backgroundColor=c;
+  foundReturn(found);
  }else{
-  dt.style.backgroundColor=dt.rev;
-  if(dt.id.match(/COLOR/)){dt.removeAttribute("id")}//else{alert("dt‚ÉCOLOR***ˆÈŠO‚Ìidi"+dt.id+"j‚ªÝ’肳‚ê‚Ä‚¢‚Ü‚·")}
-  dt.removeAttribute("rev");
-  dt.removeAttribute("rel");
+  clearResult(obj);return;
  }
 }
-// ŒŸõŒ‹‰Ê‚ÉŠî‚«Á‹Ž
-function removeRes(dt){if(!dt){return} // cHash[i][j]=ID:xxxxxxxx‚Ì‚Æ‚«
- if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;} // Live‚Ì‚Ý-“§–¾‚ ‚ځ`‚ñ
- dt.nextSibling.removeNode(true);dt.removeNode(true);
+
+// ID•¶Žš—ñ‚Ì’Šo
+//var regID=new RegExp("ID:(.*)$");
+var regID=new RegExp(".*?\\s.*?\\s.*:(.*?)(\\s|$)"); // HOST‚â‚炵‚½‚ç‚΂à‰Â”\‚É‚µ‚Ä‚Ý‚é
+function getID(obj){
+ if(regID.test(obj.innerText)){return(RegExp.$1)}else{return(false)}
+}
+// FÝ’è
+function activate(obj,c){
+ var color=foundColor[c];
+ obj.rev=obj.style.backgroundColor;
+ obj.style.backgroundColor=color;
+ obj.id="COLOR"+c; // “¯ˆêid‚ª•¡”¶‚¶‚邪ByName‚Å‚Ídt‚Ìname‚©‚çŽæ“¾‚Å‚«‚È‚¢‚½‚ß‚â‚Þ‚È‚µ
 }
-//==========Œ‹‰Ê•\Ž¦
-// ƒŒƒX”ԍ†ƒŠƒXƒgiƒ|ƒbƒvƒAƒbƒvƒAƒ“ƒJ[‚ðŠÜ‚ށj
-function returnFound(type,color){
- var cHash=(type=="res")?foundRes:highlight;
- var nDIV="";var numArray=cHash[color[0]]; var display=new Array(["none","POP"],["inline","LST"]);
- if(searchView=="resPopup" || numArray.length>=listLimit){display=display.reverse();}
- // ƒ|ƒbƒvƒAƒbƒv
- var nTT="";for(var i=0;i<color.length;i++){nTT+='<tt style="background-color:'+color[i]+'"> '+cHash[color[i]].word+'</tt>';}
- nDIV+='<span rel="'+type+'" style="display:'+display[0][0]+'">'+nTT+'</span>';
- // ƒŠƒXƒg
- var nA="";for(var i=0;i<numArray.length;i++){nA+=addAnchor(numArray[i],numArray[i])+" "}
- nDIV+='<tt style="background-color:'+color[0]+'" style="display:'+display[1][0]+'"> '+nA+'</tt>';
- // ŒÂ”
- nDIV+='&nbsp;'+numArray.length+' ';
- var buttons='<input type="button" value="'+display[0][1]+'" onclick="changeSearchView();blur()"><input type="button" value="É" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="‰º‚ÖŒŸõ"><input type="button" value="È" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ã‚ÖŒŸõ"><input type="button" value="CLR" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä"><input type="button" value="DEL" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä">';
- fp.innerHTML+='<div id="c'+color[0]+'">'+nDIV+buttons+'</div>';
- fp.style.visibility="visible";searched=true;
+// F•œ‹A
+function deactivate(obj){if(!obj){return}
+ obj.style.backgroundColor=obj.rev;
+ if(obj.id!="sizeinfo"){obj.removeAttribute("id");}
+ obj.removeAttribute("rev");
+ obj.removeAttribute("title");
 }
-// ‘ΏۃŒƒX‚ɃWƒƒƒ“ƒv
-var markedDT;
-function moveToSearchRes(type,color){
- if(color.match(/(.*?),/)){color=RegExp.$1}
- var scope   = (event && event.srcElement.value=="È") ? false : true ;
- var numArray= (type=="res") ? foundRes[color] : highlight[color];
- if(isNaN(numArray.justMovedRes)){numArray.justMovedRes=0}
- else{
-  markedDT.style.borderColor="#999";
-  if(scope){numArray.justMovedRes++;if(numArray.justMovedRes>=numArray.length){numArray.justMovedRes--;alert("‚±‚ê‚æ‚艺‚É‚Í‚ ‚è‚Ü‚¹‚ñ")}}
-  else     {numArray.justMovedRes--;if(numArray.justMovedRes<0){numArray.justMovedRes++;alert("‚±‚ê‚æ‚èã‚É‚Í‚ ‚è‚Ü‚¹‚ñ")}}
+// ƒJƒ‰[‘I‘ð
+function selectColor(){
+ var c=0;
+ while(document.getElementById("COLOR"+c)){
+  c++;
+  if(!foundColor[c]){if(confirm("F‚ð‰Šú‰»‚µ‚Ü‚·‚©H")){return("restart")}else{return("exit")}}
  }
- markedDT=getDTfromAnc(numArray[numArray.justMovedRes]);   markedDT.style.borderColor="red";
- markedDT.scrollIntoView(true);
- setTimeout('markedDT.style.borderColor="#999"',5000);
+ return(c);
 }
-// ƒ|ƒbƒvƒAƒbƒv‚ƃŠƒXƒg•\Ž¦Ø‚è‘Ö‚¦
-function changeSearchView(){
- var e=event.srcElement;
- if(e.value=="POP"){
-  e.value="LST";
-  e.parentElement.childNodes[0].style.display="inline";
-  e.parentElement.childNodes[1].style.display="none";
+// Œ‹‰Ê•\Ž¦
+function foundReturn(found){
+ if(!fR){document.body.insertAdjacentHTML('afterBegin','<div id="foundResult"></div>');fR=document.getElementById("foundResult");}
+ //dt‚Ìtitle‚É
+ for(var i=found.length;i--;){dt=getDTfromAnc(found[i]);dt.title=found.join(" ");}
+ //foundResult‚É
+ var buttons='<input type="button" value="CLR" onclick="clearResult(this)" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä"><input type="button" value="DEL" onclick="clearResult(this)" title="Alt‰Ÿ‰ºŽž\n’…FƒŒƒX‘S‚Ä">';
+ if(found.length>=20 && confirm("20ˆÈã‚ ‚邯‚Ç•\Ž¦‚·‚éH")==false){
+  fR.innerHTML=buttons;	fR.title=found.join(" ");
  }else{
-  e.value="POP";
-  e.parentElement.childNodes[0].style.display="none";
-  e.parentElement.childNodes[1].style.display="inline";
+  for(var i=0;i<found.length;i++){found[i] = addAnchor(found[i],found[i])}
+  fR.innerHTML=found.join(" ")+buttons;
  }
+ fR.style.visibility="visible";
 }
-
-//==========’PŒêŒŸõ
-function findIt(arg){createSearchPanel(arg);}
-var searchWindow=null;
-// ŒŸõƒEƒBƒ“ƒhƒE‚Ì•\Ž¦
-function createSearchPanel(arg){ // ê—pƒuƒ‰ƒEƒU‚Å‚ÌmodelessDialog‚Ö‚ÌŠO•”“ǂݍž‚݂ł́AdialogArguments‚ª‘—‚ê‚È‚¢‚Ì‚Å’¼Ú‘‚«o‚·
- if(arg){word=arg}
- if(searchWindow && !searchWindow.closed){return}
- var skinPath=document.getElementsByName("SkinPath")[0].content;
- searchWindow=showModelessDialog("",window,'dialogWidth:500px;dialogHeight:200px;dialogTop:0px;dialogLeft:0px;help:no;resizable:yes;status:no;unadorned:yes;');
- var nWin='<html><head><title>’PŒê‚ÌŒŸõ<\/title>'
-         +'<script type="text/javascript">function submitEvent(){var fo=document.forms[0]; dialogArguments.word=fo.word.value; var i=-1;do{i++;dialogArguments.expression  =fo.expression[i].value;}while(!fo.expression[i].checked); var i=0; while(fo.searchTarget[i]){dialogArguments.searchTarget[fo.searchTarget[i].value]=fo.searchTarget[i].checked;i++;} var i=-1;do{i++;dialogArguments.searchView  =fo.searchView[i].value;}while(!fo.searchView[i].checked); dialogArguments.searchWord();}</script>'
-         +'<style type="text/css">body{background:ThreeDFace;padding:0.5em;overflow:auto} fieldset{padding:0.5em;margin-top:0.5em;} legend,label,input{font:message-box;}</style>'
-         +'<\/head><body onunload="unloadEvent()"><form onsubmit="submitEvent();return false;"><table width="100%"><tr><td valign="top" colspan="3">'
-         +'<label for="word">ŒŸõ•¶Žš—ñF</label><input type="text" name="word" id="word" size="50" value="'+word+'" tabindex="0"><br>'
-         +'</td><td align="right" valign="top" rowspan="2">'
-         +'<input type="submit" name="submit" value="@ŒŸ@õ@" tabindex="7"><br><br><input type="button" name="cancel" value="ƒLƒƒƒ“ƒZƒ‹" onclick="window.close()" tabindex="8">'
-         +'</td></tr><tr valign="top">'
-         +'<td><fieldset><legend>ŒŸõ•û–@</legend><input type="radio"    name="expression"   value="default" id="tDef" tabindex="1"> <label for="tDef">’ʏ팟õ</label><br><input type="radio" name="expression" value="regExp" id="tReg"> <label for="tReg">³‹K•\Œ»</label><br><input type="radio" name="expression" value="multiAND" id="tAND"> <label for="tAND">ANDŒŸõ</label><br><input type="radio" name="expression" value="multiOR" id="tOR"> <label for="tOR">ORŒŸõ</label></fieldset></td>'
-         +'<td><fieldset><legend>ŒŸõ‘ΏÛ</legend><input type="checkbox" name="searchTarget" value="name" id="tName" tabindex="2" checked> <label for="tName">–¼‘O</label><br><input type="checkbox" name="searchTarget" value="mail" id="tMail" tabindex="3" checked> <label for="tMail">ƒ[ƒ‹</label><br><input type="checkbox" name="searchTarget" value="id" id="tID" tabindex="4" checked> <label for="tID">“ú•t‚ÆID</label><br><input type="checkbox" name="searchTarget" value="mess" id="tMess" tabindex="5" checked> <label for="tMess">–{•¶</label></fieldset></td>'
-         +'<td><fieldset><legend>Œ‹‰Ê•\Ž¦</legend><input type="radio"    name="searchView"   value="resList" id="rList" tabindex="6"> <label for="rList">ƒŒƒX”ԍ†‚ð•\Ž¦</label><br><input type="radio" name="searchView" value="resPopup" id="rPop"> <label for="rPop">ƒŒƒX‚ðƒ|ƒbƒvƒAƒbƒv</label><br><input type="radio" name="searchView" value="resJump" id="rJump"> <label for="rJump">ƒŒƒX‚ÖƒWƒƒƒ“ƒv</label></fieldset></td>'
-         +'</tr></table></form><\/body><\/html>';
- searchWindow.document.write(nWin);
- sdf=searchWindow.document.forms[0]; sdf.elements[0].select();
- var ex=sdf.expression;for(var i=0;i<ex.length;i++){if(ex[i].value==expression){ex[i].checked=true}}
- var sv=sdf.searchView;for(var i=0;i<sv.length;i++){if(sv[i].value==searchView){sv[i].checked=true}}
- range=document.body.createTextRange();
-}
-// ŒŸõˆ—ƒƒCƒ“
-var word="";var range;var searchTarget={"word":true};
-function searchWord(){
- if(!word){return}
- var matchs=new Array(); var color=new Array();
- // ŒŸõ•û–@
- if(expression=="regExp" || expression=="default" || (expression.match(/multi/) && !word.match(/\s/))){ // AND/OR‚ňê’PŒê‚È‚çdefault‚ÅŒŸõ
-  // ŒŸõŒêŽw’èid•¡”rœ‚ō‚‘¬‰»Hj
-  if(expression=="regExp"){
-   var regWord=word.replace(/[\^\$]/g,"");
-   var reg=new RegExp(regWord,"g"); var tmpArr=range.text.match(reg); var tmp;
-   if(!tmpArr || !tmpArr.length){tmpArr=new Array(tmpArr)} // ŒŸõŒ‹‰Ê0or1‚È‚çA”z—ñì¬
-   tmpArr.sort();for(var i=0;i<tmpArr.length;i++){if(tmp!=tmpArr[i]){matchs.push(tmpArr[i])}tmp=tmpArr[i]}
-   if(!matchs || !matchs.length){matchs[0]=word} // ŒŸõŒ‹‰Ê0or1‚È‚çA”z—ñì¬
-  }else{matchs[0]=word}
-  // ƒnƒCƒ‰ƒCƒg
-  for(var i=0;i<matchs.length;i++){color.push(setHighlight(matchs[i]));}
-  highlight[color[0]].word=word;
+// Œ‹‰ÊÁ‹ŽAŒ‹‰Êíœ
+function clearResult(obj){
+ var fromObj=obj.parentElement;
+ var singleColor=event.altKey;
+ var result=new Array();var arrayElement; var numbers=fromObj.title ? fromObj.title : fromObj.innerText;
+ if(singleColor){result=dts;               arrayElement="result[i]";}
+ else           {result=numbers.split(" ");arrayElement="getDTfromAnc(result[i])";}
+ var l=result.length;
+ if(!result[0]){
+  /* ŒŸõŒ‹‰Êƒ[ƒ‚Å‚àresult‚ªnull‚É‚È‚ç‚È‚¢‘΍ô */
+ }else if(event.srcElement.value!="DEL"){
+  for(var i=l;i--;){
+   var dt=eval(arrayElement);
+   deactivate(dt);
+  }
  }else{
-  // ŒŸõŒêŽw’è
-  var matchs=word.split(" "); var tmpArr=new Array(); var tmp;
-  // ƒnƒCƒ‰ƒCƒg¨d•¡ˆ—
-  for(var i=0;i<matchs.length;i++){
-   color.unshift(setHighlight(matchs[i]));
-   highlight[color[0]].word=matchs[i];
-   tmpArr=tmpArr.concat(highlight[color[0]])
+  for(var i=l;i--;){
+   var dt=eval(arrayElement); var dd=dt.nextSibling;
+    //Live‹@”\’ljÁ - “§–¾‚ ‚ځ`‚ñ
+   if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;}
+   dt.removeNode(true); dd.removeNode(true);
   }
-  color.reverse();tmpArr.sort();createHash(highlight,color[0],"",matchs[0]); // ˆê’U‰Šú‰»
-  var judge = (expression=="multiAND") ? "tmp==tmpArr[i]" : "tmp!=tmpArr[i]";
-  for(var i=0;i<tmpArr.length;i++){if(eval(judge)){highlight[color[0]].push(tmpArr[i])}tmp=tmpArr[i]} // ŒŸõŒ‹‰Ê‚Íhighlight[color[0]]‚É“ü‚ê‚é
  }
- // Œ‹‰Ê•\Ž¦
- if     (searchView=="resList") {returnFound("search",color);searchWindow.close();}
- else if(searchView=="resPopup"){returnFound("search",color);searchWindow.close();}
- else if(searchView=="resJump") {returnFound("search",color);searchWindow.close();if(highlight[color[0]].length){moveToSearchRes("search",color.join(","))}}
+ if(fR){fR.innerText="";fR.style.visibility="hidden";}
 }
-// ƒnƒCƒ‰ƒCƒgŒŸõ
-function setHighlight(reg){
+
+//==========’PŒêŒŸõ
+function findIt(word){
+ if(!word){
+  var word = prompt("ŒŸõ‚·‚镶Žš‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢B","");
+  word = unescape(escape(word).split("%00")[0]); //IE5‚̃oƒO‘΍ô
+ }
+ if(!word || word=="null"){return}
  // ƒJƒ‰[‘I‘ð
- var c=selectColor("highlight"); if(!c){return}
+ var singleColor=event.altKey;
+ var c = singleColor ? 0 : selectColor();
+ if  (c=="restart"){c=0;singleColor=true}
+ else if(c=="exit"){return;}
  // ŒŸõ
- while(range.findText(reg)){
-  var dt=range.parentElement();var tag=dt.tagName; var thisRange;
-  // ŒŸõ‘Ώۂōi‚荞‚Ý
-  if(tag=="B"||tag=="U"){thisRange="name"}
-  else if(tag=="DT")    {thisRange="mail"}
-  else if(tag=="SPAN")  {thisRange="id"}
-  else if(tag=="DD" || tag=="A" && dt.parentElement.tagName=="DD"){thisRange="mess"}
-  else if(tag=="STRONG"){thisRange="word"}
-  else{/*alert("tagF"+tag+"\ndt:"+dt.outerHTML);*/range.collapse(false);continue;} // ƒŒƒX”ԍ†(A)‚⌟õŒ‹‰ÊŽ©‘Ì(TT)
-  if(!searchTarget[thisRange]){range.collapse(false);continue;}
-  // ³‹K•\Œ»‚̈ʒuŽw’èŽq‚ª‚ ‚éê‡A•ïŠÜ—v‘f“à•”‚ōČŸõ
-  if(expression=="regExp" && word.match(/[\^|\$]/)){
-   var thisReg=new RegExp(word); var targetText=(tag=="STRONG") ? dt.parentElement.innerText : dt.innerText;
-   if(!targetText.match(thisReg)){range.collapse(false);continue}
-  }
-  // dtŽæ“¾¨ƒŒƒX”ԍ†Žæ“¾¨ƒnƒCƒ‰ƒCƒg
-  if(dt.tagName!="DT"){
-   while(dt.tagName!="DT" && dt.tagName!="DD"){dt=dt.parentElement}
-   if(dt.tagName=="DD"){dt=dt.previousSibling}
-  }
-  var num=dt.firstChild.innerText;
-  if(dt.parentElement.className!="refResult" && num!=highlight[c][highlight[c].length-1]){highlight[c].push(num)} // ‹tŽQÆ“à‚ÌDT,“¯ˆê”ԍ†‚È‚ç‰ñ”ð
-  range.pasteHTML('<strong style="background-color:'+c+'">'+range.text+'</strong>');
-  range.collapse(false);
+ var found=new Array; var l=dds.length;
+ var bodyText=document.body.createTextRange();
+ for(var i=l;i--;){
+  var dt=dts[i]; var dd=dds[i];  if(dt.parentElement.className=="refResult"){continue} // ‹tŽQÆ“à‚ÌDT‚È‚ç‰ñ”ð
+  bodyText.moveToElementText(dt);  var checkDT=bodyText.findText(word,0);
+  bodyText.moveToElementText(dd);  var checkDD=bodyText.findText(word,0);
+  if(checkDT || checkDD){activate(dt,c);found.unshift(dt.firstChild.innerText)}
+  else if(singleColor)  {deactivate(dt);}
  }
- range=document.body.createTextRange(); // ƒŒƒ“ƒW‚ðŒ³‚É–ß‚µ‚Ä‚¨‚­
- return(c);
+ if(found){foundReturn(found)}
 }
 //==========‹tŽQÆ
 function searchRef(obj){
@@ -400,7 +245,16 @@ function searchRef(obj){
   var num=obj.firstChild.innerText;
   if(refHash[num]){
    var refArr=refHash[num].split(/\s/); var refs="";
-   for(var i=0;i<refArr.length;i++){refs+=returnString(refArr[i]);}
+   for(var i=0;i<refArr.length;i++){
+    var dtOrg=getDTfromAnc(refArr[i]); var dt=dtOrg.cloneNode(true); var dd=dtOrg.nextSibling.cloneNode(true);
+    // –{•¶ˆÈŠO‚ðíœ
+    if(dd.lastChild){
+     if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true);} //‹tŽQÆ‚̏œ‹Ž
+     if(dd.lastChild.name){dd.lastChild.removeNode(true);} // LABELNUMBER‚ª‚È‚¢‚à‚Ì‚ÉŒW‚é•s—vƒAƒ“ƒJ[‚̏œ‹Ž
+    }
+    // –{•¶‚ðŠi”[
+    refs+=dt.outerHTML.replace(/name=.*?>/,">")+dd.outerHTML.replace(/<a name=.*>/i,"");
+   }
    obj.nextSibling.insertAdjacentHTML("beforeEnd",'<dl class="refResult">'+refs+'</dl>')
    obj.name="referred";
   }
@@ -428,26 +282,9 @@ function getDTfromAnc(num){
  var anc=ancs(anchorHead+num);
  if(!anc){return("")} //LABELNUMBER‘Ήž‚Ì‚ ‚ځ`‚ñŽá‚µ‚­‚Í–¢o”ԍ†‚È‚çI—¹
  var obj=anc.parentElement; //LABELNUMBER‘Ήž‚Ì‚à‚Ì
- if(!obj || !obj.tagName){return false;}
  if(obj.tagName!="DT"){ //LABELNUMBER”ñ‘Ήž‚Ì‚à‚Ì
   if(num==1){if(anc){obj=anc.nextSibling}                           else{return("")}}
   else      {if(!anc.nextSibling){obj=anc.parentElement.nextSibling}else{return("")}}
  }
  return(obj);
-}
-
-// ‰æ‘œ”Š֘A
-var regIMG=new RegExp(".*?\\s.*?\\s.*:.*?\\sIMG:(.*?)(\\s|$)"); // ‰æ‘œ‚à‰Â”\‚É‚µ‚Ä‚Ý‚é
-function getIMG(obj){
- if(regIMG.test(obj.innerText)){
-  var filename=RegExp.$1;
-  var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
-  var today=new Date();var last=new Date(today-7*24*60*60*1000);var date="";
-  date+=last.getMonth()<9 ? "0"+(last.getMonth()+1) : last.getMonth()+1;
-  date+=last.getDate()<10 ? "0"+last.getDate()      : last.getDate();
-  var log= (RegExp.$1+""+RegExp.$2 < last.getYear()+""+date) ? "_kako/" : "_img/";
-  var fileurl="http://up01.2ch.io/"+log+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
-  return(fileurl)
- }else{return(false)}
-}
-
+}
\ No newline at end of file