Commit: f1a8b40c81fb7cda5bb9ec10f0d5a24a5828520c - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: f1a8b40c81fb7cda5bb9ec10f0d5a24a5828520c (tree)
• Time: 2004-10-03 03:37:51
• Author: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Editor.pas
• modified: ExternalBoardPlugInMain.pas
• modified: Favorite.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoSystem.pas
• modified: GikoXMLDoc.pas
• modified: ItemDownload.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Setting.pas
• modified: Sort.pas
• modified: YofUtils.pas
• modified: gikoNavi.res
• modified: readme/readme.txt
• modified: res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
• modified: res/skin/skin30-2G/Header.html
• modified: res/skin/skin30-2G/chie_event.js
• 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_event.js
• modified: res/skin/skin30-3G/chie_popup.js
• modified: res/skin/skin30-3G/chie_search.js

Incremental Difference

--- a/Editor.pas
+++ b/Editor.pas
@@ -410,11 +410,8 @@ end;
 
 function TEditorForm.GetBody : string;
 var
-	body, tmp		: string;
-	p, tail			: PChar;
-	len					: Integer;
-const
-	TAB_LENGTH	= 4;
+	body		: string;
+	regexp	: TAWKStr;
 begin
 
 	body := BodyEdit.Text;
@@ -422,65 +419,16 @@ begin
 		// & ‚Ì’uŠ·‚͈ê”ԍŏ‰‚É‚â‚邱‚Æ
 		body := CustomStringReplace( body, '&', '&' );
 	if SpaceToNBSPAction.Checked then begin
-		p			:= PChar( body );
-		tail	:= p + Length( body );
-		len		:= 0;
-		while p < tail do begin
-			case p^ of
-			#09:
-				begin
-					Inc( p );
-					repeat
-						Inc( len );
-						tmp := tmp + '&nbsp;';
-					until (len mod TAB_LENGTH) = 0;
-				end;
-
-			#10, #13:
-				begin
-					tmp := tmp + p^;	Inc( p );
-					len	:= 0;
-				end;
-
-			' ':
-				begin
-					tmp	:= tmp + '&nbsp;';
-					Inc( p );
-					Inc( len );
-				end;
-				
-			'&':
-				// ŽÀ‘ÌŽQÆ‚Í 1 •¶Žš•ª
-				begin
-					tmp := tmp + '&';
-					Inc( p );
-					Inc( len );
-					while p < tail do begin
-						if p^ in ['a'..'z', 'A'..'Z', '0'..'9', '#'] then begin
-							tmp := tmp + p^;
-						end else if p^ = ';' then begin
-							tmp := tmp + p^;
-							Inc( p );
-							Break;
-						end else begin
-							Break;
-						end;
-						Inc( p );
-					end;
-				end;
-
-			else
-				if p^ in kYofKanji then begin
-					tmp := tmp + p^;	Inc( p );
-					tmp	:= tmp + p^;	Inc( p );
-					len	:= len + 2;
-				end else begin
-					tmp := tmp + p^;	Inc( p );
-					Inc( len );
-				end;
-			end;
+		body := CustomStringReplace( body, #09, '&nbsp;&nbsp;&nbsp;&nbsp;' );
+		body := CustomStringReplace( body, '  ', '&nbsp;&nbsp;' );
+		body := CustomStringReplace( body, '&nbsp; ', '&nbsp;&nbsp;' );
+		regexp := TAWKStr.Create( nil );
+		try
+			regexp.RegExp := '^ ';
+			regexp.GSub( '\&nbsp;', body );
+		finally
+			regexp.Free;
 		end;
-		body := tmp;
 	end;
 
 	Result	:= body;
@@ -1666,6 +1614,7 @@ procedure TEditorForm.GetTitlePictureActionExecute(Sender: TObject);
 var
 	memStream: TMemoryStream;
 	tmpBoard: TBoard;
+	tmp : string;
 begin
 	InitIdHTTP(Indy);
 	memStream := TMemoryStream.Create;

--- a/ExternalBoardPlugInMain.pas
+++ b/ExternalBoardPlugInMain.pas
@@ -229,8 +229,7 @@ var
 //	httpSocket				: TIdHTTP;
 	resStream					: TMemoryStream;
 	content						: string;
-const
-	LIVEDOOR_URL = 'http://jbbs.livedoor.jp/';
+
 begin
 
 	{$IFDEF DEBUG}
@@ -271,8 +270,7 @@ begin
 				Result := socket.ResponseCode;
 				if (Length( content ) = 0) and (Result = 206) then
 					Result := 304;
-                //‚µ‚½‚ç‚ÎJBBS‚̓wƒbƒ_‚ɃGƒ‰[î•ñ‚ªÚ‚é‚炵‚¢‚̂ŁA‚±‚±‚Ń`ƒFƒbƒN
-				if ( AnsiPos(LIVEDOOR_URL, inURL) > 0 ) and (Result = 200) then begin
+				if ( AnsiPos('http://jbbs.livedoor.com/', inURL) > 0 ) and (Result = 200) then begin
 					if( AnsiPos('STORAGE IN', socket.Response.RawHeaders.Text) > 0 ) then begin
 						Result := 302;
 					end;

--- a/Favorite.pas
+++ b/Favorite.pas
@@ -117,50 +117,13 @@ function	TFavoriteBoardItem.GetItem : TBoard;
 var
 	protocol, host, path, document, port, bookmark : string;
 	BBSID{, BBSKey}	: string;
-	tmpURL, boardURL		: string;
+	tmpURL				: string;
 //	category : TCategory;
-	i, bi: Integer;
-	tmpThread: TThreadItem;
-	tmpBoard: TBoard;
 begin
 
 	if FItem = nil then begin
 		FItem := BBSsFindBoardFromURL( URL );
 		if FItem = nil then begin
-			//===== ƒvƒ‰ƒOƒCƒ“
-			try
-				//ì‹Æ’†//
-				bi := High( BoardPlugIns );
-				for i := Low( BoardPlugIns ) to bi do begin
-					if Assigned( Pointer( BoardPlugIns[ i ].Module ) ) then begin
-						case BoardPlugIns[ i ].AcceptURL( URL ) of
-						atThread:
-							begin
-								tmpThread		:= TThreadItem.Create( BoardPlugIns[ i ], URL );
-								boardURL		:= tmpThread.BoardPlugIn.GetBoardURL( DWORD( tmpThread ) );
-								FItem				:= BBSsFindBoardFromURL( boardURL );
-								URL := FItem.URL;
-								tmpThread.Free;
-								break;
-							end;
-						atBoard:
-							begin
-								tmpBoard := TBoard.Create(BoardPlugIns[ i ], URL);
-								FItem := BBSsFindBoardFromURL( tmpBoard.URL );
-								tmpBoard.Free;
-								if FItem <> nil then begin
-									URL := FItem.URL;
-								end;
-								break;
-							end;
-						end;
-					end;
-				end;
-			except
-				// exception ‚ª”­¶‚µ‚½ê‡‚Í“à•”ˆ—‚É”C‚¹‚½‚¢‚Ì‚Å‚±‚±‚ł͉½‚à‚µ‚È‚¢
-			end;
-		end;
-		if FItem = nil then begin
 			tmpURL := URL;
 			GikoSys.ParseURI( tmpURL, protocol, host, path, document, port, bookmark );
 			if GikoSys.Is2chHost( host ) then begin

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,11 +1,11 @@
 object GikoForm: TGikoForm
-  Left = 246
-  Top = 188
+  Left = 468
+  Top = 21
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
   Caption = '-'
-  ClientHeight = 404
+  ClientHeight = 545
   ClientWidth = 854
   Color = clBtnFace
   Font.Charset = SHIFTJIS_CHARSET
@@ -27,7 +27,7 @@ object GikoForm: TGikoForm
   TextHeight = 12
   object StatusBar: TStatusBar
     Left = 0
-    Top = 384
+    Top = 525
     Width = 854
     Height = 20
     Panels = <
@@ -47,13 +47,13 @@ object GikoForm: TGikoForm
     Left = 0
     Top = 77
     Width = 854
-    Height = 307
+    Height = 448
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 1
     object MessageSplitter: TSplitter
       Left = 0
-      Top = 268
+      Top = 409
       Width = 854
       Height = 5
       Cursor = crVSplit
@@ -66,7 +66,7 @@ object GikoForm: TGikoForm
       Left = 0
       Top = 0
       Width = 854
-      Height = 268
+      Height = 409
       Align = alClient
       BevelOuter = bvNone
       TabOrder = 0
@@ -74,7 +74,7 @@ object GikoForm: TGikoForm
         Left = 145
         Top = 0
         Width = 5
-        Height = 268
+        Height = 409
         Cursor = crHSplit
         AutoSnap = False
         ResizeStyle = rsUpdate
@@ -83,7 +83,7 @@ object GikoForm: TGikoForm
         Left = 0
         Top = 0
         Width = 145
-        Height = 268
+        Height = 409
         Align = alLeft
         BevelOuter = bvNone
         TabOrder = 0
@@ -270,7 +270,7 @@ object GikoForm: TGikoForm
         Left = 150
         Top = 0
         Width = 704
-        Height = 268
+        Height = 409
         Align = alClient
         BevelOuter = bvNone
         TabOrder = 1
@@ -548,7 +548,7 @@ object GikoForm: TGikoForm
           Left = 0
           Top = 194
           Width = 704
-          Height = 74
+          Height = 215
           Align = alClient
           BevelOuter = bvNone
           TabOrder = 1
@@ -556,7 +556,7 @@ object GikoForm: TGikoForm
             Left = 0
             Top = 46
             Width = 704
-            Height = 8
+            Height = 149
             Align = alClient
             BevelOuter = bvNone
             UseDockManager = False
@@ -566,7 +566,7 @@ object GikoForm: TGikoForm
               Left = 0
               Top = 0
               Width = 704
-              Height = 8
+              Height = 149
               Align = alClient
               TabOrder = 0
               OnEnter = BrowserEnter
@@ -575,7 +575,7 @@ object GikoForm: TGikoForm
               OnNewWindow2 = BrowserNewWindow2
               OnDocumentComplete = BrowserDocumentComplete
               ControlData = {
-                4C000000C3480000D40000000000000000000000000000000000000000000000
+                4C000000C3480000660F00000000000000000000000000000000000000000000
                 000000004C000000000000000000000001000000E0D057007335CF11AE690800
                 2B2E12620A000000000000004C0000000114020000000000C000000000000046
                 8000000000000000000000000000000000000000000000000000000000000000
@@ -584,7 +584,7 @@ object GikoForm: TGikoForm
           end
           object BrowserBottomPanel: TGikoPanel
             Left = 0
-            Top = 54
+            Top = 195
             Width = 704
             Height = 20
             Align = alBottom
@@ -862,7 +862,7 @@ object GikoForm: TGikoForm
     end
     object MessagePanel: TPanel
       Left = 0
-      Top = 273
+      Top = 414
       Width = 854
       Height = 34
       Align = alBottom
@@ -6009,7 +6009,7 @@ object GikoForm: TGikoForm
   end
   object ActionList: TActionList
     Images = ToobarImageList
-    Left = 5
+    Left = 8
     Top = 372
     object OnlyAHundredResAction: TAction
       Category = #12473#12524#12483#12489
@@ -7073,12 +7073,6 @@ object GikoForm: TGikoForm
       OnExecute = JumpToNumOfResActionExecute
       OnUpdate = JumpToNumOfResActionUpdate
     end
-    object FavoriteTreeViewCollapseAction: TAction
-      Category = #12362#27671#12395#20837#12426
-      Caption = #12362#27671#12395#20837#12426#12484#12522#12540#12434#12377#12409#12390#38281#12376#12427
-      Hint = #12362#27671#12395#20837#12426#12484#12522#12540#12434#12377#12409#12390#38281#12376#12427
-      OnExecute = FavoriteTreeViewCollapseActionExecute
-    end
   end
   object BrowserPopupMenu: TPopupMenu
     Left = 68

--- a/Giko.pas
+++ b/Giko.pas
@@ -578,7 +578,6 @@ type
     TabAutoLoadAction: TAction;
     ListColumnPopupMenu: TPopupMenu;
     JumpToNumOfResAction: TAction;
-    FavoriteTreeViewCollapseAction: TAction;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure CabinetPanelHide(Sender: TObject);
@@ -930,7 +929,6 @@ type
       Column: TListColumn; Point: TPoint);
     procedure JumpToNumOfResActionExecute(Sender: TObject);
     procedure JumpToNumOfResActionUpdate(Sender: TObject);
-    procedure FavoriteTreeViewCollapseActionExecute(Sender: TObject);
 	private
 		{ Private éŒ¾ }
         //RoundList : TRoundList;
@@ -1008,7 +1006,7 @@ type
 		procedure WorkEnd(Sender: TObject; AWorkMode: TWorkMode; Number: Integer);
 		procedure Work(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer; Number: Integer);
 
-
+		procedure SetActiveList(Obj: TObject);
 		procedure ListClick;
 		procedure ListDoubleClick(Shift: TShiftState);
 		procedure BrowserMovement(const AName: string); overload;
@@ -1090,6 +1088,8 @@ type
 		function LoadTabURLs : Boolean;
 		/// ƒoƒ“ƒh•‚ðÄŒvŽZEÄÝ’è‚·‚é
 		procedure ResetBandInfo( bar : TGikoCoolBar; band : TToolBar );
+		/// ListView ‚̃Jƒ‰ƒ€•‚¨‚æ‚шʒu‚Ì•Û‘¶
+		procedure ActiveListColumnSave;
 		/// ListView ‚Ì Column ‚ð^‚̃Jƒ‰ƒ€‚É•ÏŠ·
 		function	ActiveListTrueColumn( column : TListColumn ) : TListColumn;
 		/// ListColumnPopupMenu ƒAƒCƒeƒ€‚̃NƒŠƒbƒNƒCƒxƒ“ƒg
@@ -1105,11 +1105,8 @@ type
 		{ Public éŒ¾ }
 //		FDownload: TDownload;
 		FControlThread: TThreadControl;
-		procedure MoveToURL(const inURL: string);
-		function InsertBrowserTab(
-			ThreadItem	: TThreadItem;
-			ActiveTab		: Boolean = True
-		) : TBrowserRecord;
+		procedure MoveToURL(URL: string);
+		procedure InsertBrowserTab(ThreadItem: TThreadItem; ActiveTab: Boolean = True);
 		procedure ReloadBBS;
 		function GetHttpState: Boolean;
 		procedure SetEnabledCloseButton(Enabled: Boolean);
@@ -1129,7 +1126,7 @@ type
 		function GetActiveContent: TThreadItem;
 		function GetActiveList: TObject;
 
-
+		property ActiveList: TObject read GetActiveList write SetActiveList;
 //		property LastRoundTime: TDateTime read FLastRoundTime write FLastRoundTime;
 
 		procedure SetListViewType(AViewType: TGikoViewType); overload;
@@ -1153,19 +1150,16 @@ type
 //		property Favorite: TFavorite read FFavorite write FFavorite;
 		procedure SetToolBarPopup;
 		procedure ShowFavoriteAddDialog( Item : TObject );
-		procedure FavoritesURLReplace(oldURLs: TStringList; newURLs: TStringList);
-		procedure RoundListURLReplace(oldURLs: TStringList; newURLs: TStringList);
+        procedure FavoritesURLReplace(oldURLs: TStringList; newURLs: TStringList);
+        procedure RoundListURLReplace(oldURLs: TStringList; newURLs: TStringList);
 		property ListViewBackGroundColor: TColor read FListViewBackGroundColor write SetListViewBackGroundColor;
 		property UseOddResOddColor : Boolean read FUseOddResOddColor write FUseOddResOddColor;
 		property OddColor : TColor read FOddColor write FOddColor;
 
 		function FindToolBarButton( bar : TToolBar; action : TAction ) : TToolButton;
 		procedure OnPlugInMenuItem( Sender : TObject );
-		procedure TabFileURLReplace(oldURLs: TStringList; newURLs: TStringList);
-		/// ListView ‚̃Jƒ‰ƒ€•‚¨‚æ‚шʒu‚Ì•Û‘¶ KuroutSetting‚©‚ç‚æ‚Ñ‚¾‚µ‚½‚¢‚Ì‚Å
-		procedure ActiveListColumnSave;
-		procedure SetActiveList(Obj: TObject);
-		property ActiveList: TObject read GetActiveList write SetActiveList;
+                procedure TabFileURLReplace(oldURLs: TStringList; newURLs: TStringList);
+
 	published
 		property EnabledCloseButton: Boolean read FEnabledCloseButton write SetEnabledCloseButton;
 	end;
@@ -1194,18 +1188,18 @@ type
 	TBrowserRecord = class( TObject )
 	private
 		FBrowser	: TWebBrowser;
-		FEvent: THTMLDocumentEventSink;	//!< ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
+		FEvent: THTMLDocumentEventSink;//ƒuƒ‰ƒEƒUƒhƒLƒ…ƒƒ“ƒgƒCƒxƒ“ƒg
 		FThread		: TThreadItem;
 		FLastSize	: Integer;
 		FRepaint	: Boolean;
-		FMovement	: string;							//!< ƒXƒNƒ[ƒ‹æƒAƒ“ƒJ[
+ //		FOnlyHundred: Boolean;
 	public
 		destructor	Destroy; override;
 		property	Browser	: TWebBrowser	read FBrowser	write FBrowser;
 		property	Thread	: TThreadItem	read FThread	write FThread;
 		property	LastSize	: Integer		read FLastSize	write FLastSize;
 		property	Repaint		: Boolean		read FRepaint	write FRepaint;
-		property	Movement	: string		read FMovement	write FMovement;
+//		property	OnlyHundred : Boolean		read FOnlyHundred write FOnlyHundred;
 	end;
 
 var
@@ -1266,7 +1260,6 @@ const
 	USER_RESIZED            = WM_USER + 2001;
 	USER_MINIMIZED					= WM_USER + 2002;
 	USER_SETLINKBAR					= WM_USER + 2003;
-	USER_DOCUMENTCOMPLETE		= WM_USER + 2004;	///< wParam : TWebBrowser
 	SELECTTIME_INTERBAL				= 110;
 
 	BROWSER_COUNT		= 5;	//ƒuƒ‰ƒEƒU‚̐”
@@ -1721,7 +1714,7 @@ begin
 	//Samba24‚̃tƒ@ƒCƒ‹ƒ`ƒFƒbƒN
 	GikoSys.SambaFileExists();
 
-        //‚É‚¿‚á‚ñŒêƒtƒ@ƒCƒ‹“ǂݏo‚µ
+        //ƒ^ƒuŽ©“®“ǂݍž‚Ý (AV”­¶‚Ì‚½‚߈ꎞ••ˆó)
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1885,12 +1878,6 @@ begin
 		if GikoSys.Setting.TabAutoLoadSave then begin
 			TabAutoLoadAction.Execute;
 		end;
-                //‚É‚¿‚á‚ñŒêˆÄ“àƒTƒ|[ƒg‹@”\
-                if GikoSys.Setting.GengoSupport then begin
-                //—\’è’n
-                //TestŒü‚¯
-                end;
-
 		FStartUp := true;
 	end;
 end;
@@ -2687,25 +2674,17 @@ begin
 					else
 						Item.SubItems[ idx ] := '';
 
-				gbcRoundDate://gbcLastModified:
-					if (ThreadItem.RoundDate = ZERO_DATE)  then begin
+				gbcLastModified:
+					if (ThreadItem.LastModified = ZERO_DATE)  then begin
 						Item.SubItems[ idx ] := '';
 					end else
-						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.RoundDate);
+						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.LastModified);
 
 				gbcCreated:
 					if ThreadItem.CreateDate = ZERO_DATE then begin
 						Item.SubItems[ idx ] := '';
 					end else
 						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.CreateDate);
-
-				gbcLastModified:
-					if (ThreadItem.LastModified = ZERO_DATE)  then begin
-						Item.SubItems[ idx ] := '';
-					end else
-						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.LastModified);
-
-
 				end;
 				Inc( idx );
 			end;
@@ -2726,7 +2705,7 @@ begin
 				gbcAllCount:
 					Item.SubItems[ idx ] := IntToStr(ThreadItem.AllResCount);
 
-				gbcRoundDate://gbcLastModified:
+				gbcLastModified:
 					Item.SubItems[ idx ] := '';
 
 				gbcCreated:
@@ -2734,10 +2713,6 @@ begin
 						Item.SubItems[ idx ] := '';
 					end else
 						Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', ThreadItem.CreateDate);
-
-				gbcLastModified:
-					Item.SubItems[ idx ] := '';
-
 				else
 					Item.SubItems[ idx ] := '';
 				end;
@@ -2794,7 +2769,7 @@ var
 	ActiveFileName: string;
 	e: IHTMLElement;
 	Ext: string;
-	buf, buf2: string;
+	buf: string;
 	PathRec: TPathRec;
 begin
 	if not( TObject(Sender) is TWebBrowser )then
@@ -2877,43 +2852,30 @@ begin
 		end else begin
 			threadItem := GetActiveContent;
 			if Pos('about:blank..', Text) = 1 then begin
-				wkInt := LastDelimiter( '/', threadItem.URL );
-				if Pos( '?', Copy( threadItem.URL, wkInt, MaxInt ) ) = 0 then begin
-					// Thread.URL ‚Í PATH_INFO “n‚µ
-					URL := Copy( threadItem.URL, 1,  LastDelimiter( '/', threadItem.URL ) );
-					wkInt := LastDelimiter( '/', Text );
-					if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then
-						// Text ‚à PATH_INFO “n‚µ
-						URL := URL + Copy( Text, LastDelimiter( '/', Text ) + 1, MaxInt )
-					else
-						// Text ‚Í QUERY_STRING “n‚µ
-						URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt );
+				  if (AnsiPos('http://jbbs.livedoor.com/', threadItem.URL) <> 0) then begin
+					URL := Copy(threadItem.URL, 1,  LastDelimiter('/',threadItem.URL));
+					Gikosys.GetPopupResNumber(Text,PathRec.FSt,PathRec.FTo);
+					if ( PathRec.FSt <> 0 ) and ( PathRec.FTo <> 0 ) then
+						buf := IntToStr(PathRec.FSt) + '-' + IntToStr(PathRec.FTo)
+					else if( PathRec.FSt <> 0 ) then
+						buf := IntToStr(PathRec.FSt);
+				end else if AnsiPos('machi.to/bbs/', threadItem.URL) <> 0 then begin
+					URL := threaditem.URL;
+					buf := Copy(Text,AnsiPos('&st=',Text),Length(Text)-AnsiPos('&st=',Text) + 1);
 				end else begin
-					// Thread.URL ‚Í QUERY_STRING “n‚µ
-					URL := Copy( threadItem.URL, 1,  LastDelimiter( '?', threadItem.URL ) );
-					wkInt := LastDelimiter( '/', Text );
-					if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin
-						// Text ‚Í PATH_INFO “n‚µ
-						// URL ‚ɔ‚ƃL[‚ª‘«‚ç‚È‚¢‚Ì‚Å Text ‚©‚ç’¸‘Õ‚·‚é
-						wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) );
-						wkInt := LastDelimiter( '/', Copy( Text, 1, wkInt - 1 ) );
-						URL := Copy( URL, 1, Length( URL ) - 1 ) + Copy( Text, wkInt, MaxInt );
-					end else begin
-						// Text ‚à QUERY_STRING “n‚µ
-						URL := URL + Copy( Text, LastDelimiter( '?', Text ) + 1, MaxInt )
-					end;
+					URL := Copy(threadItem.URL, 1,  LastDelimiter('/',threadItem.URL));
+					buf := Copy(Text,LastDelimiter('/',Text)+1,Length(Text)-LastDelimiter('/',Text));
 				end;
+				URL := URL + buf;
 			end else begin
 				URL := Text;
 			end;
-
 			PathRec := Gikosys.Parse2chURL2(URL);
 			if (PathRec.FNoParam) then begin
 				PathRec.FSt := 1;
 				PathRec.FTo := 1;
-			end else begin
+			end else
 				Gikosys.GetPopupResNumber(URL,PathRec.FSt,PathRec.FTo);
-			end;
 			GikoSys.ParseURI( URL, Protocol, Host, Path, Document, Port, Bookmark );
 
 			if PathRec.FDone or (not GikoSys.Is2chHost( Host )) then begin
@@ -2940,10 +2902,10 @@ begin
 				//	wkIntTo := 1;
 				//if PathRec.FFirst then
 				//	wkIntSt := 1;
-				//if PathRec.FStBegin then //http://````/-50‚Æ‚¢‚¤‚Æ‚«
-				//	wkIntSt := 1;          //
-				//if PathRec.FToEnd then   //http://````/50-‚Æ‚¢‚¤‚Æ‚«
-				//	wkIntTo := 9999;       // ‚Ç‚¿‚ç‚̏ꍇ‚àAGetPopupResNumber‚Å‚¤‚Ü‚­”ԍ†‚𒲐®‚·‚é‚̂łӂ悤B
+				if PathRec.FStBegin then
+					wkIntSt := 1;
+				if PathRec.FToEnd then
+					wkIntTo := 9999;
 
 				//ATitle := ActiveFileName <> PathRec.FKey;
 				if (FActiveContent <> nil) and (FActiveContent.Thread.URL = URL) then
@@ -3015,6 +2977,7 @@ procedure TGikoForm.ListViewKeyDown(Sender: TObject; var Key: Word;
 	Shift: TShiftState);
 var
 	pos 	: TPoint;
+	rect	: TRect;
 begin
 	if GetActiveList is TBoard then begin
 		case Key of
@@ -3067,11 +3030,9 @@ Delphi 6 Personal 
 ³‚µ‚¢ƒJƒ‰ƒ€‚ª“n‚³‚ê‚È‚¢‚½‚߁A³‚µ‚¢ƒJƒ‰ƒ€‚É•ÏŠ·‚µ‚Ü‚·B
 *}
 function	TGikoForm.ActiveListTrueColumn( column : TListColumn ) : TListColumn;
-{*
 var
 	i, idx		: Integer;
 	orderList	: TList;
-*}
 begin
 
 	// ³‚µ‚­•ÏŠ·‚·‚é•û–@‚ª•ª‚©‚ç‚È‚¢‚Ì‚Å•Û—¯
@@ -3185,8 +3146,6 @@ begin
 		GikoSys.Setting.BoardSortIndex := id;
 		GikoSys.Setting.BoardSortOrder := FSortOrder;
 		wkBoard.CustomSort(ThreadItemSortProc);
-	end else begin
-		id := 0;
 	end;
 
 	ListView.Refresh;
@@ -3459,7 +3418,6 @@ var
 	s: string;
 	boardPlugIn : TBoardPlugIn;
 	i: Integer;
-	browserRec	: TBrowserRecord;
 begin
 	try
 		if Item.DownType = gdtBoard then
@@ -3494,27 +3452,21 @@ begin
 					ATitle := GikoSys.DivideStrLine(GikoSys.ReadThreadFile(Item.ThreadItem.GetThreadFileName, 1)).FTitle;
 				end;
 				for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
-					if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = Item.ThreadItem then begin
+					if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = Item.ThreadItem then
 						TBrowserRecord(BrowserTab.Tabs.Objects[i]).Repaint := true;
-						break;
-					end;
 				end;
 				if GikoSys.Setting.BrowserTabVisible then begin
 					if GetActiveContent = Item.ThreadItem then
-						browserRec := InsertBrowserTab(Item.ThreadItem)
+						InsertBrowserTab(Item.ThreadItem)
 					else if (ListView.Selected <> nil ) and ( TObject(ListView.Selected.Data) is TThreadItem ) and ( Item.ThreadItem = TThreadItem(ListView.Selected.Data)) then
-						browserRec := InsertBrowserTab(Item.ThreadItem, True)
+						InsertBrowserTab(Item.ThreadItem, True)
 					else
-						browserRec := InsertBrowserTab(Item.ThreadItem, False);
-					if browserRec.Thread = BrowserNullTab.Thread then begin
-						browserRec.Movement := BrowserNullTab.Movement;
-						BrowserNullTab.Movement := '';
-					end;
+						InsertBrowserTab(Item.ThreadItem, False);
 				end else begin
 					if (GetActiveContent = Item.ThreadItem) or (FActiveContent = nil) or(FActiveContent.Browser = BrowserNullTab.Browser) then
                     	InsertBrowserTab(Item.ThreadItem);
 				end;
-                Application.ProcessMessages;
+
 				if Item.State = gdsComplete then begin
 					PlaySound('New');
 					AddMessageList(ATitle + ' [ƒXƒŒŽæ“¾Š®—¹]', nil, gmiOK);
@@ -3642,17 +3594,14 @@ begin
 	end;
 end;}
 
-function TGikoForm.InsertBrowserTab(
-	ThreadItem	: TThreadItem;
-	ActiveTab		: Boolean = True
-) : TBrowserRecord;
+procedure TGikoForm.InsertBrowserTab(ThreadItem: TThreadItem; ActiveTab: Boolean = True);
+
 var
-	i, j, idx		: Integer;
-	favItem			: TFavoriteThreadItem;
+	i, j, idx: Integer;
+	favItem : TFavoriteThreadItem;
 	newBrowser	: TBrowserRecord;
 begin
 
-	Result := nil;
 	if Threaditem = nil then Exit;
 
 	if ThreadItem.IsLogFile then begin
@@ -3671,7 +3620,6 @@ begin
 		for i := 0 to BrowserTab.Tabs.Count - 1 do begin
 			if TObject(BrowserTab.Tabs.Objects[i]) is TBrowserRecord then begin
 				if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin
-					Result := TBrowserRecord( BrowserTab.Tabs.Objects[i] );
 					if TBrowserRecord(BrowserTab.Tabs.Objects[i]).FBrowser = nil then begin
 						for j := BrowserTab.Tabs.Count - 1 downto 0 do begin
 							if TBrowserRecord(BrowserTab.Tabs.Objects[j]).FBrowser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin
@@ -3758,7 +3706,6 @@ begin
 					BrowserTab.TabIndex := i;
 			end;
 		end;
-		Result := newBrowser;
 		if(ActiveTab) or (idx = -1) then begin
 			BrowserTab.OnChange(nil);
 		end;
@@ -3768,7 +3715,6 @@ begin
 			BrowserNullTab.Browser := Browser;
 		end;
 		BrowserNullTab.thread := ThreadItem;
-		Result := BrowserNullTab;
 		BrowserTab.TabIndex := -1;
 		SetContent(BrowserNullTab);
 	end;
@@ -3788,6 +3734,7 @@ var
 	s: string;
 //	OldCursor: TCursor;
 	i: Integer;
+	url: OleVariant;
 	idx: Integer;
 	ThreadItem: TThreadItem;
 	Thread: TBrowserRecord;
@@ -3795,7 +3742,6 @@ var
 	ThreadScrollTop: Integer;
 	ThreadIsLog, ThreadUnRead, ThreadNewArraical: boolean;
 begin
-//	AddMessageList('SetContent', nil, gmiWhat);
 	Thread := inThread;
 	idx := BrowserTab.TabIndex;
 	if (FActiveContent <> nil) and
@@ -3859,13 +3805,11 @@ begin
 
 
 	try
-		{
 		if ThreadItem.UnRead then begin
 			ThreadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead - 1;
 			if ThreadItem.ParentBoard.UnRead < 0 then ThreadItem.ParentBoard.UnRead := 0;
 			TreeView.Refresh;
 		end;
-        }
 		if(FActiveContent <> nil) and (FActiveContent <> Thread) then begin
 			if (FActiveContent.Browser <> BrowserNullTab.Browser) then
 				ShowWindow(FActiveContent.Browser.Handle, SW_HIDE);
@@ -3898,21 +3842,55 @@ begin
 			Self.Caption := CAPTION_NAME + ' - [' + ThreadTitle + ']';
 			//Thread.Repaint‚́AƒXƒLƒ““™‚̐ݒè‚ð•ÏX‚µ‚½‚Æ‚«AThread‚ðƒ_ƒEƒ“ƒ[ƒh‚µ‚½‚Æ‚«
 			//V‹K‚ÉThread‚ðŠJ‚¢‚½‚Æ‚«‚ɐ^‚É‚È‚Á‚Ä‚¢‚éB
+//			if(Thread.Repaint) or (Thread.OnlyHundred <> GikoSys.OnlyAHundredRes)then begin
 			if Thread.Repaint then begin
 				//Thread.LastSize := ThreadItem.Size;
 				Thread.Repaint := false;
-
-				Thread.Browser.OnStatusTextChange := nil;
-				doc := Idispatch( olevariant(Thread.Browser.ControlInterface).Document) as IHTMLDocument2;
-				GikoSys.CreateHTML2(doc, ThreadItem, sTitle);
-				Thread.Browser.OnStatusTextChange := BrowserStatusTextChange;
-				PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( Thread.Browser ), 0 );
-				if ThreadItem = nil then begin
-					FActiveContent := nil;
-					BrowserTab.Repaint;
-					Exit;
+				try
+					Thread.Browser.OnStatusTextChange := nil;
+					doc := Idispatch( olevariant(Thread.Browser.ControlInterface).Document) as IHTMLDocument2;
+					GikoSys.CreateHTML2(doc, ThreadItem, sTitle);
+
+			//		if (Assigned(Thread.Browser)) and (Thread.Browser <> nil) then
+					Thread.Browser.OnStatusTextChange := BrowserStatusTextChange;
+					//‚È‚º‚©‚±‚±‚Å–¾Ž¦“I‚ÉDocumentComplete‚ðŒÄ‚΂Ȃ¢‚Æ‚¤‚Ü‚­‚¢‚©‚È‚¢
+					//’Ç‹L@200406/19
+					//Visible‚Ì‚Æ‚«‚µ‚©DocumentComplete‚͌Ă΂ê‚È‚¢‚炵‚¢
+					Thread.FBrowser.OnDocumentComplete(Thread.FBrowser, Thread.FBrowser.Parent, url);
+//					Thread.OnlyHundred := GikoSys.OnlyAHundredRes;
+					Application.ProcessMessages;
+					//‚±‚±‚ÅApplication.ProcessMessages‚ðŒÄ‚Ô‚±‚Æ‚É‚æ‚Á‚ÄWebBrowser‚ðXV‚³‚¹‚éB
+					//‘Š‚µ‚È‚¢‚ƈê‰æ–Ê•ª‚µ‚©•`‰æ‚Å‚«‚Ä‚È‚¢‚Ì‚Å‚»‚êˆÈã‚̃XƒNƒ[ƒ‹—Ê‚ðŽw’肵‚Ä‚à–³Œø‚É‚È‚é
+					//@by‚à‚¶‚ã(2004/01/20)
+					try
+						//if (Assigned(Thread)) and (Assigned(ThreadItem))then begin
+							if(Thread <> nil) and (ThreadItem <>nil) then begin
+								if ThreadUnRead then
+									BrowserMovement('new', Thread)
+								else if ThreadScrollTop <> 0 then begin
+									try
+										doc.Body.ScrollTop := ThreadScrollTop;
+									except
+										on E: Exception do
+											MsgBox(Handle, E.Message, 'SetContent[ScrollTop<-]', 0);
+									end;
+								end;
+						//	end;
+						end else begin
+							FActiveContent := nil;
+							BrowserTab.Repaint;
+							Exit;
+						end;
+					except
+						FActiveContent := nil;
+						BrowserTab.Repaint;
+						Exit;
+					end;
+				finally
+					 //	Application.ProcessMessages;
 				end;
 			end;
+			ThreadItem.UnRead := False;
 			ListView.Refresh;
 		end;
 		if (Assigned(Thread)) and (Assigned(Thread.Thread)) and (Thread <> nil) and (ThreadItem <>nil) then begin
@@ -4008,16 +3986,12 @@ end;
 procedure TGikoForm.SetListViewType(AViewType: TGikoViewType; SelectText: string; KubetsuChk: Boolean);
 var
 	Board: TBoard;
-	i: Integer;
 begin
 	if ActiveList is TBoard then begin
-		for i := Length( BBSs ) - 1 downto 0 do begin
-			BBSs[i].SelectText := SelectText;
-			BBSs[i].KubetsuChk := KubetsuChk;
-		end;
 		Board := TBoard(ActiveList);
-//		Board.ParentCategory.ParenTBBS.SelectText := SelectText;
-//		Board.ParentCategory.ParenTBBS.KubetsuChk := KubetsuChk;
+
+		Board.ParentCategory.ParenTBBS.SelectText := SelectText;
+		Board.ParentCategory.ParenTBBS.KubetsuChk := KubetsuChk;
 //		Board.SelectText := SelectText;
 //		Board.KubetsuChk := KubetsuChk;
 		ViewType := AViewType;
@@ -6658,13 +6632,11 @@ var
 	FDispHtmlDocument: DispHTMLDocument;
 	BrowserRecord :TBrowserRecord;
 	i :Integer;
-	doc					: Variant;
-	threadItem	: TThreadItem;
 begin
-//	AddMessageList('DocumentComplete', nil, gmiWhat);
+//	AddMessageList('DocumentComplete', nil);
 	if TObject(Sender) is TWebBrowser then begin
-		BrowserRecord := nil;
 		if TWebBrowser(Sender) <> Browser then begin
+			BrowserRecord := nil;
 			for i := BrowserTab.Tabs.Count - 1 downto 0 do begin
 				if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = TWebBrowser(Sender) then begin
 						BrowserRecord := TBrowserRecord(BrowserTab.Tabs.Objects[i]);
@@ -6680,7 +6652,7 @@ begin
 				BrowserRecord.FEvent.OnClick := WebBrowserClick;  //’ljÁ‚µ‚½OnClickƒCƒxƒ“ƒg
 			end;
 		end else begin
-			if GetActiveContent <> nil then begin
+        	if GetActiveContent <> nil then begin
 				FDispHtmlDocument := Idispatch(OleVariant(Browser.ControlInterface).Document) as DispHTMLDocument;
 				if FEvent <> nil then
 					FEvent.Free;
@@ -6689,38 +6661,6 @@ begin
 				FEvent.OnClick := WebBrowserClick;  //’ljÁ‚µ‚½OnClickƒCƒxƒ“ƒg
 			end;
 		end;
-
-		if (BrowserRecord <> nil) and
-			 Assigned( BrowserRecord.Thread ) then begin
-			threadItem := BrowserRecord.Thread;
-
-			if (BrowserRecord <> nil) and (Length( BrowserRecord.Movement ) > 0) then begin
-				if threadItem.UnRead then begin
-					threadItem.UnRead := False;
-					threadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead - 1;
-					if threadItem.ParentBoard.UnRead < 0 then threadItem.ParentBoard.UnRead := 0;
-					TreeView.Refresh;
-					ListView.Refresh;
-				end;
-				BrowserMovement( BrowserRecord.Movement, BrowserRecord );
-				BrowserRecord.Movement := '';
-			end else if threadItem.UnRead then begin
-				threadItem.UnRead := False;
-				threadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead - 1;
-				if threadItem.ParentBoard.UnRead < 0 then threadItem.ParentBoard.UnRead := 0;
-				TreeView.Refresh;
-				BrowserMovement( 'new', BrowserRecord );
-				ListView.Refresh;
-			end else if threadItem.ScrollTop <> 0 then begin
-				try
-					doc := Idispatch( OleVariant( BrowserRecord.Browser.ControlInterface ).Document ) as IHTMLDocument2;
-					doc.Body.ScrollTop := threadItem.ScrollTop;
-				except
-					on E: Exception do
-						MsgBox(Handle, E.Message, 'SetContent[ScrollTop<-]', 0);
-				end;
-			end;
-		end;
 	end;
 end;
 
@@ -7494,10 +7434,11 @@ begin
 	end;
 end;
 
-procedure TGikoForm.MoveToURL(const inURL: string);
+procedure TGikoForm.MoveToURL(URL: string);
+
 var
 	protocol, host, path, document, port, bookmark : string;
-	URL, protocol2, host2, path2, document2, port2, bookmark2 : string;
+	URL2, protocol2, host2, path2, document2, port2, bookmark2 : string;
 	tmp1, tmp2: string;
 	BBSID, BBSKey: string;
 	tmpBoard, Board: TBoard;
@@ -7510,22 +7451,20 @@ var
 //	boardNode			: TTreeNode;
 	shiftDown			: Boolean;
 	ctrlDown			: Boolean;
-	stRes, edRes	: Int64;
-	browserRec		: TBrowserRecord;
 begin
 
-	GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark );
-	GikoSys.Parse2chURL( inURL, path, document, BBSID, BBSKey );
+	GikoSys.ParseURI( URL, protocol, host, path, document, port, bookmark );
+	GikoSys.Parse2chURL( URL, path, document, BBSID, BBSKey );
 
 
 	shiftDown	:= GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
-	ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
-	if shiftDown then begin
-		GikoSys.OpenBrowser(inURL, gbtUserApp);
-		Exit;
-	end else if ctrlDown then begin
-		GikoSys.OpenBrowser(inURL, gbtIE);
-		Exit;
+    ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
+    if shiftDown then begin
+    	GikoSys.OpenBrowser(URL, gbtUserApp);
+        Exit;
+    end else if ctrlDown then begin
+    	GikoSys.OpenBrowser(URL, gbtIE);
+        Exit;
 	end;
 
 	//===== ƒvƒ‰ƒOƒCƒ“
@@ -7534,16 +7473,15 @@ begin
 		bi := High( BoardPlugIns );
 		for i := Low( BoardPlugIns ) to bi do begin
 			if Assigned( Pointer( BoardPlugIns[ i ].Module ) ) then begin
-				case BoardPlugIns[ i ].AcceptURL( inURL ) of
+				case BoardPlugIns[ i ].AcceptURL( URL ) of
 				atThread:
 					begin
-						tmpThread		:= TThreadItem.Create( BoardPlugIns[ i ], inURL );
+						tmpThread		:= TThreadItem.Create( BoardPlugIns[ i ], URL );
 						boardURL		:= tmpThread.BoardPlugIn.GetBoardURL( DWORD( tmpThread ) );
 						Board				:= BBSsFindBoardFromURL( boardURL );
 						if Board = nil then begin
-                            //break;
 							// ¦ì‚Á‚Ä‚à’ljÁ‚·‚é‚Æ‚±‚낪–³‚¢‚Ì‚ÅŒƒ‚µ‚­•Û—¯
-							//GikoSys.OpenBrowser(inURL, gbtUserApp);
+							//GikoSys.OpenBrowser(URL, gbtUserApp);
 							//Exit;
 							{
 							Board := GikoSys.GetUnknownBoard( tmpThread.BoardPlugIn, boardURL );
@@ -7555,40 +7493,34 @@ begin
 								GikoSys.ReadSubjectFile( Board );
 								Exit;
 							end;
-							ThreadItem := Board.FindThreadFromFileName( tmpThread.FileName );
-							if ThreadItem = nil then begin
-								ThreadItem := tmpThread;
-								Board.Insert( 0, ThreadItem );
-								if ActiveList is TBoard then begin
-									if TBoard(ActiveList) = Board then
-										ListView.Items.Count := ListView.Items.Count + 1;
-								end;
-								GikoSys.GetPopupResNumber( inURL, stRes, edRes );
-								browserRec := InsertBrowserTab( ThreadItem );
-								if (browserRec <> nil) and (stRes > 0) then
-									browserRec.Movement := IntToStr( stRes );
+						end;
+
+						ThreadItem := Board.FindThreadFromFileName( tmpThread.FileName );
+						if ThreadItem = nil then begin
+							ThreadItem := tmpThread;
+							Board.Insert( 0, ThreadItem );
+							if ActiveList is TBoard then begin
+								if TBoard(ActiveList) = Board then
+									ListView.Items.Count := ListView.Items.Count + 1;
+							end;
+							InsertBrowserTab( ThreadItem );
+							DownloadContent( ThreadItem );
+							Exit;
+						end else begin
+							tmpThread.Free;
+							InsertBrowserTab( ThreadItem );
+							if not ThreadItem.IsLogFile then begin
 								DownloadContent( ThreadItem );
-								Exit;
-							end else begin
-								tmpThread.Free;
-								GikoSys.GetPopupResNumber( inURL, stRes, edRes );
-								browserRec := InsertBrowserTab( ThreadItem );
-								if ThreadItem.IsLogFile then begin
-									if (browserRec <> nil) and (stRes > 0) then
-										BrowserMovement( IntToStr( stRes ), browserRec );
-								end else begin
-									if (browserRec <> nil) and (stRes > 0) then
-										browserRec.Movement := IntToStr( stRes );
-									DownloadContent( ThreadItem );
-								end;
-								Exit;
 							end;
+							Exit;
 						end;
+
+						//Exit;
 					end;
 
 				atBoard:
 					begin
-						tmpBoard := TBoard.Create(BoardPlugIns[ i ], inURL);
+						tmpBoard := TBoard.Create(BoardPlugIns[ i ], URL);
 						Board := BBSsFindBoardFromURL( tmpBoard.URL );
 						tmpBoard.Free;
 						if Board <> nil then begin
@@ -7607,7 +7539,7 @@ begin
 
 
 	if (Length( Trim(BBSKey) ) > 0) and (Length( Trim(BBSID) ) > 0) then begin
-		boardURL := GikoSys.Get2chThreadURL2BoardURL( inURL );
+		boardURL := GikoSys.Get2chThreadURL2BoardURL( URL );
 		Board := BBSsFindBoardFromURL( boardURL );
 		if Board = nil then
 			Board := BBSsFindBoardFromBBSID( BBSID );
@@ -7619,23 +7551,23 @@ begin
 		end;
 		if Board = nil then begin
 			 // “ü‚é‚ׂ«”‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½‚̂ŁA•’ʂ̃uƒ‰ƒEƒU‚ÅŠJ‚­
-			 GikoSys.OpenBrowser(inURL, gbtUserApp);
+			 GikoSys.OpenBrowser(URL, gbtUserApp);
 			 Exit;
 		end else begin
 			// ŠO•”‚̔‚Ȃ̂É2ch‚ÌURL‚É‚³‚ê‚Ä‚µ‚Ü‚Á‚½“z‚ð‚±‚±‚ÅŠm”F‚·‚é
-			URL :=  Board.URL;
-			GikoSys.ParseURI(URL , protocol2, host2, path2, document2, port2, bookmark2 );
+			URL2 :=  Board.URL;
+			GikoSys.ParseURI(URL2 , protocol2, host2, path2, document2, port2, bookmark2 );
 			tmp1 := Copy(host, AnsiPos('.', host) + 1, Length(host));
 			tmp2 := Copy(host2, AnsiPos('.', host2) + 1, Length(host2));
 			if ( not GikoSys.Is2chHost(tmp1)) and (tmp1 <> tmp2) then begin
-				GikoSys.OpenBrowser(inURL, gbtUserApp);
+				GikoSys.OpenBrowser(URL, gbtUserApp);
 				Exit;
 			end;
 		end;
 
 		if not Board.IsThreadDatRead then
 			GikoSys.ReadSubjectFile(Board);
-		URL := GikoSys.Get2chBrowsableThreadURL( inURL );
+		URL := GikoSys.Get2chBrowsableThreadURL( URL );
 		ThreadItem := Board.FindThreadFromURL( URL );
 		//@‰ß‹ŽƒƒO‘qŒÉ‚©‚çAƒ_ƒEƒ\‚µ‚½ƒXƒŒ‚ª”­Œ©‚Å‚«‚È‚¢‚Ì‚Å‚±‚±‚Å’T‚·‚悤‚É‚·‚é (2004/01/22)
 		if ThreadItem = nil then begin
@@ -7648,9 +7580,9 @@ begin
 			{shiftDown	:= GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
 			ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
 			if shiftDown then
-				GikoSys.OpenBrowser(URL1, gbtUserApp)
+				GikoSys.OpenBrowser(URL, gbtUserApp)
 			else if ctrlDown then
-				GikoSys.OpenBrowser(URL1, gbtIE)
+				GikoSys.OpenBrowser(URL, gbtIE)
 			else begin
 			}
 			ThreadItem := TThreadItem.Create( nil, URL );
@@ -7664,34 +7596,25 @@ begin
 				if TBoard(ActiveList) = Board then
 					ListView.Items.Count := ListView.Items.Count + 1;
 			end;
-			GikoSys.GetPopupResNumber( inURL, stRes, edRes );
-			browserRec := InsertBrowserTab(ThreadItem);
-			if (browserRec <> nil) and (stRes > 0) then
-				browserRec.Movement := IntToStr( stRes );
+			InsertBrowserTab(ThreadItem);
 			DownloadContent(ThreadItem);
 			{end;}
 		end else begin
-			if ThreadItem.IsLogFile then begin
-				GikoSys.GetPopupResNumber( inURL, stRes, edRes );
-				browserRec := InsertBrowserTab(ThreadItem);
-				if (browserRec <> nil) and (stRes > 0) then
-					browserRec.Movement := IntToStr( stRes );
-			end else begin
+			if ThreadItem.IsLogFile then
+				InsertBrowserTab(ThreadItem)
+			else begin
 				if AnsiPos(Host, Board.URL) = 0 then
 					ThreadItem.DownloadHost := Host
 				else
 					ThreadItem.DownloadHost := '';
-				GikoSys.GetPopupResNumber( inURL, stRes, edRes );
-				browserRec := InsertBrowserTab(ThreadItem);
-				if (browserRec <> nil) and (stRes > 0) then
-					browserRec.Movement := IntToStr( stRes );
+				InsertBrowserTab(ThreadItem);
 				DownloadContent(ThreadItem);
 			end;
 		end;
 	end else begin
-		Board := BBSsFindBoardFromURL( inURL );
+    Board := BBSsFindBoardFromURL( URL );
     if Board = nil then begin
-			GikoSys.OpenBrowser(inURL, gbtAuto);
+			GikoSys.OpenBrowser(URL, gbtAuto);
     end else begin
 	  if FActiveBBS <> Board.ParentCategory.ParenTBBS then
         ShowBBSTree( Board.ParentCategory.ParenTBBS );
@@ -7737,9 +7660,6 @@ begin
 end;
 
 procedure TGikoForm.WndProc(var Message: TMessage);
-var
-	senderBrowser	: TWebBrowser;
-	url						: OleVariant;
 begin
 	try
 		case Message.Msg of
@@ -7757,12 +7677,6 @@ begin
 			OnMinimized;
 		USER_SETLINKBAR:
 			SetLinkBar;
-		USER_DOCUMENTCOMPLETE:
-			if (Message.WParam <> 0) and
-				 (TObject(Message.WParam) is TWebBrowser) then begin
-				senderBrowser := TWebBrowser( Message.WParam );
-				BrowserDocumentComplete( senderBrowser, senderBrowser.Parent, url );
-			end;
 		end;
 
 		inherited;
@@ -8679,7 +8593,7 @@ begin
 		end;
 	end;
 	// Ý’è
-	lResult := SendMessage( bar.Handle, RB_SETBANDINFO, idx, Integer( pBandInfo ) );
+	lResult := SendMessage( bar.Handle, RB_SETBANDINFO, i, Integer( pBandInfo ) );
 
 end;
 
@@ -8924,7 +8838,7 @@ procedure TGikoForm.FormMouseWheel(Sender: TObject; Shift: TShiftState;
 var
 	Wnd: THandle;
 	delta: Integer;
-//	browserPos : TPoint;
+	browserPos : TPoint;
 const
 	ICON_SIZE = 16;
 begin
@@ -8938,43 +8852,31 @@ begin
 	if (Wnd = BrowserTab.Handle) or
 		 (Wnd = BrowserTab.Parent.Handle) then begin
 		BrowserTab.ScrollTabs(Delta);
-	end else begin
+	end;
+	{ else begin
 		if FIsHandledWheel then begin
 			FIsHandledWheel := False;
 			Handled := False;
 		end else begin
 			FIsHandledWheel := True;
-			if (Wnd = TreeView.Handle) or  (Wnd = FavoriteTreeView.Handle)
-			or (Wnd = ListView.Handle) or (Wnd = MessageListView.Handle)
-			then
-				SendMessage( Wnd, WM_MOUSEWHEEL, WheelDelta shl 16, (Mouse.CursorPos.X shl 16) or Mouse.CursorPos.Y )
-			else
-				Handled := False;
-
-{
 //			if (FActiveContent <> nil) and (FActiveContent.Browser <> nil) then begin
 				// TWebBrowser ‚Ì Handle ‚Æ”äŠr‚µ‚Ä‚àˆê’v‚µ‚È‚¢‚̂ōÀ•W‚Å TWebBrowser ‚©‚Ç‚¤‚©”»’è
 				browserPos.X := 0;
 				browserPos.Y := 0;
 				Windows.ClientToScreen( Browser.Handle, browserPos );
-				if (Longword(Mouse.CursorPos.X - browserPos.X) >= Browser.Width)
-				or (Longword(Mouse.CursorPos.Y - browserPos.Y) >= Browser.Height)
-				or (Longword(Mouse.CursorPos.Y - browserPos.Y) < 0)
-				or (Longword(Mouse.CursorPos.Y - browserPos.Y) < 0) then begin
+				//if (Longword(Mouse.CursorPos.X - browserPos.X) >= Browser.Width)
+				//or (Longword(Mouse.CursorPos.Y - browserPos.Y) >= Browser.Height) then begin
 //				or not FActiveContent.Browser.Focused then
 					// TWebBrowser ‚Í–³ŒÀƒ‹[ƒv‚·‚é‚Ì‚Å‚»‚êˆÈŠO‚È‚çƒRƒ“ƒgƒ[ƒ‹‚É‘—M
-					if (Wnd <> BrowserToolBar.Handle) and (Wnd <> BrowserNameToolBar.Handle) then
-						SendMessage( Wnd, WM_MOUSEWHEEL, WheelDelta shl 16, (Mouse.CursorPos.X shl 16) or Mouse.CursorPos.Y )
-					else
-						Handled := False;
-				end else begin
+				//	SendMessage( Wnd, WM_MOUSEWHEEL, WheelDelta shl 16, (MousePos.X shl 16) or MousePos.Y );
+				//end else begin
 					Handled := False;
-				end;
+				//end;
 //			end else begin
 //				SendMessage( Wnd, WM_MOUSEWHEEL, WheelDelta shl 16, (MousePos.X shl 16) or MousePos.Y );
 //			end;
-}		end;
-	end;
+		end;
+	end;}
 end;
 
 
@@ -9010,10 +8912,9 @@ begin
 		ModifySelectList;
 	end else if Length( SelectComboBox.Text ) = 0 then
 	begin
-		{* SelectComboBox.Text‚ª‹ó‚Å‚àA“ü—Í“r’†‚ÅEsc‚µ‚½‚Æ‚©
-		 * ‹ó‚Ì‚Æ‚«‚ÉDelƒL[‚ð‰Ÿ‚µ‚½‚Æ‚©‚Ȃ̂ŁAƒXƒŒ‚̍iž‚Ý‚ðˆÛŽ‚·‚éB
-		 * i‚±‚±‚ł͉½‚à‚µ‚È‚¢j
-		 *}
+		AllItemAction.Checked := True;
+		LogItemAction.Checked := False;
+		NewItemAction.Checked := False;
 	end else begin
 		// ƒ`ƒ‰‚‚­‚ÆŒ™‚¾‚©‚çAˆê‰ž‰Ÿ‚µ‚Ä‚ ‚é‚Æ‚«‚¾‚¯ˆ—‚·‚é
 		if AllItemAction.Checked then
@@ -9648,26 +9549,25 @@ end;
 procedure TGikoForm.FavoriteTreeViewKeyDown(Sender: TObject; var Key: Word;
 	Shift: TShiftState);
 begin
-	if not TTreeView(Sender).IsEditing then begin
-		Case Key of
-		VK_F2:
-			begin
-				FClickNode := FavoriteTreeView.Selected;
-				FavoriteTreeViewRenameActionExecute( Sender );
-			end;
-		VK_DELETE:
-			begin
-				FClickNode := FavoriteTreeView.Selected;
-				FavoriteTreeViewDeleteActionExecute( Sender );
-			end;
-		VK_RETURN:
-			begin
-			FavoriteClick( FavoriteTreeView.Selected );
-			FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded;
-			end;
-		VK_SPACE:
-			FavoriteTreeViewDblClick( Sender );
+
+	Case Key of
+	VK_F2:
+		begin
+			FClickNode := FavoriteTreeView.Selected;
+			FavoriteTreeViewRenameActionExecute( Sender );
 		end;
+	VK_DELETE:
+		begin
+			FClickNode := FavoriteTreeView.Selected;
+			FavoriteTreeViewDeleteActionExecute( Sender );
+		end;
+	VK_RETURN:
+		begin
+		FavoriteClick( FavoriteTreeView.Selected );
+		FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded;
+		end;
+	VK_SPACE:
+		FavoriteTreeViewDblClick( Sender );
 	end;
 
 end;
@@ -10062,7 +9962,7 @@ begin
 		ThreadItem := FavThread.Item;
 
 		try
-			s := ThreadItem.Title + #13#10 + ThreadItem.URL + #13#10;
+			s := ThreadItem.URL + #13#10 + ThreadItem.Title + #13#10;
 			if s <> '' then
 				Clipboard.AsText := s;
 		finally
@@ -10077,7 +9977,7 @@ begin
 				GikoSys.ReadSubjectFile(Board);
 
 		try
-			s := Board.Title + #13#10 + Board.URL + #13#10;
+			s := Board.URL + #13#10 + Board.Title + #13#10;
 			if s <> '' then
 				Clipboard.AsText := s;
 		finally
@@ -10134,12 +10034,7 @@ procedure TGikoForm.BrowserTabMouseUp(Sender: TObject;
 begin
 	if FDragWFirst <> true then begin
 		FDragWFirst := false;
-{
-	end else if (abs( X - FMouseDownPos.X ) < Mouse.DragThreshold)
-	and (abs( Y - FMouseDownPos.Y ) < Mouse.DragThreshold) then begin
-(*}
-	end else begin
-//*)
+	end else if (X = FMouseDownPos.X) and (Y = FMouseDownPos.Y) then begin
 		if GikoSys.Setting.ListOrientation = gloHorizontal then begin
 			if GikoSys.Setting.ListWidthState = glsMin then begin
 				BrowserMaxAndFocusAction.Execute;
@@ -10620,6 +10515,8 @@ begin
 end;
 // TreeView ‚ªƒNƒŠƒbƒN‚³‚ꂽ
 procedure TGikoForm.TreeClick( Node : TTreeNode );
+var
+	i: Integer;
 begin
 
 	if Node = nil then
@@ -11165,16 +11062,12 @@ begin
 		SelectListItem(List);
 		for i := 0 to List.Count - 1 do begin
 			if TObject(List[i]) is TThreadItem then begin
-				if (TThreadItem(List[i]).UnRead) then begin
-					TThreadItem(List[i]).UnRead := false;
-					TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead - 1;
-				end;
+				TThreadItem(List[i]).UnRead := false;
+				TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead - 1;
 			end;
 		end;
 		if TreeView.Visible then
 			TreeView.Refresh;
-		if ListView.Visible then
-        	ListView.Refresh;
 	finally
 		List.Free;
 	end;
@@ -11190,16 +11083,12 @@ begin
 		SelectListItem(List);
 		for i := 0 to List.Count - 1 do begin
 			if TObject(List[i]) is TThreadItem then begin
-				if (TThreadItem(List[i]).IsLogFile) and (not TThreadItem(List[i]).UnRead) then begin
-					TThreadItem(List[i]).UnRead := true;
-					TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead + 1;
-				end;
+				TThreadItem(List[i]).UnRead := true;
+				TThreadItem(List[i]).ParentBoard.UnRead := TThreadItem(List[i]).ParentBoard.UnRead + 1;
 			end;
 		end;
 		if TreeView.Visible then
 			TreeView.Refresh;
-		if ListView.Visible then
-        	ListView.Refresh;
 	finally
 		List.Free;
 	end;
@@ -11350,7 +11239,7 @@ end;
 procedure TGikoForm.TabsSaveToFileActionExecute(Sender: TObject);
 var
 	SaveTabList: TStringList;
-	Result: Boolean;
+        Result: Boolean;
 begin
 	SaveTabList := TStringList.Create;
 	try
@@ -11776,20 +11665,6 @@ begin
 	JumpToNumOfResAction.Enabled := (GetActiveContent <> nil) and (GetActiveContent.IsLogFile);
 end;
 
-procedure TGikoForm.FavoriteTreeViewCollapseActionExecute(Sender: TObject);
-var
-	node	: TTreeNode;
-begin
-
-	node := FavoriteTreeView.Items.GetFirstNode;
-	while node <> nil do begin
-		if node.HasChildren then
-			node.Expanded := False;
-		node := node.GetNext;
-	end;
-
-end;
-
 initialization
 				OleInitialize(nil);
 finalization

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -187,7 +187,7 @@ type
 		function Is2chHost(Host: string): Boolean;
 		function Parse2chURL(const url: string; const path: string; const document: string; var BBSID: string; var BBSKey: string): Boolean;
 		function Parse2chURL2(URL: string): TPathRec;
-		procedure ParseURI(const URL : string; var Protocol, Host, Path, Document, Port, Bookmark: string);
+		procedure ParseURI(var URL, Protocol, Host, Path, Document, Port, Bookmark: string);
 		function GetVersionBuild: Integer;
 		function	GetBrowsableThreadURL( inURL : string ) : string;
 		function	GetThreadURL2BoardURL( inURL : string ) : string;
@@ -3424,7 +3424,7 @@ begin
 	end;
 end;
 
-procedure TGikoSys.ParseURI(const URL : string; var Protocol, Host, Path, Document, Port, Bookmark: string);
+procedure TGikoSys.ParseURI(var URL, Protocol, Host, Path, Document, Port, Bookmark: string);
 var
 	URI: TIdURI;
 begin

--- a/GikoXMLDoc.pas
+++ b/GikoXMLDoc.pas
@@ -157,6 +157,7 @@ procedure IXMLNode.AddAttribute(
 	const Value : string
 );
 var
+	t : Integer;
 	index : Integer;
 begin
 
@@ -297,12 +298,15 @@ var
 
 	found : PChar;
 	tag : string;
+	tagLen : Integer;
 
 	isClosed : boolean;
 
 	nodeName : string;
 	attributeName : string;
 	attributeValue : string;
+
+	t, t2 : Integer;
 label
 	NextNode;
 begin

--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -156,7 +156,9 @@ var
 	Idx: Integer;
 	ATitle: string;
 	DownloadResult: Boolean;
+	foundPos: Integer;
 	boardPlugIn 	: TBoardPlugIn;
+	listContent 	: string;
 	lastContent		: string;
 	logFile				: TFileStream;
 	adjustMargin	: Integer;
@@ -1259,10 +1261,8 @@ begin
 							OldCnt := Body.IndexOf(oldBody.Strings[ LastIdx ]) + 1;
 						until ( OldCnt <> 0 ) or (LastIdx = 0);
 
-						if OldCnt >= Body.Count then OldCnt := Body.Count - 1;
 						NewRes := Body.Count - OldCnt;
 
-
 					finally
 						oldBody.Free;
 					end;
@@ -1299,10 +1299,8 @@ begin
 	ThreadItem.AllResCount := ThreadItem.Count;
 	ThreadItem.IsLogFile := True;
 	ThreadItem.RoundDate := Now;
-	if not ThreadItem.UnRead then begin
-		ThreadItem.UnRead := True;
-		ThreadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead + 1;
-	end;
+	ThreadItem.UnRead := True;
+	ThreadItem.ParentBoard.UnRead := ThreadItem.ParentBoard.UnRead + 1;
 //	if ThreadItem.RoundNo = 6 then
 //		ThreadItem.RoundNo := 0;
 

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -1,6 +1,6 @@
 object KuroutOption: TKuroutOption
-  Left = 43
-  Top = 114
+  Left = 260
+  Top = 167
   Width = 525
   Height = 457
   Caption = #35443#32048#35373#23450
@@ -140,182 +140,6 @@ object KuroutOption: TKuroutOption
           TabOrder = 3
         end
       end
-      object GroupBox1: TGroupBox
-        Left = 14
-        Top = 232
-        Width = 475
-        Height = 57
-        Caption = #12395#12385#12419#12435#35486#26696#20869#27231#33021
-        TabOrder = 2
-        Visible = False
-        object Label5: TLabel
-          Left = 8
-          Top = 16
-          Width = 234
-          Height = 12
-          Caption = #12395#12385#12419#12435#35486#12434#20351#12387#12390#12462#12467#12490#12499#12434#12469#12509#12540#12488#12375#12414#12377#12290
-        end
-        object GengoSupport: TCheckBox
-          Left = 8
-          Top = 32
-          Width = 201
-          Height = 17
-          Caption = #12395#12385#12419#12435#35486#26696#20869#27231#33021#12434#26377#21177#12395#12377#12427
-          TabOrder = 0
-        end
-      end
-    end
-    object ColumnTabSheet: TTabSheet
-      Caption = #35443#32048#35373#23450'2'
-      ImageIndex = 1
-      object CategoryColumnGroupBox: TGroupBox
-        Left = 8
-        Top = 16
-        Width = 481
-        Height = 145
-        Caption = #34920#31034#12459#12521#12512#35373#23450'('#12459#12486#12468#12522#12540')'
-        TabOrder = 0
-        object Label1: TLabel
-          Left = 80
-          Top = 16
-          Width = 60
-          Height = 12
-          Caption = #38750#34920#31034#38917#30446
-        end
-        object Label2: TLabel
-          Left = 312
-          Top = 16
-          Width = 48
-          Height = 12
-          Caption = #34920#31034#38917#30446
-        end
-        object CUnVisibledListBox: TListBox
-          Left = 32
-          Top = 33
-          Width = 161
-          Height = 65
-          ItemHeight = 12
-          TabOrder = 0
-        end
-        object CVisibledListBox: TListBox
-          Left = 264
-          Top = 33
-          Width = 161
-          Height = 65
-          ItemHeight = 12
-          TabOrder = 1
-        end
-        object CAddButton: TButton
-          Left = 200
-          Top = 38
-          Width = 57
-          Height = 25
-          Caption = '>>'
-          TabOrder = 2
-          OnClick = CAddButtonClick
-        end
-        object CDeleteButton: TButton
-          Left = 200
-          Top = 70
-          Width = 57
-          Height = 25
-          Caption = '<<'
-          TabOrder = 3
-          OnClick = CDeleteButtonClick
-        end
-        object CUpButton: TButton
-          Left = 264
-          Top = 104
-          Width = 75
-          Height = 25
-          Caption = #19978#12408
-          TabOrder = 4
-          OnClick = CUpButtonClick
-        end
-        object CDownButton: TButton
-          Left = 352
-          Top = 104
-          Width = 75
-          Height = 25
-          Caption = #19979#12504
-          TabOrder = 5
-          OnClick = CDownButtonClick
-        end
-      end
-      object BoardColumnGroupBox: TGroupBox
-        Left = 8
-        Top = 168
-        Width = 481
-        Height = 185
-        Caption = #34920#31034#12459#12521#12512#35373#23450'('#26495')'
-        TabOrder = 1
-        object Label3: TLabel
-          Left = 80
-          Top = 16
-          Width = 60
-          Height = 12
-          Caption = #38750#34920#31034#38917#30446
-        end
-        object Label4: TLabel
-          Left = 312
-          Top = 16
-          Width = 48
-          Height = 12
-          Caption = #34920#31034#38917#30446
-        end
-        object BUnVisibledListBox: TListBox
-          Left = 32
-          Top = 31
-          Width = 161
-          Height = 113
-          ItemHeight = 12
-          TabOrder = 0
-        end
-        object BVisibledListBox: TListBox
-          Left = 264
-          Top = 31
-          Width = 161
-          Height = 113
-          ItemHeight = 12
-          TabOrder = 1
-        end
-        object BAddButton: TButton
-          Left = 200
-          Top = 48
-          Width = 57
-          Height = 25
-          Caption = '>>'
-          TabOrder = 2
-          OnClick = BAddButtonClick
-        end
-        object BDeleteButton: TButton
-          Left = 200
-          Top = 80
-          Width = 57
-          Height = 25
-          Caption = '<<'
-          TabOrder = 3
-          OnClick = BDeleteButtonClick
-        end
-        object BUpButton: TButton
-          Left = 264
-          Top = 152
-          Width = 75
-          Height = 25
-          Caption = #19978#12408
-          TabOrder = 4
-          OnClick = BUpButtonClick
-        end
-        object BDownButton: TButton
-          Left = 352
-          Top = 152
-          Width = 75
-          Height = 25
-          Caption = #19979#12504
-          TabOrder = 5
-          OnClick = BDownButtonClick
-        end
-      end
     end
   end
   object OkBotton: TButton

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -8,67 +8,35 @@ uses
 
 type
   TKuroutOption = class(TForm)
-	PageControl1: TPageControl;
-	TabSheet1: TTabSheet;
-	GroupBox11: TGroupBox;
-	Label17: TLabel;
-	Label18: TLabel;
-	RecvBufferSize: TEdit;
-	ProxyProtocolCheckBox: TCheckBox;
-	ProtocolCheckBox: TCheckBox;
-	GroupBox13: TGroupBox;
-	Label24: TLabel;
-	Label25: TLabel;
-	PostTimeLabel: TLabel;
-	Label27: TLabel;
-	PostTimeCheckBox: TCheckBox;
-	PostTimeEdit: TEdit;
-	PutPostTimeRadioButton: TRadioButton;
-	BackPostTimeRadioButton: TRadioButton;
-	OkBotton: TButton;
-	CancelBotton: TButton;
-	ApplyButton: TButton;
-	ColumnTabSheet: TTabSheet;
-	CategoryColumnGroupBox: TGroupBox;
-	CUnVisibledListBox: TListBox;
-	CVisibledListBox: TListBox;
-	CAddButton: TButton;
-	CDeleteButton: TButton;
-	BoardColumnGroupBox: TGroupBox;
-	BUnVisibledListBox: TListBox;
-	BVisibledListBox: TListBox;
-	BAddButton: TButton;
-	BDeleteButton: TButton;
-	Label1: TLabel;
-	Label2: TLabel;
-	Label3: TLabel;
-	Label4: TLabel;
-	CUpButton: TButton;
-	CDownButton: TButton;
-	BUpButton: TButton;
-	BDownButton: TButton;
-    GroupBox1: TGroupBox;
-    GengoSupport: TCheckBox;
-    Label5: TLabel;
-	procedure OkBottonClick(Sender: TObject);
-	procedure FormCreate(Sender: TObject);
-	procedure CDeleteButtonClick(Sender: TObject);
-	procedure CAddButtonClick(Sender: TObject);
-	procedure BAddButtonClick(Sender: TObject);
-	procedure BDeleteButtonClick(Sender: TObject);
-    procedure CUpButtonClick(Sender: TObject);
-    procedure CDownButtonClick(Sender: TObject);
-    procedure BUpButtonClick(Sender: TObject);
-    procedure BDownButtonClick(Sender: TObject);
+    PageControl1: TPageControl;
+    TabSheet1: TTabSheet;
+    GroupBox11: TGroupBox;
+    Label17: TLabel;
+    Label18: TLabel;
+    RecvBufferSize: TEdit;
+    ProxyProtocolCheckBox: TCheckBox;
+    ProtocolCheckBox: TCheckBox;
+    GroupBox13: TGroupBox;
+    Label24: TLabel;
+    Label25: TLabel;
+    PostTimeLabel: TLabel;
+    Label27: TLabel;
+    PostTimeCheckBox: TCheckBox;
+    PostTimeEdit: TEdit;
+    PutPostTimeRadioButton: TRadioButton;
+    BackPostTimeRadioButton: TRadioButton;
+    OkBotton: TButton;
+    CancelBotton: TButton;
+    ApplyButton: TButton;
+    procedure OkBottonClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
   private
-	{ Private éŒ¾ }
+    { Private éŒ¾ }
 	procedure SetValue;
 	procedure SaveSetting;
 	procedure RecvBufferSizeExit(Sender: TObject);
 	procedure PostTimeEditExit(Sender: TObject);
 	procedure PostTimeCheckBoxClick(Sender: TObject);
-	procedure SetColumnData();
-	procedure PostColumnData();
   public
 	{ Public éŒ¾ }
   end;
@@ -78,9 +46,6 @@ var
 
 implementation
 
-uses
-	Giko, Setting;
-
 {$R *.dfm}
 
 procedure TKuroutOption.SetValue;
@@ -99,10 +64,6 @@ begin
 		PutPostTimeRadioButton.Checked := True
 	else
 		BackPostTimeRadioButton.Checked := True;
-
-	SetColumnData();
-
-	PageControl1.ActivePageIndex := GikoSys.Setting.KuroutSettingTabIndex;
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -120,10 +81,6 @@ begin
 	else
 		GikoSys.Setting.TimeAdjustSec := 0;
 	GikoSys.Setting.TimeAdjust := PutPostTimeRadioButton.Checked;
-
-        GikoSys.Setting.GengoSupport := GengoSupport.Checked;
-
-	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
 end;
 
 procedure TKuroutOption.RecvBufferSizeExit(Sender: TObject);
@@ -152,7 +109,6 @@ procedure TKuroutOption.OkBottonClick(Sender: TObject);
 begin
 	RecvBufferSizeExit(Sender);
 	PostTimeEditExit(Sender);
-    PostColumnData();
 	SaveSetting;
 end;
 
@@ -162,191 +118,5 @@ begin
 	PostTimeCheckBoxClick(Sender);
 
 end;
-procedure TKuroutOption.SetColumnData();
-var
-	i, j : Integer;
-	flag : Boolean;
-begin
-
-	//===== ”ƒŠƒXƒg =====
-	for i := 0 to GikoSys.Setting.CategoryColumnOrder.Count - 1 do begin
-		for j := 1 to Length( GikoCategoryColumnCaption ) - 1 do begin
-			if GikoSys.Setting.CategoryColumnOrder[ i ] = TGikoCategoryColumnID( j ) then begin
-				CVisibledListBox.AddItem(GikoCategoryColumnCaption[ j ], nil);
-				break;
-			end;
-		end;
-	end;
-
-	for i := 1 to Length( GikoCategoryColumnCaption ) - 1 do begin
-		flag := false;
-		for j := 0 to GikoSys.Setting.CategoryColumnOrder.Count - 1 do begin
-			if GikoSys.Setting.CategoryColumnOrder[ j ] = TGikoCategoryColumnID( i ) then begin
-				flag := true;
-				break;
-			end;
-		end;
-		if not flag then
-			CUnVisibledListBox.AddItem(GikoCategoryColumnCaption[ i ], nil);
-	end;
-
-	//===== ƒXƒŒƒŠƒXƒg =====
-	for i := 0 to GikoSys.Setting.BoardColumnOrder.Count - 1 do begin
-		for j := 1 to Length( GikoBoardColumnCaption ) - 1 do begin
-			if GikoSys.Setting.BoardColumnOrder[ i ] = TGikoBoardColumnID( j ) then begin
-				BVisibledListBox.AddItem(GikoBoardColumnCaption[ j ], nil);
-				Break;
-			end;
-		end;
-	end;
-
-	for i := 1 to Length( GikoBoardColumnCaption ) - 1 do begin
-		flag := false;
-		for j := GikoSys.Setting.BoardColumnOrder.Count - 1 downto 0 do begin
-			if GikoSys.Setting.BoardColumnOrder[ j ] = TGikoBoardColumnID( i ) then begin
-				flag := true;
-				Break;
-			end;
-		end;
-		if not flag then
-			BUnVisibledListBox.AddItem(GikoBoardColumnCaption[ i ], nil);
-
-	end;
-end;
-procedure TKuroutOption.CDeleteButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to CVisibledListBox.Count - 1 do begin
-		if CVisibledListBox.Selected[i] then begin
-			CUnVisibledListBox.AddItem(	CVisibledListBox.Items.Strings[ i ], nil);
-			CVisibledListBox.DeleteSelected;
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.CAddButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to CUnVisibledListBox.Count - 1 do begin
-		if CUnVisibledListBox.Selected[i] then begin
-			CVisibledListBox.AddItem(	CUnVisibledListBox.Items.Strings[ i ], nil);
-			CUnVisibledListBox.DeleteSelected;
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.BAddButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to BUnVisibledListBox.Count - 1 do begin
-		if BUnVisibledListBox.Selected[i] then begin
-			BVisibledListBox.AddItem(	BUnVisibledListBox.Items.Strings[ i ], nil);
-			BUnVisibledListBox.DeleteSelected;
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.BDeleteButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to BVisibledListBox.Count - 1 do begin
-		if BVisibledListBox.Selected[i] then begin
-			BUnVisibledListBox.AddItem(	BVisibledListBox.Items.Strings[ i ], nil);
-			BVisibledListBox.DeleteSelected;
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.CUpButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 1 to CVisibledListBox.Count - 1 do begin
-		if CVisibledListBox.Selected[i] then begin
-			CVisibledListBox.Items.Exchange(i, i -1);
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.CDownButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to CVisibledListBox.Count - 2 do begin
-		if CVisibledListBox.Selected[i] then begin
-			CVisibledListBox.Items.Exchange(i, i + 1);
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.BUpButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 1 to BVisibledListBox.Count - 1 do begin
-		if BVisibledListBox.Selected[i] then begin
-			BVisibledListBox.Items.Exchange(i, i -1);
-			break;
-		end;
-	end;
-end;
-
-procedure TKuroutOption.BDownButtonClick(Sender: TObject);
-var
-	i: Integer;
-begin
-	for i := 0 to BVisibledListBox.Count - 2 do begin
-		if BVisibledListBox.Selected[i] then begin
-			BVisibledListBox.Items.Exchange(i, i + 1);
-			break;
-		end;
-	end;
-end;
-
-
-procedure TKuroutOption.PostColumnData();
-var
-	i, j : Integer;
-begin
-	GikoForm.ActiveListColumnSave;
-
-	//===== ”ƒŠƒXƒg =====
-	for i := GikoSys.Setting.CategoryColumnOrder.Count -1 downto 1 do
-		GikoSys.Setting.CategoryColumnOrder.Delete(i);
-
-	for i := 0 to CVisibledListBox.Count - 1 do begin
-		for j := 1 to Length( GikoCategoryColumnCaption ) - 1 do begin
-			if CVisibledListBox.Items.Strings[ i ] = GikoCategoryColumnCaption[ j ] then begin
-				GikoSys.Setting.CategoryColumnOrder.Add(  TGikoCategoryColumnID(j) );
-				break;
-			end;
-		end;
-	end;
-
-	//===== ƒXƒŒƒŠƒXƒg =====
-	for i := GikoSys.Setting.BoardColumnOrder.Count - 1 downto 1 do
-		GikoSys.Setting.BoardColumnOrder.Delete(i);
-
-	for i := 0 to BVisibledListBox.Count - 1 do begin
-		for j := 1 to Length( GikoBoardColumnCaption ) - 1 do begin
-			if BVisibledListBox.Items.Strings[ i ] = GikoBoardColumnCaption[ j ] then begin
-				GikoSys.Setting.BoardColumnOrder.Add( TGikoBoardColumnID(j) );
-				Break;
-			end;
-		end;
-	end;
-	//ƒXƒŒˆê——‚Ì•`‰æ‚̍XV
-	GikoForm.SetActiveList(GikoForm.ActiveList);
-end;
 
 end.

--- a/Option.dfm
+++ b/Option.dfm
@@ -1,6 +1,6 @@
 object OptionDialog: TOptionDialog
-  Left = 188
-  Top = 128
+  Left = 410
+  Top = 236
   BorderStyle = bsDialog
   Caption = #12458#12503#12471#12519#12531
   ClientHeight = 428
@@ -60,9 +60,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet3
+    ActivePage = ThreadSheet
     MultiLine = True
-    TabIndex = 3
+    TabIndex = 4
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -252,7 +252,7 @@ object OptionDialog: TOptionDialog
           Top = 43
           Width = 417
           Height = 20
-          ItemHeight = 12
+          ItemHeight = 0
           TabOrder = 0
           Text = 'BoardURLComboBox'
         end
@@ -654,7 +654,7 @@ object OptionDialog: TOptionDialog
         Left = 12
         Top = 8
         Width = 477
-        Height = 41
+        Height = 64
         Caption = #34920#31034#35373#23450
         TabOrder = 0
         object ThreadListIconCheckBox: TCheckBox
@@ -665,10 +665,18 @@ object OptionDialog: TOptionDialog
           Caption = #12473#12524#12483#12489#26356#26032#12450#12452#12467#12531#12434#34920#31034#12377#12427'(&I)'
           TabOrder = 0
         end
+        object NonAcquiredCountCheckBox: TCheckBox
+          Left = 12
+          Top = 40
+          Width = 217
+          Height = 17
+          Caption = #21462#24471#25968#12398#20195#12431#12426#12395#26410#21462#24471#25968#12434#34920#31034#12377#12427
+          TabOrder = 1
+        end
       end
       object GroupBox16: TGroupBox
         Left = 12
-        Top = 52
+        Top = 76
         Width = 477
         Height = 64
         Caption = #12473#12524#20316#25104#26085#26178#34920#31034#35373#23450
@@ -692,7 +700,7 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox5: TGroupBox
         Left = 12
-        Top = 121
+        Top = 145
         Width = 477
         Height = 86
         Caption = #12502#12521#12454#12470#12398#26368#22823#21270
@@ -720,7 +728,7 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox17: TGroupBox
         Left = 12
-        Top = 212
+        Top = 236
         Width = 477
         Height = 63
         Caption = #12502#12521#12454#12470#12479#12502#38750#34920#31034#26178#35373#23450
@@ -758,9 +766,9 @@ object OptionDialog: TOptionDialog
       end
       object GroupBox18: TGroupBox
         Left = 12
-        Top = 278
+        Top = 302
         Width = 477
-        Height = 43
+        Height = 41
         Caption = 'dat'#33853#12385#12473#12524#12477#12540#12488#38918
         TabOrder = 4
         object DatOchiSortCombo: TComboBox
@@ -778,9 +786,7 @@ object OptionDialog: TOptionDialog
             #21462#24471#26085#26178'('#26119#38918')'
             #21462#24471#26085#26178'('#38477#38918')'
             #12473#12524#20316#25104#26085#26178'('#26119#38918')'
-            #12473#12524#20316#25104#26085#26178'('#38477#38918')'
-            #12473#12524#26368#32066#26356#26032#26085#26178#65288#26119#38918#65289
-            #12473#12524#26368#32066#26356#26032#26085#26178#65288#38477#38918#65289)
+            #12473#12524#20316#25104#26085#26178'('#38477#38918')')
         end
       end
     end

--- a/Option.pas
+++ b/Option.pas
@@ -90,6 +90,7 @@ type
     TabSheet3: TTabSheet;
     GroupBox9: TGroupBox;
     ThreadListIconCheckBox: TCheckBox;
+    NonAcquiredCountCheckBox: TCheckBox;
     GroupBox16: TGroupBox;
     CreationTimeLogsCheckBox: TCheckBox;
     FutureThreadCheckBox: TCheckBox;
@@ -765,6 +766,7 @@ begin
 
 	//ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“
 	ThreadListIconCheckBox.Checked := GikoSys.Setting.ListIconVisible;
+	NonAcquiredCountCheckBox.Checked := GikoSys.Setting.NonAcquiredCount;
 	CreationTimeLogsCheckBox.Checked := GikoSys.Setting.CreationTimeLogs;
 	FutureThreadCheckBox.Checked := GikoSys.Setting.FutureThread;
 	SelectIntervalEdit.Text := IntToStr(GikoSys.Setting.SelectInterval);
@@ -776,7 +778,7 @@ begin
 				DatOchiSortCombo.ItemIndex := 1
 			else
 				DatOchiSortCombo.ItemIndex := 2;
-		gbcRoundDate://gbcLastModified:
+		gbcLastModified:
 			if GikoSys.Setting.DatOchiSortOrder then
 				DatOchiSortCombo.ItemIndex := 3
 			else
@@ -786,11 +788,6 @@ begin
 				DatOchiSortCombo.ItemIndex := 5
 			else
 				DatOchiSortCombo.ItemIndex := 6;
-		gbcLastModified:
-			if GikoSys.Setting.DatOchiSortOrder then
-				DatOchiSortCombo.ItemIndex := 7
-			else
-				DatOchiSortCombo.ItemIndex := 8;
 	else
 		DatOchiSortCombo.ItemIndex := 0;
 	end;
@@ -805,6 +802,7 @@ begin
 
         //TabAutoLoad
         TabLoadSave.Checked := Gikosys.Setting.TabAutoLoadSave;
+
 end;
 
 procedure TOptionDialog.SaveSetting;
@@ -997,6 +995,11 @@ begin
 	//ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“
 	GikoSys.Setting.ListIconVisible := ThreadListIconCheckBox.Checked;
 
+	//Žæ“¾”A–¢Žæ“¾”
+	if (GikoSys.Setting.NonAcquiredCount <> NonAcquiredCountCheckBox.Checked) and (GikoForm.ActiveList Is TBoard) then
+		FRepaintList := true;
+	GikoSys.Setting.NonAcquiredCount := NonAcquiredCountCheckBox.Checked;
+
 	GikoSys.Setting.CreationTimeLogs := CreationTimeLogsCheckBox.Checked;
 	GikoSys.Setting.FutureThread := FutureThreadCheckBox.Checked;
 	if StrToIntDef(SelectIntervalEdit.Text, 110) > 55 then
@@ -1017,11 +1020,11 @@ begin
 		   end;
 		3: begin	//Žæ“¾“úŽž(¸‡)
 			GikoSys.Setting.DatOchiSortOrder := true;
-			GikoSys.Setting.DatOchiSortIndex := Ord( gbcRoundDate );{gbcLastModified}
+			GikoSys.Setting.DatOchiSortIndex := Ord( gbcLastModified );
 		   end;
 		4: begin	//Žæ“¾“úŽž(~‡)
 			GikoSys.Setting.DatOchiSortOrder := false;
-			GikoSys.Setting.DatOchiSortIndex := Ord( gbcRoundDate );{gbcLastModified}
+			GikoSys.Setting.DatOchiSortIndex := Ord( gbcLastModified );
 		   end;
 		5: begin	//ƒXƒŒì¬“úŽž(¸‡)
 			GikoSys.Setting.DatOchiSortOrder := true;
@@ -1031,14 +1034,6 @@ begin
 			GikoSys.Setting.DatOchiSortOrder := false;
 			GikoSys.Setting.DatOchiSortIndex := Ord( gbcCreated );
 		   end;
-		7:	begin  //ƒXƒŒÅIXV“úŽži¸‡j
-			GikoSys.Setting.DatOchiSortOrder := true;
-			GikoSys.Setting.DatOchiSortIndex := Ord( gbcLastModified );{gbcLastModified}
-			end;
-		8:	begin  //ƒXƒŒÅIXV“úŽži~‡j
-			GikoSys.Setting.DatOchiSortOrder := false;
-			GikoSys.Setting.DatOchiSortIndex := Ord( gbcLastModified );{gbcLastModified}
-			end;
 	end;
 
 	GikoSys.Setting.WriteSystemSettingFile;

--- a/Setting.pas
+++ b/Setting.pas
@@ -67,7 +67,7 @@ type
 		procedure SetItem( index : integer; value : TGikoBBSColumnID);
 	public
 		constructor Create;
-		destructor Destroy;	override;
+		destructor Destroy;
 		function Add( value : TGikoBBSColumnID ) : Integer;
 		property Items[index : integer]: TGikoBBSColumnID read GetItem write SetItem; default;
 	end;
@@ -83,21 +83,21 @@ type
 		procedure SetItem( index : integer; value : TGikoCategoryColumnID);
 	public
 		constructor Create;
-		destructor Destroy;	override;
+		destructor Destroy;
 		function Add( value : TGikoCategoryColumnID ) : Integer;
 		property Items[index : integer]: TGikoCategoryColumnID read GetItem write SetItem; default;
 	end;
 	/// ƒXƒŒƒŠƒXƒg‚̃Jƒ‰ƒ€ ID
 	type	TGikoBoardColumnID = (gbcTitle, gbcAllCount, gbcLocalCount, gbcNonAcqCount,
-		gbcNewCount, gbcUnReadCount, gbcRoundName, gbcRoundDate, gbcCreated, gbcLastModified );{gbcLastModified,}
+		gbcNewCount, gbcUnReadCount, gbcRoundName, gbcLastModified, gbcCreated );
 	/// ƒXƒŒƒŠƒXƒg‚̃Jƒ‰ƒ€–¼
-	const	GikoBoardColumnCaption : array[0..9] of string =
+	const	GikoBoardColumnCaption : array[0..8] of string =
 		( 'ƒXƒŒƒbƒh–¼', 'ƒJƒEƒ“ƒg', 'Žæ“¾', '–¢Žæ“¾', 'V’…',
-		'–¢“Ç', '„‰ñ—\–ñ', 'Žæ“¾“úŽž', 'ƒXƒŒì¬“úŽž', 'ÅIXV“úŽž' );
-	const GikoBoardColumnAlignment : array[0..9] of TAlignment = (
+		'–¢“Ç', '„‰ñ—\–ñ', 'Žæ“¾“úŽž', 'ƒXƒŒì¬“úŽž' );
+	const GikoBoardColumnAlignment : array[0..8] of TAlignment = (
 		taLeftJustify, taRightJustify, taRightJustify, taRightJustify,
 		taRightJustify, taRightJustify, taLeftJustify, taLeftJustify,
-		taLeftJustify, taLeftJustify);
+		taLeftJustify );
 	/// ƒXƒŒƒŠƒXƒgƒJƒ‰ƒ€”z—ñ
 	type	TGikoBoardColumnList = class( TList )
 	private
@@ -105,7 +105,7 @@ type
 		procedure SetItem( index : integer; value : TGikoBoardColumnID);
 	public
 		constructor Create;
-		destructor Destroy;	override;
+		destructor Destroy;
 		function Add( value : TGikoBoardColumnID ) : Integer;
 		property Items[index : integer]: TGikoBoardColumnID read GetItem write SetItem; default;
 	end;
@@ -272,7 +272,7 @@ type
 		//ƒŠƒXƒgƒJƒ‰ƒ€ƒwƒbƒ_[ƒTƒCƒY
 		FBBSColumnWidth: array[0..0] of Integer;
 		FCategoryColumnWidth: array[0..2] of Integer;
-		FBoardColumnWidth: array[0..9] of Integer;
+		FBoardColumnWidth: array[0..8] of Integer;
 
 		/// ƒJƒeƒSƒŠƒŠƒXƒgƒJƒ‰ƒ€‡˜
 		FBBSColumnOrder : TGikoBBSColumnList;
@@ -346,6 +346,8 @@ type
 
 		//ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“•\Ž¦
 		FListIconVisible: Boolean;
+		//Žæ“¾”‚Å‚Í‚È‚­–¢Žæ“¾‚ð•\Ž¦‚·‚é
+		FNonAcquiredCount: Boolean;
 
 				//ƒXƒŒƒbƒhˆê——‚ÅLog‚Ì‚ ‚éƒXƒŒƒbƒh‚̂݃XƒŒì¬“ú‚ð•\Ž¦‚·‚é‚©
 				FCreationTimeLogs: Boolean;
@@ -390,19 +392,12 @@ type
 
                 //TabŽ©“®•Û‘¶
                 FTabAutoLoadSave : Boolean;
-
-                //‚É‚¿‚á‚ñŒêˆÄ“àƒTƒ|[ƒg‹@”\
-                F2chSupport : Boolean;
-
 		// ƒGƒfƒBƒ^
 		FSpaceToNBSP	: Boolean;	///< ”¼ŠpƒXƒy[ƒXATab ‚ð &nbsp; ‚É’uŠ·
 		FAmpToCharRef	: Boolean;	///< '&' ‚ð &amp; ‚É’uŠ·
 
 		//ƒuƒ‰ƒEƒUƒ^ƒu”ñ•\Ž¦‚ÌŽž‚̃XƒŒˆê——‚ł̃J[ƒ\ƒ‹ƒL[ˆÚ“®‚Ì–³”½‰žŽžŠÔ
 		FSelectInterval	: Integer;
-
-		//KuroutSettingTab Ú×Ý’èƒ^ƒu‚ÌActiveTab
-		FKuroutSettingTabIndex: Integer;
 		
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
@@ -648,6 +643,7 @@ type
 		property BrowserAutoMaximize: TGikoBrowserAutoMaximize read FBrowserAutoMaximize write FBrowserAutoMaximize;
 
 		property ListIconVisible: Boolean read FListIconVisible write FListIconVisible;
+		property NonAcquiredCount: Boolean read FNonAcquiredCount write FNonAcquiredCount;
 		property CreationTimeLogs: Boolean read FCreationTimeLogs write FCreationTimeLogs;
 		property FutureThread: Boolean read FFutureThread write FFutureThread;
 
@@ -685,10 +681,8 @@ type
 		property AmpToCharRef	: Boolean	read FAmpToCharRef	write FAmpToCharRef;
 
 		property SelectInterval	: Integer	read FSelectInterval	write FSelectInterval;
-		//Tab•Û‘¶
-		property TabAutoLoadSave: Boolean           read FTabAutoLoadSave      write FTabAutoLoadSave;
-                property GengoSupport : Boolean         read F2chSupport        write F2chSupport;
-		property KuroutSettingTabIndex: Integer read FKuroutSettingTabIndex write FKuroutSettingTabIndex;
+                //Tab•Û‘¶
+                property TabAutoLoadSave: Boolean           read FTabAutoLoadSave      write FTabAutoLoadSave;
 end;
 
 
@@ -850,7 +844,7 @@ procedure TSetting.ReadSettingFile();
 const
 	DEFAULT_BBS_WIDTH: array[0..0] of Integer = (140);
 	DEFAULT_CATEGORY_WIDTH: array[0..2] of Integer = (150, 80, 130);
-	DEFAULT_BOARD_WIDTH: array[0..9] of Integer = (350, 60, 60, 60, 60, 60, 80, 130, 130, 130);
+	DEFAULT_BOARD_WIDTH: array[0..8] of Integer = (350, 60, 60, 60, 60, 60, 80, 130, 130);
 	MAX_WIDTH: Integer = 2000;
 var
 	ini: TMemIniFile;
@@ -1158,6 +1152,7 @@ begin
 
 		//ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“
 		FListIconVisible := ini.ReadBool('ThreadList', 'StateIconVisible', True);
+		FNonAcquiredCount := ini.ReadBool('ThreadList', 'NonAcquiredCount', False);
 		FCreationTimeLogs := ini.ReadBool('ThreadList', 'CreationTimeLogs', True);
 		FFutureThread := ini.ReadBool('ThreadList', 'FutureThread', True);
 		FSelectInterval := ini.ReadInteger('ThreadList', 'SelectInterval', 110);
@@ -1223,13 +1218,11 @@ begin
                 FDeleteSyria :=  ini.ReadBool('Abon','DeleteSyria',false);
 
 		// ƒGƒfƒBƒ^
-		FSpaceToNBSP	:= ini.ReadBool( 'Editor', 'SpaceToNBSP', False );
+		FSpaceToNBSP	:= ini.ReadBool( 'Editor', 'SpaceToNBSP', True );
 		FAmpToCharRef	:= ini.ReadBool( 'Editor', 'AmpToCharRef', False );
 
-		//TabŽ©“®•Û‘¶A“ǂݍž‚Ý
-		FTabAutoLoadSave    := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
-
-		FKuroutSettingTabIndex := ini.ReadInteger('OptionDialog', 'KuroutTabIndex' , 0);
+                //TabŽ©“®•Û‘¶A“ǂݍž‚Ý
+                FTabAutoLoadSave    := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
 
 
 	finally
@@ -1457,6 +1450,7 @@ begin
 
 		//ƒXƒŒƒbƒhˆê——XVƒAƒCƒRƒ“
 		ini.WriteBool('ThreadList', 'StateIconVisible', FListIconVisible);
+		ini.WriteBool('ThreadList', 'NonAcquiredCount', FNonAcquiredCount);
 		ini.WriteBool('ThreadList', 'CreationTimeLogs',FCreationTimeLogs);
 		ini.WriteBool('ThreadList', 'FutureThread', FFutureThread);
 		ini.WriteInteger('ThreadList', 'SelectInterval', FSelectInterval);
@@ -1555,15 +1549,9 @@ begin
 		ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
 		ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
 
-                //ƒ^ƒuŽ©“®•Û‘¶
-		ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
-                //Ú×Ý’è
-		ini.WriteInteger('OptionDialog', 'KuroutTabIndex', FKuroutSettingTabIndex);
-
-                //‚É‚¿‚á‚ñŒêˆÄ“à‹@”\
-                ini.WriteBool('2chSupport', 'Support', F2chSupport);
+                ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
 
-                ini.UpdateFile;
+		ini.UpdateFile;
 	finally
 		ini.Free;
 	end;

--- a/Sort.pas
+++ b/Sort.pas
@@ -17,6 +17,7 @@ var
 	SortOrder: Boolean;
 	SortIndex: Integer;
 	SortNoFlag: Boolean;
+	SortNonAcquiredCountFlag: Boolean;
 
 implementation
 
@@ -34,8 +35,6 @@ begin
 			Result := CompareInt(CategoryItem1.No, CategoryItem2.No)
 		else
 			Result := AnsiCompareText(CategoryItem1.Title, CategoryItem2.Title);
-	else
-		Result := CompareInt(CategoryItem1.No, CategoryItem2.No)
 	end;
 
 	if not SortOrder then
@@ -61,8 +60,6 @@ begin
 
 	gccLastModified:
 		Result := CompareDate(BoardItem1.RoundDate, BoardItem2.RoundDate);
-	else
-		Result := CompareInt(BoardItem1.No, BoardItem2.No)
 	end;
 
 	if not SortOrder then
@@ -102,9 +99,8 @@ begin
 		gbcNewCount: 			Result := CompareInt(ThreadItem1.NewResCount, ThreadItem2.NewResCount);
 		gbcUnReadCount: 	Result := 0;
 		gbcRoundName: 		Result := AnsiCompareText(ThreadItem1.RoundName, ThreadItem2.RoundName);
-		gbcRoundDate:	Result := CompareDateTime(ThreadItem1.RoundDate, ThreadItem2.RoundDate); {gbcLastModified:}
+		gbcLastModified:	Result := CompareDateTime(ThreadItem1.RoundDate, ThreadItem2.RoundDate);
 		gbcCreated:				Result := CompareDateTime(ThreadItem1.CreateDate, ThreadItem2.CreateDate);
-		gbcLastModified:	Result := CompareDateTime(ThreadItem1.LastModified, ThreadItem2.LastModified); {gbcLastModified:}
 	else
 		Result := 0;
 	end;

--- a/YofUtils.pas
+++ b/YofUtils.pas
@@ -40,38 +40,11 @@ function MatchesMask(
 	const filename, mask : string
 ) : boolean;
 
-/// ƒƒ^ƒLƒƒƒ‰ƒNƒ^‚𐳋K•\Œ»ˆµ‚¢‚É‚È‚ç‚È‚¢‚悤‚É’uŠ·
+// ƒƒ^ƒLƒƒƒ‰ƒNƒ^‚𐳋K•\Œ»ˆµ‚¢‚É‚È‚ç‚È‚¢‚悤‚É’uŠ·
 function RegExpEncode(
 	const text : string
 ) : string;
 
-{*!
-\brief		•\Ž¦ƒƒbƒZ[ƒW‚̐®Œ`
-\param		msg				•\Ž¦‚·‚郁ƒbƒZ[ƒW
-\param		elements	’uŠ·’PŒê
-
-msg ‚Ì’†‚Ì’uŠ·‚³‚ê‚é’PŒê‚Í '^”ԍ†' ‚Å•\‚³‚êA
-elements ‚͉üs‚É‚æ‚Á‚Ä’PŒê•ª‚¯‚³‚ê‚Ü‚·B<br>
-
-<pre><code>
-elements := IntToStr( 10 ) + #10 + 'hoge';
-m := MessageStyle(
-	'^0 ŒÂ‚́g^1h‚ð’uŠ·‚µ‚Ü‚µ‚½B',
-	elements );
-</code></pre>
-
-‚ŏo—Í‚³‚ê‚é m ‚́u10 ŒÂ‚́ghogeh‚ð’uŠ·‚µ‚Ü‚µ‚½Bv‚Æ‚È‚è‚Ü‚·B
-*}
-function MessageStyle(
-	const msg				: string;
-	const elements	: string
-) : string; overload;
-
-function MessageStyle(
-	const msg				: string;
-	const elements	: TStringList
-) : string; overload;
-
 type
 	/// Mode ’l‚ª‚¨‚©‚µ‚¢
 	EMappedFileModeError = class( Exception );
@@ -104,8 +77,6 @@ const
 implementation
 //==================================================
 
-uses MojuUtils;
-
 // ‚Æ‚è‚ ‚¦‚¸‚Ì‘ã—p•i‚È‚Ì‚Å chrWhite ‚ðl—¶‚µ‚Ä‚¢‚È‚¢‚±‚Æ‚É’ˆÓIII
 procedure ExtractHttpFields(
 	const chrSep : TSysCharSet;
@@ -420,38 +391,6 @@ begin
 
 end;
 
-function MessageStyle(
-	const msg				: string;
-	const elements	: string
-) : string;
-var
-	list						: TStringList;
-begin
-
-	list := TStringList.Create;
-	try
-		list.Text := elements;
-		Result := MessageStyle( msg, list );
-	finally
-		list.Free;
-	end;
-
-end;
-
-function MessageStyle(
-	const msg				: string;
-	const elements	: TStringList
-) : string;
-var
-	i								: Integer;
-begin
-
-	Result := msg;
-	for i := elements.Count - 1 downto 0 do
-		Result := CustomStringReplace( Result, '^' + IntToStr( i ), elements[ i ], false );
-
-end;
-
 { TMappedFile }
 
 {*!

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

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ49 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ48 Readme.txt
 
 
 ------------------------------
@@ -41,7 +41,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://pc5.2ch.net/test/read.cgi/software/1094289071/l50
+ƒMƒRƒiƒrƒXƒŒFhttp://pc5.2ch.net/test/read.cgi/software/1079685385/l50
 
 ------------------------------
 “]Ú‚ɂ‚¢‚Ä
@@ -89,21 +89,6 @@ Windows Server 2003 Enterprise Edition IE6
 ------------------------------
 —š—ð
 ------------------------------
-2004/10/XX
-  Version ÊÞÀ49
-  ‚¨‹C‚É“ü‚è‚̓ǂݍž‚݂̍‚‘¬‰»‚É‚æ‚é‹N“®ŽžŠÔ‚Ì’Zk
-  StatusBar‚ÉNGƒ[ƒhƒtƒ@ƒCƒ‹‚Ì–¼‘O‚ªo‚È‚¢•s‹ï‡‚̏C³
-  uŽw’肵‚½”ԍ†‚̃ŒƒX‚É”ò‚ԁv‹@”\’ljÁiƒL[Ý’è‚ŁAƒXƒŒƒbƒhƒJƒeƒSƒŠ‚̈ê”ԍŌãj
-  ƒƒO‚ðíœ‚µ‚½Û‚É–¢“ǃXƒŒƒbƒh” (UnRead) ‚Ì•\Ž¦‚ªXV‚³‚ê‚È‚¢ƒoƒO‚ðC³
-  ‚±‚±‚ɃŒƒX‚¾‚ƁAƒŒƒXƒGƒfƒBƒ^[‚̃Vƒ‡[ƒgƒJƒbƒgƒL[‚ªÝ’肳‚ê‚È‚¢•s‹ï‡‚̏C³
-  ‚ ‚ځ[‚ñŽž‚ɃRƒR‚Ü‚Å“Ç‚ñ‚¾‚ƐV’…ƒŒƒX‚𒲐®‚·‚é‚Ì‚É•s‹ï‡‚ª‚ ‚Á‚½‚̂ŏC³
-  ƒXƒŒƒbƒhˆê——‚Ì•\Ž¦ƒJƒ‰ƒ€‚̐ݒ肪‚Å‚«‚é‚悤‚É‚È‚Á‚½BuƒIƒvƒVƒ‡ƒ“v->uÚ×Ý’èv->uÚ×Ý’è2v
-  ƒfƒtƒHƒ‹ƒg‚ł̃ŒƒXƒAƒ“ƒJ[ƒ|ƒbƒvƒAƒbƒv‚ªŽíŽí‚ÌŒ`Ž®‚ɑΉž
-  ‚R‚¿‚á‚ñ‚Ë‚éi8‚¿‚á‚ñ‚Ë‚éj‚ð“o˜^‚·‚é‚Æ‚Q‚¿‚á‚ñ‚Ë‚é‚̔‚ª•\Ž¦‚³‚ê‚é•s‹ï‡‚̉ðÁ
-  ‚¨‹C‚É“ü‚è‚ŕҏW’†‚ɃXƒy[ƒXƒL[“ü—Í‚Ì•s‹ï‡‚̏C³
-  ‚µ‚½‚ç‚ÎJBBS‚̉ߋŽƒƒO‚ÉŠÖ‚·‚é•s‹ï‡‚̏C³
-  ƒXƒŒƒbƒh‚̃Šƒ“ƒN‚ŃŒƒX”Ô‚ª‚ ‚é‚à‚̂𓥂ñ‚¾‚Æ‚«‚ɁA‚»‚̃ŒƒX”ԍ†‚܂ŃXƒNƒ[ƒ‹‚·‚é‚悤‚É‚µ‚½B
-
 2004/09/05
   Version ÊÞÀ48
   ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚ ‚ځ`‚ñ—LŒø‚É‚µ‚Ä‚¢‚Ä‚àA“§–¾‚ ‚ځ`‚ñ‚ð•\Ž¦‚·‚é•s‹ï‡‚̉ðÁ

--- a/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
+++ b/res/ExternalBoardPlugIn/ShitarabaJBBSPlugIn.dpr
@@ -3,7 +3,7 @@ library ShitarabaJBBSPlugIn;
 {
 	ShitarabaJBBSPlugIn
 	‚µ‚½‚ç‚Ώˆ—ƒ†ƒjƒbƒg
-	$Id: ShitarabaJBBSPlugIn.dpr,v 1.36 2004/09/30 11:49:44 h677 Exp $
+	$Id: ShitarabaJBBSPlugIn.dpr,v 1.30 2004/09/06 16:41:41 h677 Exp $
 }
 
 uses
@@ -33,7 +33,7 @@ type
 
 	private
 		function	Download : TDownloadState;
-		function	StorageDownload(AURL : string) : TDownloadState;
+		function	StorageDownload(Path, Document : string) : TDownloadState;
 		function	Write( inName : string; inMail : string; inMessage : string ) : TDownloadState;
 		function	GetRes( inNo : Integer ) : string;
 		function	GetDat( inNo : Integer ) : string;
@@ -281,8 +281,7 @@ var
 //	i			: Integer;
 const
 	BBS_HOST_OLD 	= 'jbbs.shitaraba.com';
-	BBS_HOST_OLD2   = 'jbbs.livedoor.com';
-	BBS_HOST		= 'jbbs.livedoor.jp';
+	BBS_HOST 			= 'jbbs.livedoor.com';
 	THREAD_MARK	= '/bbs/read.cgi';
 begin
 
@@ -291,7 +290,7 @@ begin
 		uri			:= TIdURI.Create( inURL );
 		uriList	:= TStringList.Create;
 		try
-			if (uri.Host = BBS_HOST_OLD) or (uri.Host = BBS_HOST_OLD2) then
+			if uri.Host = BBS_HOST_OLD then
 				uri.Host := BBS_HOST;
 				
 			ExtractHttpFields( ['/'], [], uri.Path, uriList );
@@ -350,13 +349,12 @@ var
 
 	found					: Integer;
 	found2				: Integer;
-	pos					: Integer;
 	board					: string;
 const
 	CATEGORY_INPUT	= 'ƒJƒeƒSƒŠ‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢';
 	KEYWORD_INPUT		= 'ŒŸõ‚·‚é”–¼‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢';
 	SAVEPATH_SELECT	= '•Û‘¶‚·‚éƒtƒ@ƒCƒ‹–¼‚ð“ü—Í‚µ‚Ä‚­‚¾‚³‚¢';
-	BBS_HOST	 			= 'http://jbbs.livedoor.jp/';
+	BBS_HOST	 			= 'http://jbbs.livedoor.com/';
 label
 	NextBoard;
 begin
@@ -439,12 +437,8 @@ begin
 
 					saveText.Add( board );
 NextBoard:
-					found := AnsiPos( '<a ', downResult );
+		 		 	found := AnsiPos( '<a ', downResult );
 				end;
-				pos := saveText.IndexOf('JBBS=/');
-				if pos > 0 then
-					saveText.Delete(pos);
-
 				saveText.SaveToFile( savepath );
 				saveText.Free;
 			end else begin
@@ -505,14 +499,22 @@ begin
 	uriList := TStringList.Create;
 	try
 		ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
-		if uriList[ 5 ] = 'l100' then begin
-			FileName	:= uriList[ 4 ] + '.dat';
-			FilePath	:= MyLogFolder + uriList[ 2 ] + '\' + uriList[ 3 ] + '\' + uriList[ 4 ] + '.dat';
-			IsLogFile	:= FileExists( FilePath );
-		end else begin
-			FileName	:= uriList[ 5 ] + '.dat';
-			FilePath	:= MyLogFolder + uriList[ 3 ] + '\' + uriList[ 4 ] + '\' + uriList[ 5 ] + '.dat';
+		if (AnsiPos('.html', uri.Document) = 0) then begin //’ʏí
+			if uriList[ 5 ] = 'l100' then begin
+				FileName	:= uriList[ 4 ] + '.dat';
+				FilePath	:= MyLogFolder + uriList[ 2 ] + '\' + uriList[ 3 ] + '\' + uriList[ 4 ] + '.dat';
+				IsLogFile	:= FileExists( FilePath );
+			end else begin
+				FileName	:= uriList[ 5 ] + '.dat';
+				FilePath	:= MyLogFolder + uriList[ 3 ] + '\' + uriList[ 4 ] + '\' + uriList[ 5 ] + '.dat';
+				IsLogFile	:= FileExists( FilePath );
+			end;
+		end else begin	//‰ß‹ŽƒƒO
+			//http://jbbs.livedoor.com/game/1578/storage/1086710948.html
+			FileName	:= Copy(uri.Document, 1, Length(uri.Document) - 5) + '.dat';
+			FilePath	:= MyLogFolder + CustomStringReplace(CustomStringReplace(uri.Path, '/storage', ''), '/', '\') + FileName;
 			IsLogFile	:= FileExists( FilePath );
+
 		end;
 	finally
 		uri.Free;
@@ -549,109 +551,115 @@ var
 	logStream			: TFileStream;
 	uri						: TIdURI;
 	uriList				: TStringList;
-	datURL, tmpURL				: string;
-	tmpText: string;
+	datURL				: string;
+		tmpText: string;
 begin
 
 	Result := dsError;
 
 	uri := TIdURI.Create( ReadURL );
-	uriList := TStringList.Create;
-	try
-		ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
-		FileName := uriList[ 5 ] + '.dat';
-		// http://jbbs.livedoor.com/bbs/rawmode.cgi/game/1578/1067968274/l100
-		// protocol://host/1/2/3/4/5/uriList.Count - 1
-		if MyLogFolder = '' then begin
-			// ‚Ç‚±‚É•Û‘¶‚µ‚Ä‚¢‚¢‚Ì‚©•ª‚©‚ç‚È‚¢‚̂ňꎞƒtƒ@ƒCƒ‹‚É•Û‘¶
-			FilePath 			:= TemporaryFile;
-			FIsTemporary	:= True;
-		end else begin
-			FilePath			:= MyLogFolder + uriList[ 3 ] + '\' + uriList[ 4 ] + '\' + uriList[ 5 ] + '.dat';
-			FIsTemporary	:= False;
-		end;
-	finally
+	if(( AnsiPos('.html', uri.Document) >0 ) and ( AnsiPos('/storage/', uri.Path) > 0 )) then begin
+		//‰ß‹ŽƒƒO
+		Result := StorageDownload(uri.Path, uri.Document);
 		uri.Free;
-		uriList.Free;
-	end;
+	end else begin
+		//Œ»Ý¶‚«‚Ä‚éƒXƒŒƒbƒh
+		uriList := TStringList.Create;
+		try
+			ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
+			FileName := uriList[ 5 ] + '.dat';
+			// http://jbbs.livedoor.com/bbs/rawmode.cgi/game/1578/1067968274/l100
+			// protocol://host/1/2/3/4/5/uriList.Count - 1
+			if MyLogFolder = '' then begin
+				// ‚Ç‚±‚É•Û‘¶‚µ‚Ä‚¢‚¢‚Ì‚©•ª‚©‚ç‚È‚¢‚̂ňꎞƒtƒ@ƒCƒ‹‚É•Û‘¶
+				FilePath 			:= TemporaryFile;
+				FIsTemporary	:= True;
+			end else begin
+				FilePath			:= MyLogFolder + uriList[ 3 ] + '\' + uriList[ 4 ] + '\' + uriList[ 5 ] + '.dat';
+				FIsTemporary	:= False;
+			end;
+		finally
+			uri.Free;
+			uriList.Free;
+		end;
 
-	// •Û‘¶—p‚̃fƒBƒŒƒNƒgƒŠ‚ðŒ@‚é
-	ForceDirectoriesEx( Copy( FilePath, 1, LastDelimiter( '\', FilePath ) ) );
+		// •Û‘¶—p‚̃fƒBƒŒƒNƒgƒŠ‚ðŒ@‚é
+		ForceDirectoriesEx( Copy( FilePath, 1, LastDelimiter( '\', FilePath ) ) );
 
-	// “ÆŽ©‚Ƀ_ƒEƒ“ƒ[ƒh‚âƒtƒBƒ‹ƒ^ƒŠƒ“ƒO‚ðs‚í‚È‚¢ê‡‚Í
-	// InternalDownload ‚É”C‚¹‚邱‚Æ‚ªo—ˆ‚é
-	modified	:= LastModified;
-	datURL		:= ReadURL + IntToStr( Count + 1 ) + '-'; // V’…‚Ì‚Ý
-	responseCode := InternalDownload( PChar( datURL ), modified, tmp, 0 );
+		// “ÆŽ©‚Ƀ_ƒEƒ“ƒ[ƒh‚âƒtƒBƒ‹ƒ^ƒŠƒ“ƒO‚ðs‚í‚È‚¢ê‡‚Í
+		// InternalDownload ‚É”C‚¹‚邱‚Æ‚ªo—ˆ‚é
+		modified	:= LastModified;
+		datURL		:= ReadURL + IntToStr( Count + 1 ) + '-'; // V’…‚Ì‚Ý
+		responseCode := InternalDownload( PChar( datURL ), modified, tmp, 0 );
 
-	try
-		if (responseCode = 200) or (responseCode = 206) then begin
-			downResult := TStringList.Create;
-			try
-								tmpText := CustomStringReplace( string( tmp ), '¡÷¡®', ',' );
-				downResult.Text := EUCtoSJIS( tmpText );
-								ArrangeDownloadData(Count, downResult);
-				if downResult.Count > 0 then begin
-					if FileExists( FilePath ) then
-						logStream := TFileStream.Create( FilePath, fmOpenReadWrite or fmShareDenyWrite )
-					else
-						logStream := TFileStream.Create( FilePath, fmCreate or fmShareDenyWrite );
-					try
-						logStream.Position	:= logStream.Size;
-						logStream.Write( PChar( downResult.Text )^, Length( downResult.Text ) );
-					finally
-						logStream.Free;
-					end;
+		try
+			if (responseCode = 200) or (responseCode = 206) then begin
+				downResult := TStringList.Create;
+				try
+									tmpText := CustomStringReplace( string( tmp ), '¡÷¡®', ',' );
+					downResult.Text := EUCtoSJIS( tmpText );
+									ArrangeDownloadData(Count, downResult);
+					if downResult.Count > 0 then begin
+						if FileExists( FilePath ) then
+							logStream := TFileStream.Create( FilePath, fmOpenReadWrite or fmShareDenyWrite )
+						else
+							logStream := TFileStream.Create( FilePath, fmCreate or fmShareDenyWrite );
+						try
+							logStream.Position	:= logStream.Size;
+							logStream.Write( PChar( downResult.Text )^, Length( downResult.Text ) );
+						finally
+							logStream.Free;
+						end;
 
-					if Count = 0 then
-											// V‹K
-						Result := dsComplete
-					else
-						// ’Ç‹L
-						Result := dsDiffComplete;
+						if Count = 0 then
+												// V‹K
+							Result := dsComplete
+						else
+							// ’Ç‹L
+							Result := dsDiffComplete;
 
-										Size					:= Size + Length( downResult.Text );
-					// CGI ‚©‚ç‚͐³‚µ‚¢“ú•t‚ª“¾‚ç‚ê‚È‚¢‚Ì‚ÅŒ»Ý‚ɐݒè
-					LastModified	:= Now;
+											Size					:= Size + Length( downResult.Text );
+						// CGI ‚©‚ç‚͐³‚µ‚¢“ú•t‚ª“¾‚ç‚ê‚È‚¢‚Ì‚ÅŒ»Ý‚ɐݒè
+						LastModified	:= Now;
 
 
 
-					NewReceive		:= Count + 1;
-					Count					:= Count + downResult.Count;
-					NewResCount		:= downResult.Count;
+						NewReceive		:= Count + 1;
+						Count					:= Count + downResult.Count;
+						NewResCount		:= downResult.Count;
 
 
 
-				end else begin
-					Result := dsNotModify;
+					end else begin
+						Result := dsNotModify;
+					end;
+				finally
+					downResult.Free;
 				end;
-			finally
-				downResult.Free;
-			end;
-		end else if responseCode = 302 then begin
-			//http://jbbs.shitaraba.com/bbs/read.cgi/game/3477/1077473358/
-			//http://jbbs.shitaraba.com/game/bbs/read.cgi?BBS=3477&KEY=1077473358
-			//http://jbbs.shitaraba.com/game/3477/storage/1077473358.html
-			//‰ß‹ŽƒƒO
-			//tmpURL := URL;
-			if Assigned( InternalPrint ) then
-				InternalPrint( '‰ß‹ŽƒƒO‘qŒÉ“ü‚è' );
-			uri := TIdURI.Create( ReadURL );
-			uriList := TStringList.Create;
-			try
-				ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
-				tmpURL := uri.Protocol + '://' + uri.Host +
-						'/' + uriList[3] + '/' + uriList[4] + '/storage/' + uriList[ 5 ] + '.html';
-			finally
-				uriList.Free;
+			end else if responseCode = 302 then begin
+				//http://jbbs.shitaraba.com/bbs/read.cgi/game/3477/1077473358/
+				//http://jbbs.shitaraba.com/game/bbs/read.cgi?BBS=3477&KEY=1077473358
+				//http://jbbs.shitaraba.com/game/3477/storage/1077473358.html
+				//‰ß‹ŽƒƒO
+				uri := TIdURI.Create( ReadURL );
+				uriList := TStringList.Create;
+				try
+					ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
+					URL := uri.Protocol + '://' + uri.Host +
+							'/' + uriList[3] + '/' + uriList[4] + '/storage/' + uriList[ 5 ] + '.html';
+				finally
+					uriList.Free;
+					uri.Free;
+				end;
+				uri := TIdURI.Create( ReadURL );
+				Result := StorageDownload(uri.Path, uri.Document);
 				uri.Free;
+			end else if responseCode = 304 then begin
+				Result := dsNotModify;
 			end;
-			Result := StorageDownload(tmpURL);
-		end else if responseCode = 304 then begin
-			Result := dsNotModify;
+		finally
+			DisposeResultString( tmp );
 		end;
-	finally
-		DisposeResultString( tmp );
 	end;
 
 end;
@@ -691,16 +699,17 @@ end;
 // ‰ß‹ŽƒƒO—pDownloadŠÖ”
 // *************************************************************************
 function	TShitarabaThreadItem.StorageDownload(
-	AURL : string
+	Path, Document : string
 ) : TDownloadState;
 var
 	modified			: Double;
 	tmp						: PChar;
-    uri : TIdURI;
-	uriList : TStringList;
 	downResult		: TStringList;
 	responseCode	: Longint;
 	logStream			: TFileStream;
+	//uri						: TIdURI;
+	//uriList				: TStringList;
+	datURL				: string;
 	tmpText, tmpLine, tmpTitle: string;
 	tmpHTML: TStringList;
 
@@ -709,24 +718,23 @@ var
 begin
 
 	Result := dsError;
-	uri := TIdURI.Create( ReadURL );
-	uriList := TStringList.Create;
+
+	//uri := TIdURI.Create( ReadURL );
 	try
-		ExtractHttpFields( ['/', '?'], [], uri.Path, uriList );
-		FileName := uriList[ 5 ] + '.dat';
-		// http://jbbs.livedoor.com/bbs/rawmode.cgi/game/1578/1067968274/l100
-		// protocol://host/1/2/3/4/5/uriList.Count - 1
+		FileName := Copy(Document, 1, Length(Document) - 5) + '.dat';
 		if MyLogFolder = '' then begin
 			// ‚Ç‚±‚É•Û‘¶‚µ‚Ä‚¢‚¢‚Ì‚©•ª‚©‚ç‚È‚¢‚̂ňꎞƒtƒ@ƒCƒ‹‚É•Û‘¶
 			FilePath 			:= TemporaryFile;
 			FIsTemporary	:= True;
 		end else begin
-			FilePath			:= MyLogFolder + uriList[ 3 ] + '\' + uriList[ 4 ] + '\' + uriList[ 5 ] + '.dat';
+			FilePath	:= MyLogFolder
+							+ CustomStringReplace(CustomStringReplace(Path, '/storage', ''), '/', '\')
+							+ FileName;
+
 			FIsTemporary	:= False;
 		end;
 	finally
-		uri.Free;
-		uriList.Free;
+		//uri.Free;
 	end;
 
 	// •Û‘¶—p‚̃fƒBƒŒƒNƒgƒŠ‚ðŒ@‚é
@@ -738,7 +746,8 @@ begin
 	// InternalDownload ‚É”C‚¹‚邱‚Æ‚ªo—ˆ‚é
 	modified	:= LastModified;
 
-	responseCode := InternalDownload( PChar( AURL ), modified, tmp, 0 );
+	datURL		:= ReadURL;
+	responseCode := InternalDownload( PChar( datURL ), modified, tmp, 0 );
 
 	try
 		if (responseCode = 200) or (responseCode = 206) then begin
@@ -1149,8 +1158,7 @@ var
 	tmphost:	String;
 const
 	BBS_HOST_OLD 	= 'jbbs.shitaraba.com';
-	BBS_HOST_OLD2   = 'jbbs.livedoor.com';
-	BBS_HOST		= 'jbbs.livedoor.jp';
+	BBS_HOST 			= 'jbbs.livedoor.com';
 begin
 
 	uri			:= TIdURI.Create( ReadURL );
@@ -1160,15 +1168,22 @@ begin
 
 		tmphost := uri.Host;
 
-		if (tmphost = BBS_HOST_OLD) or (tmphost = BBS_HOST_OLD2) then
+		if tmphost = BBS_HOST_OLD then
 			tmphost := BBS_HOST;
 
-		FileName := uriList[ 5 ] + '.dat';
-		// http://jbbs.livedoor.com/bbs/read.cgi/computer/351/1090404452/l100
-		// http://jbbs.livedoor.com/bbs/read.cgi/game/1578/1067968274/l100
-		// http://jbbs.livedoor.com/game/1000/subject.txt
-		Result		:= CreateResultString(
-			uri.Protocol + '://' + tmphost + '/' + uriList[ 3 ] + '/' + uriList[ 4 ] + '/' );
+		if( AnsiPos('.html', uri.Document) = 0 ) then begin //’ʏí
+			FileName := uriList[ 5 ] + '.dat';
+			// http://jbbs.livedoor.com/bbs/read.cgi/computer/351/1090404452/l100
+			// http://jbbs.livedoor.com/bbs/read.cgi/game/1578/1067968274/l100
+			// http://jbbs.livedoor.com/game/1000/subject.txt
+			Result		:= CreateResultString(
+				uri.Protocol + '://' + tmphost + '/' + uriList[ 3 ] + '/' + uriList[ 4 ] + '/' );
+		end else begin
+			//http://jbbs.livedoor.com/game/1578/storage/1086710948.html
+			Result	:= CreateResultString(
+				uri.Protocol + '://' + tmphost + CustomStringReplace(uri.Path, '/storage', ''));
+		end;
+
 	finally
 		uri.Free;
 		uriList.Free;
@@ -1218,8 +1233,7 @@ var
 	dir, tmphost		: string;
 const
 	BBS_HOST_OLD 	= 'jbbs.shitaraba.com';
-	BBS_HOST_OLD2   = 'jbbs.livedoor.com';
-	BBS_HOST		= 'jbbs.livedoor.jp';
+	BBS_HOST 			= 'jbbs.livedoor.com';
 begin
 
 	foundPos := AnsiPos( '?', URL );
@@ -1232,7 +1246,7 @@ begin
 			dir := uriList[ 1 ];
 
 			tmphost := uri.Host;
-			if (tmphost = BBS_HOST_OLD) or (tmphost = BBS_HOST_OLD2)  then
+			if tmphost = BBS_HOST_OLD  then
 				tmphost := BBS_HOST;
 
 			ExtractHttpFields( ['&'], [], Copy( URL, foundPos + 1, MaxInt ), uriList );
@@ -1254,7 +1268,7 @@ begin
 			ExtractHttpFields( ['/'], [], uri.Path, uriList );
 
 			tmphost := uri.Host;
-			if (tmphost = BBS_HOST_OLD) or (tmphost = BBS_HOST_OLD2)  then
+			if tmphost = BBS_HOST_OLD  then
 				tmphost := BBS_HOST;
 
 			if( AnsiPos(THREAD_MARK, URL) > 0) and (uriList.Count > 5) then begin
@@ -1265,8 +1279,7 @@ begin
 			end else if AnsiPos(THREAD_MARK, URL) = 0 then begin
 			//ƒRƒR‚ʼnߋŽƒƒO‚©‚Ç‚¤‚©ƒ`ƒFƒbƒNH
 				if(AnsiPos('.html/', uri.Path) > 0) then begin
-					Result := uri.Protocol + '://' + tmphost + THREAD_MARK +
-						CustomStringReplace(CustomStringReplace(uri.Path, '/storage', ''), '.html/', '/') + 'l100';
+					Result := uri.Protocol + '://' + tmphost + Copy(uri.Path, 1, Length(uri.Path) - 1);
 				end else
 					Result := URL;
 			end;
@@ -1291,8 +1304,7 @@ var
 	dir, tmphost			: string;
 const
 	BBS_HOST_OLD 	= 'jbbs.shitaraba.com';
-	BBS_HOST_OLD2   = 'jbbs.livedoor.com';
-	BBS_HOST		= 'jbbs.livedoor.jp';
+	BBS_HOST 			= 'jbbs.livedoor.com';
 begin
 
 	foundPos := AnsiPos( '?', URL );
@@ -1305,7 +1317,7 @@ begin
 			dir := uriList[ 1 ];
 
 			tmphost := uri.Host;
-			if (tmphost = BBS_HOST_OLD) or (tmphost = BBS_HOST_OLD2)  then
+			if tmphost = BBS_HOST_OLD  then
 				tmphost := BBS_HOST;
 
 			ExtractHttpFields( ['&'], [], Copy( URL, foundPos + 1, MaxInt ), uriList );
@@ -1327,13 +1339,19 @@ begin
 			ExtractHttpFields( ['/'], [], uri.Path, uriList );
 
 			tmphost := uri.Host;
-			if (tmphost = BBS_HOST_OLD) or (tmphost = BBS_HOST_OLD2)  then
+			if tmphost = BBS_HOST_OLD  then
 				tmphost := BBS_HOST;
 			// http://jbbs.livedoor.com/bbs/read.cgi/game/1578/1067968274/l100
 			if( AnsiPos(THREAD_MARK, URL) > 0) and (uriList.Count > 5) then begin
 				Result :=
 					uri.Protocol + '://' + tmphost + '/bbs/rawmode.cgi/' +
 					uriList[ 3 ] + '/' + uriList[ 4 ] + '/' + uriList[ 5 ] + '/';
+			end else if AnsiPos(THREAD_MARK, URL) = 0 then begin
+			//ƒRƒR‚ʼnߋŽƒƒO‚©‚Ç‚¤‚©ƒ`ƒFƒbƒNH
+				if(AnsiPos('.html/', uri.Path) > 0) then begin
+					Result := uri.Protocol + '://' + tmphost + Copy(uri.Path, 1, Length(uri.Path) - 1);
+				end else
+					Result := URL;
 			end;
 		finally
 			uri.Free;
@@ -1415,8 +1433,7 @@ var
 	uriList			: TStringList;
 const
 	BBS_HOST_OLD 	= 'jbbs.shitaraba.com';
-	BBS_HOST_OLD2   = 'jbbs.livedoor.com';
-	BBS_HOST		= 'jbbs.livedoor.jp';
+	BBS_HOST 			= 'jbbs.livedoor.com';
 begin
 
 	inherited;
@@ -1433,7 +1450,7 @@ begin
 	uri			:= TIdURI.Create( SubjectURL );
 	uriList	:= TStringList.Create;
 	try
-		if (uri.Host = BBS_HOST_OLD) or (uri.Host = BBS_HOST_OLD2) then
+		if uri.Host = BBS_HOST_OLD then
 			uri.Host := BBS_HOST;
 		URL := uri.Protocol + '://' + uri.Host + uri.Path;
 

--- a/res/skin/skin30-2G/Header.html
+++ b/res/skin/skin30-2G/Header.html
@@ -15,7 +15,7 @@
 var start_time = new Date();
 //==========ƒOƒ[ƒoƒ‹•Ï”
 var anchorHead="";
-var skinName="skin30-2 v3.3.09xx";
+var skinName="skin30-2 v3.1.11xx";
 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‚³‚ê‚é
@@ -27,22 +27,13 @@ function checkAnchor(href){if(!href){return(0)}
 //==========ƒŠƒ“ƒNÝ’è
 function addAnchor(inner,num){
  if(!t_url){threadurl()}
- var url=document.getElementsByName("ThreadURL")[0].content;
- if(url.match(/&/)){
-  return('<a href="../test/read.cgi?bbs='+t_bbs+'&key='+t_key+'&st='+inner+'&to='+inner+'&nofirst=true" target="_blank" onclick="blur()">'+num+'</a>')
- }else{
-  return('<a href="../test/read.cgi/'+t_bbs+'/'+t_key+'/'+inner+'" target="_blank" onclick="blur()">'+num+'</a>')
- }
+ return('<a href="../test/read.cgi/'+t_bbs+'/'+t_key+'/'+inner+'" target="_blank" onclick="blur()">'+num+'</a>')
 }
 // ƒXƒŒƒbƒhURL‚̎擾
 var t_url=false,t_domain,t_bbs,t_key;
 function threadurl(){
  var threadurl=document.getElementsByName("ThreadURL")[0].content;
- if(threadurl.match(/&/)){
-  threadurl.match(/bbs=(.*)&key=(\d*)/);
- }else{
-  threadurl.match(/^.*\/test\/read.cgi\/(.*)\/(.*)\//);
- }
+ threadurl.match(/^.*\/test\/read.cgi\/(.*)\/(.*)\//);
  t_url=true;
  t_bbs=RegExp.$1;
  t_key=RegExp.$2;

--- a/res/skin/skin30-2G/chie_event.js
+++ b/res/skin/skin30-2G/chie_event.js
@@ -2,8 +2,7 @@
 //ŠO•”ŠÖ”Ftohan
 //ŠO•”•Ï”FanchorHead,lightmode,getID,skinName,browser,dts
 //ƒ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‚݂̂̐ݒè
+var buffer=1; // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
 //========Clickˆ—¨search,‘¼
 	document.onclick = clickEvent;
 function clickEvent(){
@@ -41,19 +40,10 @@ function mouseOverEvent() {
   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,"");
-   e.href=e.href.replace(/\/ime.nu/g,"");
-  }else{
-   try{
-    e.title=decodeURI(e.innerText);
-   }catch(err){
-     // ShiftJIS,EUC-JP‚̃fƒR[ƒh‚Í–Ê“|‚¾‚©‚ç‚‚¯‚È‚¢B
-   }
-  }
+  e.href=e.href.replace(/>/g,"");
+  e.href=e.href.replace(/\/ime.nu/g,"");
   if     (checkAnchor(e.href)==2){insButton(e);return;}
   else if(checkAnchor(e.href)==1){
-   if(event.shiftKey){if(e.rel){e.href=e.rel}return}
    // ‘½’iƒ|ƒbƒvƒAƒbƒv
    var aNum=parseInt(e.sourceIndex)+1;
    if(!document.getElementById("p"+aNum)){
@@ -106,10 +96,10 @@ function scroll_End(){document.getElementsByTagName("DL")[0].lastChild.scrollInt
 // IMG
 function imgCommand(mode,s){
  if(!waited){
-  var nHTML='<div id="command" onclick="clearCommand()"><input type="button" onclick="allImageLoad(\'all\')" value="‘SƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="allImageLoad(\'new\')" value="VƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="removeError()" value="Error‰æ‘œíœ"><br></div>';
+  var nHTML='<div id="command" onclick="clearCommand()"><input type="button" onclick="allImageLoad(\'all\')" value="‘SƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="allImageLoad(\'new\')" value="VƒŒƒXˆêŠ‡“Ǎž"><br></div>';
   event.srcElement.parentElement.insertAdjacentHTML('beforeEnd',nHTML);
   if(skinName.match(/30-2/)){
-   //if(!lightmode){document.getElementById("command").insertAdjacentHTML('afterBegin','<input type="button" onclick="changePanel()" value="ƒpƒlƒ‹Ø‘Ö"><br>')}
+   if(!lightmode){document.getElementById("command").insertAdjacentHTML('afterBegin','<input type="button" onclick="changePanel()" value="ƒpƒlƒ‹Ø‘Ö"><br>')}
    document.getElementById("command").insertAdjacentHTML('beforeEnd','<input type="button" onclick="changeMode()" value="ƒ‚[ƒhØ‘Ö">')
   }
   waited=true;
@@ -119,7 +109,7 @@ function imgCommand(mode,s){
 }
 function clearCommand(){
  waited=false;
- document.getElementById("command").removeNode(true);
+ event.srcElement.parentElement.removeNode(true);
 }
 //=========¶’·‰Ÿˆ—¨copyMenu()
 	document.onmousedown=mousedownEvent;
@@ -132,7 +122,6 @@ function mousedownEvent(){
   clickTimer=setTimeout("copyMenu()",500);
  }
 }
-
 //ƒRƒs[ƒƒjƒ…[¨colorChange(),search::copyText()
 function copyMenu(){
  clickCancel=true; clearTimeout(clickTimer);
@@ -176,53 +165,27 @@ function key(){
  }
 }
 
-//=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“–¢‘Ήžƒuƒ‰ƒEƒU—pj©Timer–”‚ÍFooter‚©‚çŒÄ‚яo‚µ
-//=========‚©‚¿‚ãAABoneAƒ]ƒk‚Q
+//=========Loadi‘ã‘ցjˆ—iŠeFooter‚à‚µ‚­‚́AHeader‚ł̃‹[ƒv‚©‚çŒÄo‚µj
 var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
 var k=0;
-function loadEvent(num){ // Timer–”‚ÍFooter‚©‚ç
- //====V’…ƒŒƒXƒWƒƒƒ“ƒv
- if(newResJump==0){clearInterval(timerID);return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
- //V’…ƒŒƒX‚ÌŠJŽn”ԍ†‚ðŽæ“¾
- if     (browser=="‚©‚¿‚ã`‚µ‚á"){if(isNaN(newResNum)){while(dts[k]){if(dts[k].className=="new"){newResNum=parseInt(dts[k].firstChild.innerText);break;} k++;}}}
- else if(browser=="ƒzƒbƒgƒ]ƒk‚Q"){newResNum=num+1;}
+function loadEvent(){
+ //GetRescount‘ã‘Ö "”Žš‚Å‚È‚¯‚ê‚Î"
+ if(isNaN(newResNum)){while(dts[k]){if(dts[k].className=="new"){newResNum=parseInt(dts[k].firstChild.innerText);break;} k++; }}
+ //V’…ŠJŽnƒiƒ“ƒo[‚ðÝ’肵‚ăWƒƒƒ“ƒv
  var anc=document.anchors(anchorHead+newResNum);
- if(!anc || !anc.parentElement){return} // “§–¾‚ ‚ځ`‚ñ‚³‚ê‚Ä‚½‚çI—¹
- //V’…ƒŒƒXƒWƒƒƒ“ƒv
- scr=lightmode ? document.body : document.getElementById("dl");
- viewPos=scr.scrollTop+scr.clientHeight;// ƒXƒNƒ[ƒ‹Œã‚̉æ–ʉº•”ˆÊ’u
- endPos =anc.offsetTop+20;				// VƒŒƒXƒAƒ“ƒJ[ˆÊ’u
- //ÅŒã‚Ü‚Å“Ç—¹ or uí‚ɐV’…ƒWƒƒƒ“ƒvv‚È‚çƒWƒƒƒ“ƒv
- if(viewPos>endPos || newResJump==2){clearInterval(timerID);setTimeout("moveToNew("+newResNum+")",buffer*100)}
- else{firstNew=document.anchors(anchorHead+newResNum).parentElement.nextSibling;}
-}
-//=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“‘Ήžƒuƒ‰ƒEƒU—pj©NewMark‚©‚çŒÄ‚яo‚µ
-//=========OpenJAtwin
-var scr,viewPos,endPos=0;
-function reloadEvent(){
- //====Šù“lj»
- var lastDt=dts[dts.length-2];if(!lastDt){return}// ‘S•”V’…‚È‚çI—¹
- while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}
- //====V’…ƒŒƒXƒWƒƒƒ“ƒv
- if(newResJump==0){return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
- var ancs=document.anchors;
- var newResNum=parseInt(ancs[ancs.length-1].name)+1;
- scr=lightmode ? document.body : document.getElementById("dl");
- viewPos=scr.scrollTop;
- endPos =scr.scrollHeight-scr.clientHeight-20;
- //ÅŒã‚Ü‚Å“Ç—¹ or uí‚ɐV’…ƒWƒƒƒ“ƒvv‚È‚çƒWƒƒƒ“ƒv
- if(viewPos>endPos || newResJump==2){setTimeout("moveToNew("+newResNum+")",buffer*100);} 
+ if(anc && anc.parentElement){
+  if(buffer==0){clearInterval(timerID);moveToNew(newResNum);}
+  else         {buffer--;}
+ }
 }
-
 // V’…ƒŒƒXˆÚ“®{V’…ƒŒƒX‚̈ʒu‚ð‹L‰¯
 var firstNew;
 function moveToNew(num){
  firstNew=getDTfromAnc(num);
- while(!firstNew){num--;firstNew=getDTfromAnc(num);} //‘Ώۂª“§–¾‚ ‚ځ`‚ñ‚Ȃ琔‚ðŒ¸‚ç‚·
- firstNew.scrollIntoView(true);
+ if(firstNew){firstNew.scrollIntoView(true);}
 }
 
-//=========DoubleClickˆ—¨defaultPopup()
+//=========DblClickˆ—¨defaultPopup()
 	document.ondblclick=defaultPopup;
 function defaultPopup(){
  var num=document.selection.createRange().text.replace(/\s$/,"");
@@ -237,17 +200,4 @@ function defaultPopup(){
   obj.innerText="ID:"+num;
   search(obj);
  }
-}
-
-//=========Copyˆ—
-//head‚©‚ç“Ç‚Þ‚Æbody‚ÍŒ©‚¦‚È‚¢‚̂ŁAê—pƒuƒ‰ƒEƒU‚Ì“ÁŽ¿‚ð—˜—p‚µ‚Äbody‚ÌŒã‚ë‚ɏ‘‚«o‚·
-//–{—ˆ‚Ç‚¨‚èhead‚ɏ‘‚«o‚·SkinManager‘΍ô‚Å”»’è‚ðˆê‚“ü‚ê‚é
-	if(document.body) document.write('<script type="text/javascript">document.body.oncopy=copyEvent</script>\n');
-function copyEvent(){
- var textarea=document.createElement("TEXTAREA");
- textarea.value=document.selection.createRange().text.replace(/\s(\r\n|$)/g,"\n");
- var copyText=textarea.createTextRange();
- copyText.execCommand("Copy");
- return false; 
-}
-
+}
\ No newline at end of file

--- a/res/skin/skin30-2G/chie_image.js
+++ b/res/skin/skin30-2G/chie_image.js
@@ -2,8 +2,7 @@
 // ŠO•”ŠÖ”FaddAnchor
 // ŠO•”•Ï”Fcp,tp,vp,dds
 //======‰æ‘œ“Ǎž‚̐ݒè
-var onMouseLoad=true;	// true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
-var takeArisk=false; 	// true:‰æ‘œ“ǂݍž‚ÝŽž‚Ƀ‚[ƒhØ‘ցAfalse:Žè“®‚Ń‚[ƒhØ‘Ö
+var onMouseLoad=true;   // true:ƒJ[ƒ\ƒ‹‚ð‡‚í‚¹‚½‚¾‚¯Afalse:LOADƒ{ƒ^ƒ“‚ðƒNƒŠƒbƒN‚µ‚Ä‚©‚ç
 //==========ƒOƒ[ƒoƒ‹•Ï”
 //==========‰æ‘œˆ—“™
 var lightmode = true;
@@ -69,13 +68,12 @@ function insButton(a,hRH) {
 // ‰æ‘œ“Ǎž
 function loadImage(btn,href){
  if(!panel){changePanel()}
- if(takeArisk && lightmode){changeMode()}
  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);
+   thumbs[i].scrollIntoView(true);
    imgOver(thumbs[i],100);
    return true;
   }}
@@ -105,7 +103,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';setTimeout("viewed=false",3000)}
+ else                  {btn.value='NONE';btn.style.color='#C00';}
 }
 // ƒTƒCƒY‚̐ؑÖ
 function changeSize(btn){
@@ -124,15 +122,6 @@ function changeSize(btn){
 }
 // ƒTƒ€ƒlƒCƒ‹‚̍폜
 function removeThumb(btn){btn.parentElement.removeNode(true);}
-function removeError(){
- if(tp){
-  var l=tp.childNodes.length;
-  for(var i=l;i--;){
-   var stateBtn=tp.childNodes[i].childNodes[2];
-   if(stateBtn.tagName=="BUTTON" && stateBtn.innerText=="NONE"){stateBtn.parentElement.removeNode(true);}
-  }
- }
-}
 // ‰æ‘œ•\Ž¦‚̐ؑÖ
 function changeView(mode,href){
  if(!href){href=event.srcElement.src}

--- a/res/skin/skin30-2G/chie_popup.js
+++ b/res/skin/skin30-2G/chie_popup.js
@@ -15,7 +15,7 @@ var pb;
 function namePopup(e,before,num,after){
  var hnum=tohan(num);
  //‚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}}
+ if(before){if(hnum==3 || hnum==774 || hnum==4 || hnum==21 || hnum==1 || hnum==30){return}}
  e.outerHTML = "<b>"+before+"</b><b>"+addAnchor(hnum,num)+"</b><b>"+after+"</b>";
 }
 //=========Žã‚ ‚ځ`‚ñ‚̃|ƒbƒvƒAƒbƒv

--- a/res/skin/skin30-2G/chie_search.js
+++ b/res/skin/skin30-2G/chie_search.js
@@ -110,7 +110,7 @@ function clearResult(obj){
   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;}
+   if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;continue;}
    dt.removeNode(true); dd.removeNode(true);
   }
  }
@@ -144,7 +144,7 @@ function findIt(word){
 
 //==========‹tŽQÆ
 function searchRef(obj){
- if(obj.name!='referred'){
+ if(obj.name!='reffered'){
   var num=obj.firstChild.innerText;
   var l=dds.length;
   var found = new Array;
@@ -171,7 +171,7 @@ function searchRef(obj){
    if(exist){
     var dt=dds[i].previousSibling.cloneNode(true);
     found.unshift(dt.outerHTML.replace(/name=.*?>/,">")+dd.outerHTML.replace(/<a name=.*>/i,""));
-    obj.name="referred";
+    obj.name="reffered";
    }
   }
   if(found.length){returnRef(obj.nextSibling,found)}
@@ -190,12 +190,13 @@ function returnRef(dd,found){
 function copyText(target){
  var num=event.srcElement.parentElement.name;
  var obj=getDTfromAnc(num);
+ var decoy=document.createDocumentFragment();
  var textarea=document.createElement("TEXTAREA");
- var message=obj.nextSibling.innerText.replace(/\s(\r\n|$)/g,"\n");
- if     (target=="res") {textarea.value=obj.firstChild.innerText+" F"+obj.childNodes[1].innerText+" F"+obj.lastChild.innerText+"\n"+message;}
+ if     (target=="res") {textarea.value=obj.firstChild.innerText+" F"+obj.childNodes[1].innerText+" F"+obj.lastChild.innerText+"\n"+obj.nextSibling.innerText+"\n";}
  else if(target=="name"){textarea.value=obj.childNodes[1].innerText+"\n";}
- else if(target=="id")  {textarea.value="ID:"+(obj.lastChild.innerText.split(/ID:/))[1]+"\n";}
- var copyText=textarea.createTextRange();
+ else if(target=="id")  {textarea.value=obj.lastChild.innerText.substr(15)+"\n";}
+ decoy.appendChild(textarea);
+ var copyText=decoy.getElementsByTagName("TEXTAREA")[0].createTextRange();
  copyText.execCommand("Copy")
  event.srcElement.parentElement.removeNode(true);
 }

--- a/res/skin/skin30-3G/Header.html
+++ b/res/skin/skin30-3G/Header.html
@@ -15,11 +15,11 @@
 var start_time = new Date();
 //==========ƒOƒ[ƒoƒ‹•Ï”
 var anchorHead="";
-var skinName="skin30-3 v3.3.09xx";
+var skinName="skin30-3 v3.1.11xx";
 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‚³‚ê‚é
-function checkAnchor(href){if(!href){return(0)}
+function checkAnchor(href){
  if     (href.match(/decoy:|about:blank/)){return(1)}
  else if(href.match(/menu:|read\.cgi|2ch\.net\/.*\/kako/)){return(0)}
  else{return(2)}
@@ -27,22 +27,13 @@ function checkAnchor(href){if(!href){return(0)}
 //==========ƒŠƒ“ƒNÝ’è
 function addAnchor(inner,num){
  if(!t_url){threadurl()}
- var url=document.getElementsByName("ThreadURL")[0].content;
- if(url.match(/&/)){
-  return('<a href="../test/read.cgi?bbs='+t_bbs+'&key='+t_key+'&st='+inner+'&to='+inner+'&nofirst=true" target="_blank" onclick="blur()">'+num+'</a>')
- }else{
-  return('<a href="../test/read.cgi/'+t_bbs+'/'+t_key+'/'+inner+'" target="_blank" onclick="blur()">'+num+'</a>')
- }
+ return('<a href="../test/read.cgi/'+t_bbs+'/'+t_key+'/'+inner+'" target="_blank" onclick="blur()">'+num+'</a>')
 }
 // ƒXƒŒƒbƒhURL‚̎擾
 var t_url=false,t_domain,t_bbs,t_key;
 function threadurl(){
  var threadurl=document.getElementsByName("ThreadURL")[0].content;
- if(threadurl.match(/&/)){
-  threadurl.match(/bbs=(.*)&key=(\d*)/);
- }else{
-  threadurl.match(/^.*\/test\/read.cgi\/(.*)\/(.*)\//);
- }
+ threadurl.match(/^.*\/test\/read.cgi\/(.*)\/(.*)\//);
  t_url=true;
  t_bbs=RegExp.$1;
  t_key=RegExp.$2;

--- a/res/skin/skin30-3G/chie_event.js
+++ b/res/skin/skin30-3G/chie_event.js
@@ -2,8 +2,7 @@
 //ŠO•”ŠÖ”Ftohan
 //ŠO•”•Ï”FanchorHead,lightmode,getID,skinName,browser,dts
 //ƒ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‚݂̂̐ݒè
+var buffer=1; // ’ᑬ‰ñü‚â’ᑬƒ}ƒVƒ“‚̏ꍇ‚É‚Íbuffer‚̐”’l‚𑝂₷‚Æ‚æ‚萳Šm‚ɃWƒƒƒ“ƒvi1‘‚â‚·‚Æ0.1•b’x‚ê‚éj
 //========Clickˆ—¨search,‘¼
 	document.onclick = clickEvent;
 function clickEvent(){
@@ -41,19 +40,10 @@ function mouseOverEvent() {
   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,"");
-   e.href=e.href.replace(/\/ime.nu/g,"");
-  }else{
-   try{
-    e.title=decodeURI(e.innerText);
-   }catch(err){
-     // ShiftJIS,EUC-JP‚̃fƒR[ƒh‚Í–Ê“|‚¾‚©‚ç‚‚¯‚È‚¢B
-   }
-  }
+  e.href=e.href.replace(/>/g,"");
+  e.href=e.href.replace(/\/ime.nu/g,"");
   if     (checkAnchor(e.href)==2){insButton(e);return;}
   else if(checkAnchor(e.href)==1){
-   if(event.shiftKey){if(e.rel){e.href=e.rel}return}
    // ‘½’iƒ|ƒbƒvƒAƒbƒv
    var aNum=parseInt(e.sourceIndex)+1;
    if(!document.getElementById("p"+aNum)){
@@ -106,10 +96,10 @@ function scroll_End(){document.getElementsByTagName("DL")[0].lastChild.scrollInt
 // IMG
 function imgCommand(mode,s){
  if(!waited){
-  var nHTML='<div id="command" onclick="clearCommand()"><input type="button" onclick="allImageLoad(\'all\')" value="‘SƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="allImageLoad(\'new\')" value="VƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="removeError()" value="Error‰æ‘œíœ"><br></div>';
+  var nHTML='<div id="command" onclick="clearCommand()"><input type="button" onclick="allImageLoad(\'all\')" value="‘SƒŒƒXˆêŠ‡“Ǎž"><br><input type="button" onclick="allImageLoad(\'new\')" value="VƒŒƒXˆêŠ‡“Ǎž"><br></div>';
   event.srcElement.parentElement.insertAdjacentHTML('beforeEnd',nHTML);
   if(skinName.match(/30-2/)){
-   //if(!lightmode){document.getElementById("command").insertAdjacentHTML('afterBegin','<input type="button" onclick="changePanel()" value="ƒpƒlƒ‹Ø‘Ö"><br>')}
+   if(!lightmode){document.getElementById("command").insertAdjacentHTML('afterBegin','<input type="button" onclick="changePanel()" value="ƒpƒlƒ‹Ø‘Ö"><br>')}
    document.getElementById("command").insertAdjacentHTML('beforeEnd','<input type="button" onclick="changeMode()" value="ƒ‚[ƒhØ‘Ö">')
   }
   waited=true;
@@ -119,7 +109,7 @@ function imgCommand(mode,s){
 }
 function clearCommand(){
  waited=false;
- document.getElementById("command").removeNode(true);
+ event.srcElement.parentElement.removeNode(true);
 }
 //=========¶’·‰Ÿˆ—¨copyMenu()
 	document.onmousedown=mousedownEvent;
@@ -132,7 +122,6 @@ function mousedownEvent(){
   clickTimer=setTimeout("copyMenu()",500);
  }
 }
-
 //ƒRƒs[ƒƒjƒ…[¨colorChange(),search::copyText()
 function copyMenu(){
  clickCancel=true; clearTimeout(clickTimer);
@@ -176,53 +165,27 @@ function key(){
  }
 }
 
-//=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“–¢‘Ήžƒuƒ‰ƒEƒU—pj©Timer–”‚ÍFooter‚©‚çŒÄ‚яo‚µ
-//=========‚©‚¿‚ãAABoneAƒ]ƒk‚Q
+//=========Loadi‘ã‘ցjˆ—iŠeFooter‚à‚µ‚­‚́AHeader‚ł̃‹[ƒv‚©‚çŒÄo‚µj
 var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
 var k=0;
-function loadEvent(num){ // Timer–”‚ÍFooter‚©‚ç
- //====V’…ƒŒƒXƒWƒƒƒ“ƒv
- if(newResJump==0){clearInterval(timerID);return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
- //V’…ƒŒƒX‚ÌŠJŽn”ԍ†‚ðŽæ“¾
- if     (browser=="‚©‚¿‚ã`‚µ‚á"){if(isNaN(newResNum)){while(dts[k]){if(dts[k].className=="new"){newResNum=parseInt(dts[k].firstChild.innerText);break;} k++;}}}
- else if(browser=="ƒzƒbƒgƒ]ƒk‚Q"){newResNum=num+1;}
+function loadEvent(){
+ //GetRescount‘ã‘Ö "”Žš‚Å‚È‚¯‚ê‚Î"
+ if(isNaN(newResNum)){while(dts[k]){if(dts[k].className=="new"){newResNum=parseInt(dts[k].firstChild.innerText);break;} k++; }}
+ //V’…ŠJŽnƒiƒ“ƒo[‚ðÝ’肵‚ăWƒƒƒ“ƒv
  var anc=document.anchors(anchorHead+newResNum);
- if(!anc || !anc.parentElement){return} // “§–¾‚ ‚ځ`‚ñ‚³‚ê‚Ä‚½‚çI—¹
- //V’…ƒŒƒXƒWƒƒƒ“ƒv
- scr=lightmode ? document.body : document.getElementById("dl");
- viewPos=scr.scrollTop+scr.clientHeight;// ƒXƒNƒ[ƒ‹Œã‚̉æ–ʉº•”ˆÊ’u
- endPos =anc.offsetTop+20;				// VƒŒƒXƒAƒ“ƒJ[ˆÊ’u
- //ÅŒã‚Ü‚Å“Ç—¹ or uí‚ɐV’…ƒWƒƒƒ“ƒvv‚È‚çƒWƒƒƒ“ƒv
- if(viewPos>endPos || newResJump==2){clearInterval(timerID);setTimeout("moveToNew("+newResNum+")",buffer*100)}
- else{firstNew=document.anchors(anchorHead+newResNum).parentElement.nextSibling;}
-}
-//=========V’…ƒŒƒXŽæ“¾Œãˆ—i•W€ƒXƒLƒ“‘Ήžƒuƒ‰ƒEƒU—pj©NewMark‚©‚çŒÄ‚яo‚µ
-//=========OpenJAtwin
-var scr,viewPos,endPos=0;
-function reloadEvent(){
- //====Šù“lj»
- var lastDt=dts[dts.length-2];if(!lastDt){return}// ‘S•”V’…‚È‚çI—¹
- while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}
- //====V’…ƒŒƒXƒWƒƒƒ“ƒv
- if(newResJump==0){return} //uƒuƒ‰ƒEƒU”C‚¹v‚È‚çI—¹
- var ancs=document.anchors;
- var newResNum=parseInt(ancs[ancs.length-1].name)+1;
- scr=lightmode ? document.body : document.getElementById("dl");
- viewPos=scr.scrollTop;
- endPos =scr.scrollHeight-scr.clientHeight-20;
- //ÅŒã‚Ü‚Å“Ç—¹ or uí‚ɐV’…ƒWƒƒƒ“ƒvv‚È‚çƒWƒƒƒ“ƒv
- if(viewPos>endPos || newResJump==2){setTimeout("moveToNew("+newResNum+")",buffer*100);} 
+ if(anc && anc.parentElement){
+  if(buffer==0){clearInterval(timerID);moveToNew(newResNum);}
+  else         {buffer--;}
+ }
 }
-
 // V’…ƒŒƒXˆÚ“®{V’…ƒŒƒX‚̈ʒu‚ð‹L‰¯
 var firstNew;
 function moveToNew(num){
  firstNew=getDTfromAnc(num);
- while(!firstNew){num--;firstNew=getDTfromAnc(num);} //‘Ώۂª“§–¾‚ ‚ځ`‚ñ‚Ȃ琔‚ðŒ¸‚ç‚·
- firstNew.scrollIntoView(true);
+ if(firstNew){firstNew.scrollIntoView(true);}
 }
 
-//=========DoubleClickˆ—¨defaultPopup()
+//=========DblClickˆ—¨defaultPopup()
 	document.ondblclick=defaultPopup;
 function defaultPopup(){
  var num=document.selection.createRange().text.replace(/\s$/,"");
@@ -237,17 +200,4 @@ function defaultPopup(){
   obj.innerText="ID:"+num;
   search(obj);
  }
-}
-
-//=========Copyˆ—
-//head‚©‚ç“Ç‚Þ‚Æbody‚ÍŒ©‚¦‚È‚¢‚̂ŁAê—pƒuƒ‰ƒEƒU‚Ì“ÁŽ¿‚ð—˜—p‚µ‚Äbody‚ÌŒã‚ë‚ɏ‘‚«o‚·
-//–{—ˆ‚Ç‚¨‚èhead‚ɏ‘‚«o‚·SkinManager‘΍ô‚Å”»’è‚ðˆê‚“ü‚ê‚é
-	if(document.body) document.write('<script type="text/javascript">document.body.oncopy=copyEvent</script>\n');
-function copyEvent(){
- var textarea=document.createElement("TEXTAREA");
- textarea.value=document.selection.createRange().text.replace(/\s(\r\n|$)/g,"\n");
- var copyText=textarea.createTextRange();
- copyText.execCommand("Copy");
- return false; 
-}
-
+}
\ No newline at end of file

--- a/res/skin/skin30-3G/chie_popup.js
+++ b/res/skin/skin30-3G/chie_popup.js
@@ -15,7 +15,7 @@ var pb;
 function namePopup(e,before,num,after){
  var hnum=tohan(num);
  //‚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}}
+ if(before){if(hnum==3 || hnum==774 || hnum==4 || hnum==21 || hnum==1 || hnum==30){return}}
  e.outerHTML = "<b>"+before+"</b><b>"+addAnchor(hnum,num)+"</b><b>"+after+"</b>";
 }
 //=========Žã‚ ‚ځ`‚ñ‚̃|ƒbƒvƒAƒbƒv

--- a/res/skin/skin30-3G/chie_search.js
+++ b/res/skin/skin30-3G/chie_search.js
@@ -110,7 +110,7 @@ function clearResult(obj){
   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;}
+   if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;continue;}
    dt.removeNode(true); dd.removeNode(true);
   }
  }
@@ -144,7 +144,7 @@ function findIt(word){
 
 //==========‹tŽQÆ
 function searchRef(obj){
- if(obj.name!='referred'){
+ if(obj.name!='reffered'){
   var num=obj.firstChild.innerText;
   var l=dds.length;
   var found = new Array;
@@ -171,7 +171,7 @@ function searchRef(obj){
    if(exist){
     var dt=dds[i].previousSibling.cloneNode(true);
     found.unshift(dt.outerHTML.replace(/name=.*?>/,">")+dd.outerHTML.replace(/<a name=.*>/i,""));
-    obj.name="referred";
+    obj.name="reffered";
    }
   }
   if(found.length){returnRef(obj.nextSibling,found)}
@@ -190,12 +190,13 @@ function returnRef(dd,found){
 function copyText(target){
  var num=event.srcElement.parentElement.name;
  var obj=getDTfromAnc(num);
+ var decoy=document.createDocumentFragment();
  var textarea=document.createElement("TEXTAREA");
- var message=obj.nextSibling.innerText.replace(/\s(\r\n|$)/g,"\n");
- if     (target=="res") {textarea.value=obj.firstChild.innerText+" F"+obj.childNodes[1].innerText+" F"+obj.lastChild.innerText+"\n"+message;}
+ if     (target=="res") {textarea.value=obj.firstChild.innerText+" F"+obj.childNodes[1].innerText+" F"+obj.lastChild.innerText+"\n"+obj.nextSibling.innerText+"\n";}
  else if(target=="name"){textarea.value=obj.childNodes[1].innerText+"\n";}
- else if(target=="id")  {textarea.value="ID:"+(obj.lastChild.innerText.split(/ID:/))[1]+"\n";}
- var copyText=textarea.createTextRange();
+ else if(target=="id")  {textarea.value=obj.lastChild.innerText.substr(15)+"\n";}
+ decoy.appendChild(textarea);
+ var copyText=decoy.getElementsByTagName("TEXTAREA")[0].createTextRange();
  copyText.execCommand("Copy")
  event.srcElement.parentElement.removeNode(true);
 }