提交: 156bf263201930bd9de562caddd3c7c767c26343 - gikonavi (git)

ギコナビ

Commit MetaInfo

• 修訂: 156bf263201930bd9de562caddd3c7c767c26343 (tree)
• 時間: 2006-02-19 03:52:11
• 作者: cvs2git <cvs2git>
• Commiter: cvs2git

Log Message

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

Change Summary

• modified: Editor.dfm
• modified: Editor.pas
• modified: Favorite.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: HTMLCreate.pas
• add: InputAssist.dfm
• add: InputAssist.pas
• add: InputAssistDataModule.dfm
• add: InputAssistDataModule.pas
• modified: KeySetting.pas
• modified: ListViewUtils.pas
• modified: MojuUtils.pas
• modified: Setting.pas
• modified: Sort.pas
• modified: gikoNavi.dpr
• modified: gikoNavi.res
• add: readme/InputAssist.ini
• modified: readme/Samba.default
• modified: readme/readme.txt
• modified: readme/setup.INF

差異

--- a/Editor.dfm
+++ b/Editor.dfm
@@ -1,6 +1,6 @@
 object EditorForm: TEditorForm
-  Left = 328
-  Top = 257
+  Left = 432
+  Top = 258
   Width = 640
   Height = 449
   HorzScrollBar.Visible = False
@@ -58,24 +58,14 @@ object EditorForm: TEditorForm
     Top = 30
     Width = 632
     Height = 354
-    ActivePage = RocalRuleTab
+    ActivePage = EditorTab
     Align = alClient
     MultiLine = True
-    TabIndex = 4
+    TabIndex = 0
     TabOrder = 0
     OnChange = EditorPageChange
     object EditorTab: TTabSheet
       Caption = #32232#38598
-      object BodyEdit: TMemo
-        Left = 0
-        Top = 60
-        Width = 624
-        Height = 267
-        Align = alClient
-        ScrollBars = ssBoth
-        TabOrder = 0
-        WordWrap = False
-      end
       object NameBasePanel: TPanel
         Left = 0
         Top = 29
@@ -83,7 +73,7 @@ object EditorForm: TEditorForm
         Height = 31
         Align = alTop
         BevelOuter = bvNone
-        TabOrder = 2
+        TabOrder = 1
         object NameLabel: TLabel
           Left = 4
           Top = 8
@@ -144,7 +134,7 @@ object EditorForm: TEditorForm
         Height = 29
         Align = alTop
         BevelOuter = bvNone
-        TabOrder = 1
+        TabOrder = 0
         object Label1: TLabel
           Left = 4
           Top = 8
@@ -161,6 +151,16 @@ object EditorForm: TEditorForm
           TabOrder = 0
         end
       end
+      object BodyEdit: TMemo
+        Left = 0
+        Top = 60
+        Width = 624
+        Height = 267
+        Align = alClient
+        ScrollBars = ssBoth
+        TabOrder = 2
+        WordWrap = False
+      end
     end
     object PreviewTab: TTabSheet
       Caption = #12503#12524#12499#12517#12540
@@ -343,6 +343,19 @@ object EditorForm: TEditorForm
       Action = BeLogInOutEAction
       Style = tbsCheck
     end
+    object ToolButton8: TToolButton
+      Left = 285
+      Top = 0
+      Width = 8
+      Caption = 'ToolButton8'
+      ImageIndex = 11
+      Style = tbsSeparator
+    end
+    object ToolButton9: TToolButton
+      Left = 293
+      Top = 0
+      Action = ShowInputAssistForm
+    end
   end
   object MainMenu: TMainMenu
     Left = 8
@@ -469,7 +482,7 @@ object EditorForm: TEditorForm
     Left = 72
     Top = 124
     Bitmap = {
-      494C01010B000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -989,11 +1002,11 @@ object EditorForm: TEditorForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000F81FFFFFFFFF0000E007FDFFF81F0000
-      C003F17FF00F00008001E05FE00700008001C017C00300000000800580010000
-      0000000180010000000000018001000000008001800100000000E00180010000
-      0000F803800100008001FE07C00300008001FF8FE0070000C003FFFFF00F0000
-      E007FFFFF81F0000F81FFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
+      00000000000000000000000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
+      C003F17FF00FF9F38001E05FE007F9F38001C017C003F80300008005800184E7
+      000000018001CCE7000000018001CE4F000080018001CE4F0000E0018001CE4F
+      0000F8038001CF1F8001FE07C0038F1F8001FF8FE007FFFFC003FFFFF00F8FFF
+      E007FFFFF81F8FFFF81FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
       FE00C000F000F000FE008000F000F000FE008000F000F0008000800000000000
       8000800070000000800080017000000080008001700000008001800170000000
       8003800170000000800780017FDF001F807F8001001F001F80FFC003001F001F
@@ -1001,14 +1014,13 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFF7F887
       0003003FC1F7FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF7FEBF0003CC00FF0FFC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
-      000000000000}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
   end
   object HotToobarImageList: TImageList
     Left = 104
     Top = 124
     Bitmap = {
-      494C01010B000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000004000000001002000000000000040
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1528,11 +1540,11 @@ object EditorForm: TEditorForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000F81FFFFFFFFF0000E007FDFFF81F0000
-      C003F17FF00F00008001E05FE00700008001C017C00300000000000580010000
-      0000000180010000000000018001000000008001800100000000E00180010000
-      0000F803800100008001FE07C00300008001FF8FE0070000C003FFFFF00F0000
-      E007FFFFF81F0000F81FFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
+      00000000000000000000000000000000F81FFFFFFFFFFFFFE007FDFFF81FF3F9
+      C003F17FF00FF9F38001E05FE007F9F38001C017C003F80300000005800184E7
+      000000018001CCE7000000018001CE4F000080018001CE4F0000E0018001CE4F
+      0000F8038001CF1F8001FE07C0038F1F8001FF8FE007FFFFC003FFFFF00F8FFF
+      E007FFFFF81F8FFFF81FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE00FFFFFFFF
       FE00C000F000F000FE008000F000F000FE008000F000F0008000800000000000
       8000800070000000800080017000000080008001700000008001800170000000
       8003800170000000800780017FDF001F807F8001001F001F80FFC003001F001F
@@ -1540,8 +1552,7 @@ object EditorForm: TEditorForm
       FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFE7F887
       0003003FC1F3FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
       0003C400DCF3FEBF0003CC00FF07FC9F0003D400FFFFFDDF0003F800FFFFFDDF
-      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
-      000000000000}
+      FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
   end
   object Indy: TIdHTTP
     Intercept = IdLogDebug
@@ -1733,6 +1744,19 @@ object EditorForm: TEditorForm
       OnExecute = UpdateSambaActionExecute
       OnUpdate = UpdateSambaActionUpdate
     end
+    object InputAssistAction: TAction
+      Tag = -1
+      Category = #32232#38598
+      Caption = #20837#21147#12450#12471#12473#12488
+      OnExecute = InputAssistActionExecute
+    end
+    object ShowInputAssistForm: TAction
+      Category = #32232#38598
+      Caption = #20837#21147#12450#12471#12473#12488#12501#12457#12540#12512#21628#12403#20986#12375
+      Hint = #20837#21147#12450#12471#12473#12488#12501#12457#12540#12512#12434#21628#12403#20986#12377
+      ImageIndex = 11
+      OnExecute = ShowInputAssistFormExecute
+    end
   end
   object IdLogDebug: TIdLogDebug
     OnReceive = IdLogDebugReceive
@@ -1748,4 +1772,16 @@ object EditorForm: TEditorForm
     Left = 233
     Top = 123
   end
+  object InputAssistPopupMenu: TPopupMenu
+    AutoHotkeys = maManual
+    AutoPopup = False
+    OwnerDraw = True
+    Left = 272
+    Top = 128
+  end
+  object ApplicationEvents1: TApplicationEvents
+    OnMessage = ApplicationEvents1Message
+    Left = 304
+    Top = 128
+  end
 end

--- a/Editor.pas
+++ b/Editor.pas
@@ -17,7 +17,7 @@ uses
 	IdAntiFreezeBase,	IdAntiFreeze, IdBaseComponent, IdComponent,
 	IdTCPConnection, IdTCPClient, IdHTTP, ActnList, StdActns, IdIntercept,
 	IdLogBase, IdLogDebug, IdException, DateUtils,  bmRegExp,
-	Gesture;
+	Gesture, AppEvnts;
 
 type
 //	TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
@@ -44,7 +44,6 @@ type
 		N02: TMenuItem;
 		ToolBarImageList: TImageList;
 		HotToobarImageList: TImageList;
-		BodyEdit: TMemo;
 		NameBasePanel: TPanel;
 		NameLabel: TLabel;
 		MailLabel: TLabel;
@@ -127,6 +126,13 @@ type
     UpdateSambaAction: TAction;
     Samba241: TMenuItem;
     N7: TMenuItem;
+    InputAssistAction: TAction;
+    InputAssistPopupMenu: TPopupMenu;
+    BodyEdit: TMemo;
+    ApplicationEvents1: TApplicationEvents;
+    ToolButton8: TToolButton;
+    ToolButton9: TToolButton;
+    ShowInputAssistForm: TAction;
 
 		procedure EditorPageChange(Sender: TObject);
 		procedure FormCreate(Sender: TObject);
@@ -181,6 +187,10 @@ type
     procedure BeLogInOutEActionUpdate(Sender: TObject);
     procedure UpdateSambaActionUpdate(Sender: TObject);
     procedure UpdateSambaActionExecute(Sender: TObject);
+    procedure InputAssistActionExecute(Sender: TObject);
+    procedure ApplicationEvents1Message(var Msg: tagMSG;
+      var Handled: Boolean);
+    procedure ShowInputAssistFormExecute(Sender: TObject);
 	private
 		FThreadItem: TThreadItem;
 		FBoard: TBoard;
@@ -195,6 +205,8 @@ type
 		FHost: string;
 		FNow: TDateTime;
 		FGestures	: TMouseGesture;
+		FInputAssistKey: String;	///< “ü—̓AƒVƒXƒg‚̃L[
+		FResistWords: TStringList;	///< “ü—̓AƒVƒXƒg‚ÌŽ«‘‚©‚ç‚ÌŒŸõŒ‹‰Ê
 		procedure Preview;
 		function RepHtml(s: string): string;
 		function Check: Boolean;
@@ -244,21 +256,25 @@ type
 				function LFusianaGet(s: String): Boolean;
 		// Cookie‚̎擾
 		procedure GetCookie(Rawtext: String; ABoard: TBoard);
+		//! “ü—̓AƒVƒXƒg‚̃|ƒbƒvƒAƒbƒvƒƒjƒ…[‚̃NƒŠƒbƒNƒCƒxƒ“ƒg
+		procedure InputAssistMenuClick(Sender: TObject);
+		//! TMemo‚̃J[ƒ\ƒ‹ˆÊ’u‚É•¶Žš—ñ‘}“ü
+		procedure InsertText(Memo: TMemo; Text: String);
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 	public
-				FBBSID: String;
+		FBBSID: String;
 		procedure SetFont;
 		procedure SetThreadItem(Item: TThreadItem);
 		procedure SetBoard(Item: TBoard);
-				property BBSID: string read FBBSID write FBBSID;
-
+		property BBSID: string read FBBSID write FBBSID;
 	end;
 
 implementation
 
 uses
-	Giko, ItemDownload, MojuUtils, IdGlobal, GikoMessage;
+	Giko, ItemDownload, MojuUtils, IdGlobal, GikoMessage,  Imm,
+  InputAssistDataModule, InputAssist;
 const
 	CAPTION_NAME_NEW: string = 'ƒMƒRƒiƒr ƒXƒŒ—§‚ăGƒfƒBƒ^';
 	CAPTION_NAME_RES: string = 'ƒMƒRƒiƒr ƒŒƒXƒGƒfƒBƒ^';
@@ -427,7 +443,8 @@ begin
 		finally
 			ini.Free;
 		end;
-
+	// ƒL[Ý’è‚̓ǂݍž‚Ý
+	GikoSys.LoadKeySetting(ActionList, GikoSys.GetEditorKeyFileName);
 	// ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[‚̃Cƒ“ƒXƒg[ƒ‹
 	if GikoSys.Setting.GestureEnabled then begin
 		MouseGesture.UnHook;
@@ -930,33 +947,35 @@ begin
 
 	                        if ABoard = nil then Exit;
 
-                                if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
-                                        body := TStringList.Create;
-                                        try
-                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                Remote := GetFusianaName(body, ABoard);
-                                        finally
-                                                body.Free;
-                                        end;
-                                end;
-
-                                //Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾
-                                //ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤‚Å•|‚¢EEE
-                                if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
-                                        //GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA
+								if FileExists(ABoard.GetSETTINGTXTFileName)  then begin
+										body := TStringList.Create;
+										try
+												body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+												Remote := GetFusianaName(body, ABoard);
+										finally
+												body.Free;
+										end;
+								end;
+
+								//Setting.txt‚ª‚È‚©‚Á‚½‚çŽæ“¾
+								//ŽI‚É•‰‰×‚ª‚©‚©‚è‚»‚¤‚Å•|‚¢EEE
+								if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
+										//GetSETTINGTXTAction‚ðŒÄ‚яo‚·‚ÆIndy‚ª‰Šú‰»‚³‚ê‚é‚̂ŁA
 										//‚±‚±‚ÅCookie‚ð•Û‘¶‚µ‚È‚­‚Ä‚Í‚¢‚¯‚È‚¢
 										tmpRawheader := Indy.Response.RawHeaders.Text;
 										GetSETTINGTXTAction.Execute;
 										body := TStringList.Create;
 										try
-                                                body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
-                                                Remote := GetFusianaName(body, ABoard);
-                                        finally
-                                                body.Free;
-                                        end;
+												if FileExists(ABoard.GetSETTINGTXTFileName) then begin
+													body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
+													Remote := GetFusianaName(body, ABoard);
+												end;
+										finally
+												body.Free;
+										end;
                                 end;
 
-                                if Remote = 'fusianasan' then begin
+								if Remote = 'fusianasan' then begin
 				        MsgResult := MsgBox(
 					        	Handle,
 					        'ƒŠƒ‚[ƒgƒzƒXƒg‚ð•\Ž¦‚·‚é‹@”\‚ªŽg‚í‚ê‚Ä‚¢‚Ü‚·' + #13#10 +
@@ -971,8 +990,8 @@ begin
 					        EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
 					        DrawMenuBar(Handle);
 					        Exit;
-				        end;
-                                end;
+						end;
+								end;
                         end;
 
 			if ResultType = grtOK then begin
@@ -1214,7 +1233,7 @@ begin
 		ini.WriteInteger(sDate, 'Status', FStatusCode);
 		ini.WriteDateTime(sDate, 'Date', Now);
 		if FThreadItem = nil then begin
-			ini.WriteString(sDate, 'Title', TitleEdit.Text);
+			ini.WriteString(sDate, 'Title', MojuUtils.Sanitize(TitleEdit.Text));
 			ini.WriteString(sDate, 'BBS', FBoard.BBSID);
 			ini.WriteInteger(sDate, 'NewThread', 1);
 		end else begin
@@ -1731,9 +1750,6 @@ var
 	settingBody: TStringList;
 	tmpBoard: TBoard;
 begin
-        if FWork then
-		Exit;
-        FWork := True;
 
 	InitIdHTTP(Indy);
 	if FThreadItem = nil then
@@ -1784,7 +1800,6 @@ begin
 	end;
 	ShowBoardInformation(tmpBoard, BoardInformationMemo);
 
-        FWork := False;
 end;
 
 procedure TEditorForm.ShowBoardInformation(ABoard: TBoard; AMemo: TMemo);
@@ -2211,4 +2226,183 @@ begin
 	end;
 end;
 
+procedure TEditorForm.InputAssistActionExecute(Sender: TObject);
+var
+	count, i : Integer;
+	item : TMenuItem;
+	point: TPoint;
+	Bitmap : TBitmap;
+	TextWidth, ItemWidth, tmpWidth: Integer;
+begin
+	if FInputAssistKey = '' then Exit;
+
+	InputAssistPopupMenu.Items.Clear;
+
+	if (FResistWords = nil) then begin
+		FResistWords := TStringList.Create;
+	end else begin
+		FResistWords.Clear;
+	end;
+
+	if (GetKeyState( VK_SHIFT ) < 0) then begin
+		// ƒVƒtƒg‚ª‰Ÿ‚³‚ê‚Ä‚¢‚ê‚΁AƒL[‚ÅŽn‚Ü‚éƒJƒeƒSƒŠ
+		count :=
+			InputAssistDM.GetStartWithCategoryResistWords(
+									FInputAssistKey, FResistWords);
+	end else begin
+		// ƒVƒtƒg‚ª–³‚¢‚̂ŁAƒL[‚ÅŽn‚Ü‚éƒL[
+		count :=
+			InputAssistDM.GetStartWithKeyResistWords(
+									FInputAssistKey, FResistWords);
+	end;
+	Bitmap := TBitmap.Create;
+	try
+		Bitmap.Canvas.Font.Assign(BodyEdit.Font);
+		// ƒ}[ƒWƒ“5px
+		TextWidth := Bitmap.Canvas.TextWidth(FInputAssistKey) + 5;
+		ItemWidth := 0;
+		for i := 0 to count - 1 do begin
+			item := TMenuItem.Create(nil);
+			item.Break := mbNone;
+			item.Caption := FResistWords[i];
+			item.Tag := i;
+			item.OnClick := InputAssistMenuClick;
+			InputAssistPopupMenu.Items.Add(item);
+
+			tmpWidth := Bitmap.Canvas.TextWidth(Item.Caption);
+			if (tmpWidth > ItemWidth) then begin
+				ItemWidth := tmpWidth;
+			end;
+		end;
+	finally
+		Bitmap.Free;
+	end;
+
+	if (count > 0) then begin
+		GetCaretpos(point);
+		point.X := point.X + Self.Left + (Self.Width - BodyEdit.Width) div 2;
+		point.Y := point.Y + Self.Top + (Self.Height - Self.ClientHeight);
+
+		if Screen.DesktopWidth >
+			(point.X + TextWidth + ItemWidth) then begin
+			InputAssistPopupMenu.Popup(
+				point.X + TextWidth,
+				point.Y + EditorPage.Top + EditorPage.TabHeight + BodyEdit.Top);
+		end else begin
+			InputAssistPopupMenu.Popup(
+				point.X - TextWidth - ItemWidth,
+				point.Y + EditorPage.Top + EditorPage.TabHeight + BodyEdit.Top);
+		end;
+	end;
+end;
+
+procedure TEditorForm.InputAssistMenuClick(Sender: TObject);
+var
+	text : String;
+	IMC: HIMC;
+begin
+	if not (Sender is TMenuItem) then Exit;
+
+	if (FResistWords <> nil) then begin
+		try
+			text :=
+				TResistWord(FResistWords.Objects[TMenuItem(Sender).Tag]).GetText;
+		except
+			text := '';
+		end;
+		IMC := ImmGetContext(BodyEdit.Handle); //ƒRƒ“ƒeƒLƒXƒgŽæ“¾
+		try
+			ImmNotifyIME(IMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
+		finally
+			ImmReleaseContext(BodyEdit.Handle, IMC);  //ƒRƒ“ƒeƒLƒXƒg‰ð•ú
+		end;
+
+		FResistWords.Clear;
+		FInputAssistKey := '';
+	end;
+	InsertText(BodyEdit, text);
+end;
+
+//! TMemo‚̃J[ƒ\ƒ‹ˆÊ’u‚É•¶Žš—ñ‘}“ü
+procedure TEditorForm.InsertText(Memo: TMemo; Text: String);
+var
+	line, sel, pos: Integer;
+	left, right : String;
+begin
+	Memo.Lines.BeginUpdate;
+	line := SendMessage(Memo.Handle,EM_LINEFROMCHAR,-1,0);  //s
+	sel := Memo.SelStart;
+	pos	:= sel - SendMessage(Memo.Handle, EM_LINEINDEX, -1, 0); //Œ…
+	if (pos > 0) then begin
+		left := Copy(Memo.Lines[line], 0, pos);
+	end else begin
+		left := '';
+	end;
+	right := Copy(Memo.Lines[line], pos + 1, Length(Memo.Lines[line]));
+	Memo.Lines.Strings[line] := left + Text + right;
+	Memo.Lines.EndUpdate;
+	//@ƒLƒƒƒŒƒbƒg‚̈ʒu‚ðXV‚·‚é
+	Memo.SelStart := sel + Length(text);
+	// ƒLƒƒƒŒƒbƒg‚̈ʒu‚܂ŃXƒNƒ[ƒ‹
+	Memo.Perform(EM_SCROLLCARET, 0, 0);
+
+end;
+
+procedure TEditorForm.ApplicationEvents1Message(var Msg: tagMSG;
+  var Handled: Boolean);
+var
+	wmMsg: TWMKey;
+	IMC: HIMC;
+	Len: integer;
+	Str: string;
+begin
+	if (Self.Active) then begin
+		case Msg.message of
+			//ƒL[‰Ÿ‰º‚̂ݎ󂯎æ‚é
+			WM_KEYDOWN:
+			begin
+				// ƒ^ƒu‚ªh•ÒWh‚ÅCtrlƒL[‚ª‰Ÿ‚³‚ê‚Ä‚¢‚é‚Ì‚ðŠm”F‚·‚é
+				if (EditorPage.ActivePageIndex = 0)
+						and (GetKeyState( VK_CONTROL ) < 0) then begin
+					wmMsg.Msg := Msg.message;
+					wmMsg.CharCode := Word(Msg.wParam);
+					wmMsg.KeyData := Msg.lParam;
+					if (wmMsg.CharCode = 229) and (wmMsg.KeyData = 3735553) then begin
+						IMC := ImmGetContext(BodyEdit.Handle); //ƒRƒ“ƒeƒLƒXƒgŽæ“¾
+						Len := ImmGetCompositionString(IMC, GCS_COMPSTR, nil, 0); //‚Ü‚¸’·‚³‚ðŽæ“¾
+						if (Len > 0) then begin
+							SetLength(Str, Len + 1); //Buffer‚̃ƒ‚ƒŠ‚ðÝ’è
+							ImmGetCompositionString(IMC, GCS_COMPSTR, PChar(Str), Len + 1); //‚Ü‚¸’·‚³‚ðŽæ“¾
+							SetLength(Str, Len);
+							FInputAssistKey := Str;
+							InputAssistActionExecute(nil);
+							Handled := True;
+						end;
+						ImmReleaseContext(BodyEdit.Handle, IMC);  //ƒRƒ“ƒeƒLƒXƒg‰ð•ú
+					end;
+				end;
+			end;
+		end;
+
+	end;
+end;
+
+procedure TEditorForm.ShowInputAssistFormExecute(Sender: TObject);
+var
+	form : TInputAssistForm;
+begin
+	form := TInputAssistForm.Create(nil);
+	try
+		if TopAction.Checked then begin // ƒXƒeƒCó‘Ԃɐݒè
+			SetWindowPos(form.Handle, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE + SWP_NOSIZE);
+        end;
+		form.SetUpFromEditor;
+		if (form.ShowModal = mrOk) then begin
+			InsertText(BodyEdit, form.GetInsertText);
+		end;
+	finally
+		form.Release;
+	end;
+end;
+
 end.

--- a/Favorite.pas
+++ b/Favorite.pas
@@ -410,12 +410,12 @@ begin
 						board := BBSsFindBoardFromBBSID( Node.Attributes[ 'bbs' ] );
 						if board <> nil then
 							FavBoard := TFavoriteBoardItem.Create(
-								board.URL, Node.Attributes[ 'title' ], board );
+								board.URL, MojuUtils.UnSanitize(Node.Attributes[ 'title' ]), board );
 					end else begin
 						FavBoard := TFavoriteBoardItem.Create(
-							Node.Attributes[ 'url' ], Node.Attributes[ 'title' ], nil );
+							Node.Attributes[ 'url' ], MojuUtils.UnSanitize(Node.Attributes[ 'title' ]), nil );
 					end;
-					CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, Node.Attributes['title'], FavBoard);
+					CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavBoard);
 					CurrentNode.ImageIndex := 15;
 					CurrentNode.SelectedIndex := 15;
 				end else if Node.Attributes['favtype'] = 'thread' then begin
@@ -433,17 +433,17 @@ begin
 								board.BoardPlugIn,
                                 board,
 								GikoSys.Get2chBoard2ThreadURL( board, ChangeFileExt( Node.Attributes[ 'thread' ], '' ) ) );
-							threadItem.Title := Node.Attributes[ 'title' ];
+							threadItem.Title := UnSanitize(Node.Attributes[ 'title' ]);
 							board.Add( threadItem );
 						end;
 						FavThread := TFavoriteThreadItem.Create(
-							threadItem.URL, Node.Attributes[ 'title' ], threadItem );
+							threadItem.URL, UnSanitize(Node.Attributes[ 'title' ]), threadItem );
                         threadItem.Free;
 					end else begin
 						FavThread := TFavoriteThreadItem.Create(
-							Node.Attributes[ 'url' ], Node.Attributes[ 'title' ], nil );
+							Node.Attributes[ 'url' ], UnSanitize(Node.Attributes[ 'title' ]), nil );
 					end;
-					CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, Node.Attributes['title'], FavThread);
+					CurrentNode := FTreeView.Items.AddChildObjectFirst(ParentNode, UnSanitize(Node.Attributes['title']), FavThread);
 					CurrentNode.ImageIndex := 16;
 					CurrentNode.SelectedIndex := 16;
 				end;
@@ -558,12 +558,12 @@ begin
 		end else if TObject(data) is TFavoriteBoardItem then begin
 			FavBoard := TFavoriteBoardItem(data);
 			s := Format('<favitem type="2ch" favtype="board" url="%s" title="%s"/>',
-									[HtmlEncode( FavBoard.URL ), HtmlEncode(Node.Text)]);
+									[HtmlEncode( FavBoard.URL ), HtmlEncode(MojuUtils.Sanitize(Node.Text))]);
 			SaveList.Add(s);
 		end else if TObject(data) is TFavoriteThreadItem then begin
 			FavThread := TFavoriteThreadItem(data);
 			s := Format('<favitem type="2ch" favtype="thread" url="%s" title="%s"/>',
-									[HtmlEncode( FavThread.URL ), HtmlEncode(Node.Text)]);
+									[HtmlEncode( FavThread.URL ), HtmlEncode(MojuUtils.Sanitize(Node.Text))]);
 			SaveList.Add(s);
 		end;
 		Node := Node.getNextSibling;

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -1,6 +1,6 @@
 object GikoForm: TGikoForm
-  Left = 363
-  Top = 92
+  Left = 422
+  Top = 68
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -7959,6 +7959,12 @@ object GikoForm: TGikoForm
       object N43: TMenuItem
         Caption = '-'
       end
+      object N22: TMenuItem
+        Action = GikoDM.SetInputAssistAction
+      end
+      object N42: TMenuItem
+        Caption = '-'
+      end
       object PlugInMenu: TMenuItem
         Caption = #12503#12521#12464#12452#12531'(&P)'
       end

--- a/Giko.pas
+++ b/Giko.pas
@@ -402,6 +402,8 @@ type
     N74: TMenuItem;
     WikiFAQ: TMenuItem;
     GikoApplicationEvents: TApplicationEvents;
+    N22: TMenuItem;
+    N42: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure BrowserStatusTextChange(Sender: TObject;
@@ -541,6 +543,7 @@ type
     procedure GikoApplicationEventsException(Sender: TObject; E: Exception);
     procedure TreeViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
+    procedure GetResURLMenuClick(Sender: TObject);
 	private
 		{ Private éŒ¾ }
 		FEnabledCloseButton: Boolean;
@@ -588,7 +591,8 @@ type
 		FIsHandledWheel	: Boolean;			///< Šù‚Ɏ󂯎æ‚Á‚½ WM_MOUSEWHEEL ‚©‚Ç‚¤‚©
 				DiffComp: Boolean;                      //Add by Genyakun ƒXƒŒ‚ªXV‚³‚ꂽ‚Æ‚«‚ÉTrue‚É‚È‚é
 		FOrigenCaption: String;				//‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€•ÒWŽž‚̕ҏW‘O‚Ì•¶Žš—ñ
-        FPreviewBrowserRect: TRect;			///< ƒvƒŒƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ð‹L‰¯‚·‚é
+		FPreviewBrowserRect: TRect;			///< ƒvƒŒƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ð‹L‰¯‚·‚é
+		FActionListGroupIndexes: array of Integer;	///<GikoDMã‚̃AƒNƒVƒ‡ƒ“ƒŠƒXƒg‚ÌŠeƒAƒNƒVƒ‡ƒ“‚ɐݒ肳‚ꂽGroupIndex‚ð•Û‘¶‚·‚é”z—ñ
 		procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
 		procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
 		procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -648,12 +652,16 @@ type
 		function GetScreenCursor(): TCursor;
 		//ƒJ[ƒ\ƒ‹‚ðÝ’è‚·‚é
 		procedure SetScreenCursor(Cursor : TCursor);
-		//! ƒAƒNƒVƒ‡ƒ“‚̃`ƒFƒbƒNó‘Ԃ̏‰Šú‰»
-		procedure InitActionChecked();
 		//! ƒ_ƒEƒ“ƒ[ƒhƒRƒ“ƒgƒ[ƒ‹ƒXƒŒƒbƒh‚̐¶¬
 		procedure CreateControlThread();
 		//! ƒuƒ‰ƒEƒU‚̐¶¬
 		procedure CreateBrowsers(count: Integer);
+		//! ActionList‚ÌGroupIndex‚Ì•Û‘¶
+		procedure GetGroupIndex(ActionList: TActionList);
+		//! ActionList‚ÌGroupIndex‚̐ݒè
+		procedure SetGroupIndex(ActionList: TActionList);
+		//! Žw’肳‚ꂽƒXƒŒƒbƒh‚ðŠJ‚­(ƒƒO‚ª–³‚¢‚Æ‚« or Žw’èJUMP‚Ü‚Å‘«‚è‚È‚¢‚Æ‚«‚ÍDL‚·‚é)
+		procedure OpenThreadItem(Thread: TThreadItem; URL: String);
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -783,6 +791,7 @@ type
 		function WebBrowserClick(Sender: TObject): WordBool;
 		//! ƒc[ƒ‹ƒo[‚ɃXƒŒiž‚݃Rƒ“ƒ{ƒ{ƒbƒNƒX‚ðÝ’è‚·‚é
 		procedure SetSelectComboBox();
+
 	published
 		property EnabledCloseButton: Boolean read FEnabledCloseButton write SetEnabledCloseButton;
 	end;
@@ -820,7 +829,8 @@ uses
 	FavoriteArrange, AddressHistory, Preview, Gesture,
 	About, Option, Round, Splash, Sort, ListSelect, Imm,
 	NewBoard, MojuUtils, Clipbrd, GikoBayesian,Y_TextConverter,
-	HTMLCreate, ListViewUtils, GikoDataModule, GikoMessage;
+	HTMLCreate, ListViewUtils, GikoDataModule, GikoMessage,
+  InputAssistDataModule;
 
 const
 	BLANK_HTML: string = 'about:blank';
@@ -869,12 +879,18 @@ begin
 	Writeln(' I—¹Žž‚́AƒMƒRƒiƒrƒEƒBƒ“ƒhƒE‚ð•Â‚¶‚Ä‚­‚¾‚³‚¢');
 	Writeln('============================================================');
 {$ENDIF}
+//try
+	Sort.SetSortDate(Now());
+	
 	FTreeType := gttNone;
 	// ‹N“®Žž‚É•Û‘¶‚³‚ê‚Ä‚µ‚Ü‚¤‘΍ô
 	FStartUp := true;
 	Application.HookMainWindow(Hook);
 	FIsIgnoreResize := rtResizing;
-
+	//ActionList‚ÌGuoupIndex‚ð•Û‘¶‚µ‚āA0‚ɃNƒŠƒA‚·‚éB
+	//(‹N“®Žž‚Ƀc[ƒ‹ƒ{ƒ^ƒ“‚ÌDownƒvƒƒpƒeƒB‚𔽉f‚³‚¹‚é“s‡ãGroupIndex‚͐ݒè‚Å‚«‚È‚¢)
+	//‚±‚êˆÈŒãSet`‚ōĐݒ肷‚é‚܂ŁAAction‚ÌChecked‚ð‚¢‚¶‚é‚Æ‚«‚Í’ˆÓI
+	GetGroupIndex(GikoDM.GikoFormActionList);
 	FSearchDialog := nil;
 	CreateBrowsers(BROWSER_COUNT);
 
@@ -944,6 +960,49 @@ begin
 	//ViewNoButton.Down := GikoSys.Setting.ListViewNo;
 	GikoDM.ListNumberVisibleAction.Checked := GikoSys.Setting.ListViewNo;
 
+	//ƒ~ƒ…[ƒg‚̏ó‘Ô‚ðÝ’è
+	GikoDM.MuteAction.Checked := GikoSys.Setting.Mute;
+
+	// ƒŒƒX•\Ž¦”͈Í
+	FResRangeMenuSelect := GikoSys.ResRange;
+	case GikoSys.ResRange of
+	Ord( grrAll ):
+		begin
+			GikoDM.AllResAction.Execute;
+		end;
+	Ord( grrSelect ):
+		begin
+			SelectComboBox.Text := SelectComboBox.Items[ 1 ];
+			GikoDM.SelectResAction.Checked := True;
+		end;
+	else
+		case FResRangeMenuSelect of
+		Ord( grrKoko ):	GikoDM.OnlyKokoResAction.Checked	:= True;
+		Ord( grrNew ):	GikoDM.OnlyNewResAction.Checked	:= True;
+		100:			GikoDM.OnlyAHundredResAction.Checked		:= True;
+		end;
+	end;
+
+	// ƒXƒŒƒbƒhˆê——•\Ž¦”͈Í
+	case GikoSys.Setting.ThreadRange of
+	gtrAll:
+		begin
+			GikoDM.AllItemAction.Checked := True;
+			ViewType := gvtAll;
+		end;
+	gtrLog:
+		begin
+			GikoDM.LogItemAction.Checked := True;
+			ViewType := gvtLog;
+		end;
+	gtrNew:
+		begin
+			GikoDM.NewItemAction.Checked := True;
+			ViewType := gvtNew;
+		end;
+	end;
+
+
 	//ƒuƒ‰ƒEƒUƒ^ƒuƒtƒHƒ“ƒg
 	BrowserTab.Font.Name := GikoSys.Setting.BrowserTabFontName;
 	BrowserTab.Font.Size := GikoSys.Setting.BrowserTabFontSize;
@@ -952,9 +1011,27 @@ begin
 		BrowserTab.Font.Style := [fsBold];
 	if GikoSys.Setting.BrowserTabFontItalic then
 		BrowserTab.Font.Style := GikoForm.BrowserTab.Font.Style + [fsItalic];
+	BrowserTab.DoubleBuffered := True;
 	FDragWFirst := false;
 	SetContent(BrowserNullTab);													//ƒuƒ‰ƒEƒU‚ð‹ó”’•\Ž¦
 
+	//ƒuƒ‰ƒEƒUƒ^ƒu
+	GikoDM.BrowserTabVisibleAction.Checked := GikoSys.Setting.BrowserTabVisible;
+
+	if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
+		GikoDM.BrowserTabTopAction.Checked := True;
+	end else begin
+		GikoDM.BrowserTabBottomAction.Checked := True;
+	end;
+
+	if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
+		GikoDM.BrowserTabTabStyleAction.Checked := True;
+	end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
+		GikoDM.BrowserTabButtonStyleAction.Checked := True;
+	end else begin
+		GikoDM.BrowserTabFlatStyleAction.Checked := True;
+	end;
+
 	//ƒvƒƒOƒŒƒXƒo[‚̏‰Šú‰»
 	ProgressBar.Parent := StatusBar;
 	ProgressBar.Top := 2;
@@ -968,10 +1045,14 @@ begin
 
 	// ƒ{[ƒhƒtƒ@ƒCƒ‹—ñ‹“(ReadFavorite ‚æ‚èæ‚ɍs‚¤‚±‚Æ)
 	GikoSys.ListBoardFile;
-
+	//@˜A‘±‹N“®Žž‚ɃXƒvƒ‰ƒbƒVƒ…ƒEƒBƒ“ƒhƒE‚̃ƒ‚ƒŠ‚ª•s’è‚É
+	try
 	// ƒXƒvƒ‰ƒbƒVƒ…ƒEƒBƒ“ƒhƒE‚̃vƒƒOƒŒƒXƒo[‚̐ݒè
-	SplashWindow.ProgressBar.Max := Length(BBSs) * 20;
-
+		if (SplashWindow <> nil) then begin
+			SplashWindow.ProgressBar.Max := Length(BBSs) * 20;
+		end;
+	except
+	end;
 	// ‚·‚ׂĂÌBBS‚ð“ǂݍž‚ñ‚Å‚¨‚­
 	for i := Length(BBSs) - 1 downto 0 do begin
 		if not BBSs[i].IsBoardFileRead then
@@ -982,6 +1063,7 @@ begin
 			SplashWindow.Update;
 		end;
 	end;
+
 	//„‰ñƒf[ƒ^“ǂݍž‚Ý
 	RoundList := TRoundList.Create;
 	RoundList.LoadRoundBoardFile;
@@ -1200,7 +1282,8 @@ begin
 	FavoriteAddToolButton.Caption := '’ljÁ...';
 	AntiIndivAbonMenuItem.Caption := 'ŒÂ•Ê‚ ‚ځ`‚ñ‰ðœ';
 
-
+	//“ü—̓AƒVƒXƒg‹@\‚̏‰Šú‰»
+	InputAssistDM.Init(GikoSys.GetInputAssistFileName);
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -1341,51 +1424,20 @@ begin
 		GikoDM.BrowserNameBarVisibleAction.Checked := GikoSys.Setting.BrowserNameBarVisible;
 		GikoDM.BrowserNameBarVisibleActionExecute( nil );
 
-		//ƒuƒ‰ƒEƒUƒ^ƒu
-		GikoDM.BrowserTabVisibleAction.Checked := GikoSys.Setting.BrowserTabVisible;
-		GikoDM.BrowserTabVisibleActionExecute(nil);
-
-		if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
-			GikoDM.BrowserTabTopAction.Checked := True;
-			GikoDM.BrowserTabTopActionExecute(nil);
-		end else begin
-			GikoDM.BrowserTabBottomAction.Checked := True;
-			GikoDM.BrowserTabBottomActionExecute(nil);
-		end;
-
-		if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
-			GikoDM.BrowserTabTabStyleAction.Checked := True;
-			GikoDM.BrowserTabTabStyleActionExecute(nil);
-		end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
-			GikoDM.BrowserTabButtonStyleAction.Checked := True;
-			GikoDM.BrowserTabButtonStyleActionExecute(nil);
-		end else begin
-			GikoDM.BrowserTabFlatStyleAction.Checked := True;
-			GikoDM.BrowserTabFlatStyleActionExecute(nil);
-		end;
-
-		// ListView ‚̃wƒbƒ_ƒhƒ‰ƒbƒO
-//		ListView.FullDrag := True;
-
 		// CoolBar •œŒ³
 		LoadCoolBarSettings;
 
 		//d—v@‚±‚ꂪ‚È‚¢‚ƃc[ƒ‹ƒ{ƒ^ƒ“‚̍XV‚ª‚¨‚©‚µ‚­‚È‚é
 //		ResetBandInfo( ListCoolBar, ListToolBar );
 		FIsIgnoreResize := rtNone;
-		//ƒc[ƒ‹ƒo[‚̍XV‚ðI‚¦‚½Œã‚É‚â‚ç‚È‚¢‚Æ‚¢‚¯‚È‚¢‚Ì‚©‚à
-		//ƒAƒNƒVƒ‡ƒ“‚̃`ƒFƒbƒNó‘Ô‚ð‰Šú‰»
-		InitActionChecked();
 
 		//FormCrete‚©‚çˆÚ“®B
 		if GikoSys.Setting.TabAutoLoadSave then begin
 			GikoDM.TabAutoLoadAction.Execute;
 		end;
-		//‚É‚¿‚á‚ñŒêˆÄ“àƒTƒ|[ƒg‹@”\
-		if GikoSys.Setting.GengoSupport then begin
-		//—\’è’n
-		//TestŒü‚¯
-		end;
+
+        //ActionList‚ÌGroupIndex‚ðŒ³‚É–ß‚·
+		SetGroupIndex(GikoDM.GikoFormActionList);
 
 		FStartUp := false;
 	end;
@@ -1474,6 +1526,8 @@ begin
 	// CoolBar •Û‘¶
 	//if (GikoForm.WindowState <> wsMinimized) and (GikoForm.WindowState <> wsMaximized) then
 
+	//“ü—̓AƒVƒXƒg‹@\‚̐ݒè‚Ì•Û‘¶
+	InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);
 
 	//‚¨‹C‚É“ü‚è•Û‘¶
 	try
@@ -2249,6 +2303,7 @@ begin
 						GikoSys.Setting.BoardSortIndex := 0;
 						GikoSys.Setting.BoardSortOrder := True;
 					end;
+					Sort.SetSortDate(Now());
 					SetActiveList(Item.Board);
 				end;
 				Item.Board.Modified := True;
@@ -2543,7 +2598,7 @@ var
 	BBSID: string;
 	FileName: string;
 	sTitle: string;
-	doc:  Variant;
+	doc: Variant;
 	s: string;
 	i: Integer;
 	idx: Integer;
@@ -2655,18 +2710,27 @@ begin
 				Thread.Repaint := false;
 
 				Thread.Browser.OnStatusTextChange := nil;
-				doc := Idispatch( olevariant(Thread.Browser.ControlInterface).Document) as IHTMLDocument2;
-
-				//GikoSys.CreateHTML2(doc, ThreadItem, sTitle);
-				HTMLCreater.CreateHTML2(doc, ThreadItem, sTitle);
+				LockWindowUpdate(Thread.Browser.Handle);
+				HTMLCreater.CreateHTML2(
+						Idispatch( olevariant(Thread.Browser.ControlInterface).Document),
+						ThreadItem, sTitle);
+				while ( (Thread.Browser.Document as IHTMLDocument2).readyState <> 'complete' ) do begin
+					Application.ProcessMessages;
+					Sleep(1);
+				end;
 				Thread.Browser.OnStatusTextChange := BrowserStatusTextChange;
-
 				if ThreadItem = nil then begin
 					FActiveContent := nil;
 					BrowserTab.Repaint;
 					Exit;
 				end;
-				PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( Thread.Browser ), 0 );
+				//PostMessage( Handle, USER_DOCUMENTCOMPLETE, Integer( Thread.Browser ), 0 );
+			end else begin
+				// JUMP‚ðŽw’肳‚ê‚Ä‚¢‚½‚çJUMP‚·‚é
+				if (Thread.Movement <> '') then begin
+					Thread.Move(Thread.Movement);
+					Thread.Movement := '';
+				end;
 			end;
 		end;
 		if (Thread <> nil) and (ThreadItem <>nil) then begin
@@ -3037,7 +3101,7 @@ begin
 			// title ‚͍¡‚Ì‚Æ‚±‚ëŽg‚Á‚Ä‚¢‚È‚¢
 			saveList.Add(
 				'<history url="' + HtmlEncode( TFavoriteThreadItem( FHistoryList[ i ] ).URL ) + '"' +
-				' title="' + HtmlEncode( TFavoriteThreadItem( FHistoryList[ i ] ).Title ) + '"/>');
+				' title="' + HtmlEncode( MojuUtils.Sanitize(TFavoriteThreadItem( FHistoryList[ i ] ).Title )) + '"/>');
 		end;
 		saveList.Add('</address>');
 		saveList.SaveToFile( GikoSys.GetConfigDir + 'History.xml' );
@@ -3056,15 +3120,21 @@ var
 	HistoryNode	: IXMLNode;
 	s						: string;
 	favItem			: TFavoriteThreadItem;
+{$IFDEF DEBUG}
+	st, rt : Cardinal;
+{$ENDIF}
 begin
+{$IFDEF DEBUG}
+	st := GetTickCount;
+{$ENDIF}
 
 	fileName := GikoSys.GetConfigDir + 'History.xml';
 
 	if FileExists( fileName ) then begin
 		try
-            XMLDoc := IXMLDocument.Create;
+			XMLDoc := IXMLDocument.Create;
 			//XMLDoc := LoadXMLDocument(FileName);
-            LoadXMLDocument(FileName, XMLDoc);
+			LoadXMLDocument(FileName, XMLDoc);
 			try
 				XMLNode := XMLDoc.DocumentElement;
 
@@ -3077,9 +3147,9 @@ begin
 								s := Trim(HistoryNode.Attributes['url']);
 								if s <> '' then begin
 									favItem := TFavoriteThreadItem.Create(
-										s, HistoryNode.Attributes[ 'title' ] );
+										s, MojuUtils.UnSanitize(HistoryNode.Attributes[ 'title' ]) );
 									if not AddHistory( favItem ) then
-                                    	favItem.Free;
+										favItem.Free;
 								end;
 							//end;
 						end;
@@ -3091,6 +3161,10 @@ begin
 		except
 		end;
 	end;
+{$IFDEF DEBUG}
+	rt := GetTickCount - st;
+	Writeln('Runtime(Load Histroy) : ' + IntToStr(rt) + ' ms');
+{$ENDIF}
 
 end;
 
@@ -3338,7 +3412,6 @@ begin
 	end else begin
 		if Item <> FActiveList then begin
 			ActiveListColumnSave;
-
 			if (Item is TBBS) or (Item is TCategory) then begin
 				ListView.Columns.Clear;
 				SetActiveList( Item );
@@ -3352,6 +3425,7 @@ begin
 						Screen.Cursor := crDefault;
 					end;
 				end;
+				Sort.SetSortDate(Now());
 				SetActiveList( Item );
 			end;
 		end;
@@ -3560,7 +3634,6 @@ begin
 	FTabHintIndex := -1;
 	for i := 0 to BrowserTab.Tabs.Count - 1 do begin
 		if TBrowserRecord(BrowserTab.Tabs.Objects[i]) = BrowserRecord then begin
-			BrowserTab.Tabs.BeginUpdate;
 			try
 				if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
 					doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
@@ -3576,15 +3649,25 @@ begin
 				if j <> -1 then
 					FBrowsers.Move(j, BROWSER_COUNT - 1);
 			end;
-			TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
-			BrowserTab.Tabs.Delete(i);
-			if idx > i then begin
-				BrowserTab.TabIndex := idx - 1;
-			end else begin
-				if BrowserTab.Tabs.Count -1 >= idx then
-					BrowserTab.TabIndex := idx
-				else
-					BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+			BrowserTab.Tabs.BeginUpdate;
+			try
+				TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
+				if ( BrowserTab.Tabs.Count - 1 = i ) and
+					( BrowserTab.TabRect(i).Left
+						<= BrowserTab.DisplayRect.Left ) then begin
+					BrowserTab.ScrollTabs(-1);
+				end;
+				BrowserTab.Tabs.Delete(i);
+				if idx > i then begin
+					BrowserTab.TabIndex := idx - 1;
+				end else begin
+					if BrowserTab.Tabs.Count -1 >= idx then
+						BrowserTab.TabIndex := idx
+					else
+						BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+				end;
+			finally
+				BrowserTab.Tabs.EndUpdate;
 			end;
 			if BrowserTab.Tabs.Count = 0 then begin
 				BrowserNullTab.Thread := nil;
@@ -3604,7 +3687,6 @@ begin
 				TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Repaint := true;
 				FBrowsers.Move(BROWSER_COUNT - 1, 0);
 			end;
-			BrowserTab.Tabs.EndUpdate;
 			if( FActiveContent = nil) then
 				BrowserTab.OnChange(nil);
 			Exit;
@@ -3620,7 +3702,6 @@ begin
 	FTabHintIndex := -1;
 	for i := 0 to BrowserTab.Tabs.Count - 1 do begin
 		if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread = ThreadItem then begin
-			BrowserTab.Tabs.BeginUpdate;
 			try
 				if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser <> nil then begin
 					doc := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser.Document;
@@ -3637,15 +3718,25 @@ begin
 				if j <> -1 then
 					FBrowsers.Move(j, BROWSER_COUNT - 1);
 			end;
-			TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
-			BrowserTab.Tabs.Delete(i);
-			if idx > i then begin
-				BrowserTab.TabIndex := idx - 1;
-			end else begin
-				if BrowserTab.Tabs.Count -1 >= idx then
-					BrowserTab.TabIndex := idx
-				else
-					BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+			BrowserTab.Tabs.BeginUpdate;
+			try
+				TBrowserRecord(BrowserTab.Tabs.Objects[i]).Free;
+				if ( BrowserTab.Tabs.Count - 1 = i ) and
+					( BrowserTab.TabRect(i).Left
+						<= BrowserTab.DisplayRect.Left ) then begin
+					BrowserTab.ScrollTabs(-1);
+				end;
+				BrowserTab.Tabs.Delete(i);
+				if idx > i then begin
+					BrowserTab.TabIndex := idx - 1;
+				end else begin
+					if BrowserTab.Tabs.Count -1 >= idx then
+						BrowserTab.TabIndex := idx
+					else
+						BrowserTab.TabIndex := BrowserTab.Tabs.Count - 1;
+				end;
+			finally
+				BrowserTab.Tabs.EndUpdate;
 			end;
 			if(BrowserTab.TabIndex <> -1) and
 				( TBrowserRecord(BrowserTab.Tabs.Objects[BrowserTab.TabIndex]).Browser = nil) then begin
@@ -3663,7 +3754,6 @@ begin
 				FBrowsers.Move(BROWSER_COUNT - 1, 0);
 			end;
 
-			BrowserTab.Tabs.EndUpdate;
 			if( FActiveContent = nil) then
 				BrowserTab.OnChange(nil);
 			Exit;
@@ -3927,52 +4017,53 @@ var
 	i, j: Integer;
 	idx: Integer;
 begin
+	BrowserTab.Tabs.BeginUpdate;
+	try
+		if not BrowserTab.Dragging then begin
+			FTabHintIndex := -1;
+			BrowserTab.Hint := '';
+			idx := BrowserTab.TabIndex;
+			if idx = -1 then begin
+				SetContent(BrowserNullTab);
+
+			end else if(BrowserTab.Tabs.Objects[idx] <> nil) and (BrowserTab.Tabs.Objects[idx] is TBrowserRecord) then begin
+				if TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser <> nil then begin
+					j := FBrowsers.IndexOf(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser);
+					if j <> -1 then
+						FBrowsers.Move(j ,0);
+				end else begin
+					if( FActiveContent <> nil ) and (FActiveContent.Browser <> nil) and
+						(FActiveContent.Browser <> BrowserNullTab.Browser) and
+						(FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1])) then
+						FBrowsers.Move(BROWSER_COUNT - 1, 0);
 
-	if not BrowserTab.Dragging then begin
-		FTabHintIndex := -1;
-		BrowserTab.Hint := '';
-		idx := BrowserTab.TabIndex;
-		if idx = -1 then begin
-			SetContent(BrowserNullTab);
-
-		end else if(BrowserTab.Tabs.Objects[idx] <> nil) and (BrowserTab.Tabs.Objects[idx] is TBrowserRecord) then begin
-			if TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser <> nil then begin
-				j := FBrowsers.IndexOf(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser);
-				if j <> -1 then
-					FBrowsers.Move(j ,0);
-			end else begin
-				if( FActiveContent <> nil ) and (FActiveContent.Browser <> nil) and
-					(FActiveContent.Browser <> BrowserNullTab.Browser) and
-					(FActiveContent.Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1])) then
-					FBrowsers.Move(BROWSER_COUNT - 1, 0);
-
-				for i := 0 to BrowserTab.Tabs.Count - 1 do begin
-					if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin
-						ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[i]));
-						break;
+					for i := 0 to BrowserTab.Tabs.Count - 1 do begin
+						if TBrowserRecord(BrowserTab.Tabs.Objects[i]).Browser = TWebBrowser(FBrowsers[BROWSER_COUNT - 1]) then begin
+							ReleaseBrowser(TBrowserRecord(BrowserTab.Tabs.Objects[i]));
+							break;
+						end;
 					end;
+					TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
+					TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Repaint := true;
+					FBrowsers.Move(BROWSER_COUNT - 1, 0);
 				end;
-				TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser := TWebBrowser(FBrowsers[BROWSER_COUNT - 1]);
-				TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Repaint := true;
-				FBrowsers.Move(BROWSER_COUNT - 1, 0);
-			end;
-			MoveWindow(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser.Handle, 0, 0, BrowserPanel.Width, BrowserPanel.Height, false);
-			TOleControl(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser).BringToFront;
-			SetContent(TBrowserRecord(BrowserTab.Tabs.Objects[idx]));
-
-			if (GikoSys.Setting.URLDisplay) and (GetActiveContent <> nil) then
-				AddressComboBox.Text := GetActiveContent.URL;
+				MoveWindow(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser.Handle, 0, 0, BrowserPanel.Width, BrowserPanel.Height, false);
+				TOleControl(TBrowserRecord(BrowserTab.Tabs.Objects[idx]).Browser).BringToFront;
+				SetContent(TBrowserRecord(BrowserTab.Tabs.Objects[idx]));
 
-			if ((TreeView.Visible) and (TreeView.Focused)) or ((FavoriteTreeView.Visible) and (FavoriteTreeView.Focused)) or
-				(ListView.Focused) or (SelectComboBox.Focused) or (AddressComboBox.Focused)
-			then
-			else
-				GikoDM.SetFocusForBrowserAction.Execute;
+				if (GikoSys.Setting.URLDisplay) and (GetActiveContent <> nil) then
+					AddressComboBox.Text := GetActiveContent.URL;
 
+				if ((TreeView.Visible) and (TreeView.Focused)) or ((FavoriteTreeView.Visible) and (FavoriteTreeView.Focused)) or
+					(ListView.Focused) or (SelectComboBox.Focused) or (AddressComboBox.Focused)
+				then
+				else
+					GikoDM.SetFocusForBrowserAction.Execute;
+			end;
 		end;
-
+	finally
+		BrowserTab.Tabs.EndUpdate;
 	end;
-
 end;
 
 
@@ -4001,54 +4092,51 @@ end;
 
 procedure TGikoForm.SetBrowserTabState;
 var
-//	i: Integer;
 	CoolBand: TCoolBand;
 begin
 	BrowserBottomPanel.AutoSize := False;
 	if GikoSys.Setting.BrowserTabVisible then begin
-		if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
-			BrowserTab.Style := tsTabs;
-			if GikoSys.Setting.BrowserTabPosition = gtpTop then
-				BrowserTab.TabPosition := tpTop
-			else
-				BrowserTab.TabPosition := tpBottom;
-		end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
-			BrowserTab.TabPosition := tpTop;
-			BrowserTab.Style := tsButtons;
-		end else begin
-			BrowserTab.TabPosition := tpTop;
-			BrowserTab.Style := tsFlatButtons
-		end;
-
-		if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
-			BrowserTab.Parent := BrowserTabToolBar;
-			BrowserBottomPanel.Hide;
-			CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
-			if CoolBand <> nil then
-				CoolBand.Visible := True;
-//			BrowserTab.Parent := BrowserTopPanel;
-//			BrowserTab.Parent := BrowserCoolBar;
-//			BrowserTab.Top := 26;
-//			BrowserTopPanel.Height := 44;
+		BrowserTab.Hide;
+		BrowserTab.Tabs.BeginUpdate;
+		try
+			if GikoSys.Setting.BrowserTabStyle = gtsTab then begin
+				BrowserTab.Style := tsTabs;
+				if GikoSys.Setting.BrowserTabPosition = gtpTop then
+					BrowserTab.TabPosition := tpTop
+				else
+					BrowserTab.TabPosition := tpBottom;
+			end else if GikoSys.Setting.BrowserTabStyle = gtsButton then begin
+				BrowserTab.TabPosition := tpTop;
+				BrowserTab.Style := tsButtons;
+			end else begin
+				BrowserTab.TabPosition := tpTop;
+				BrowserTab.Style := tsFlatButtons
+			end;
 
-		end else begin
-			BrowserTab.Parent := BrowserBottomPanel;
-			BrowserTab.Top := 0;
-			BrowserTab.Left := 0;
-			BrowserBottomPanel.Show;
-			CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
-			if CoolBand <> nil then
-				CoolBand.Visible := False;
-//			BrowserTopPanel.Height := 26;
-		end;
-		BrowserTab.Show;
+			if GikoSys.Setting.BrowserTabPosition = gtpTop then begin
+				BrowserTab.Parent := BrowserTabToolBar;
+				BrowserBottomPanel.Hide;
+				CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
+				if CoolBand <> nil then
+					CoolBand.Visible := True;
+			end else begin
+				BrowserTab.Parent := BrowserBottomPanel;
+				BrowserTab.Top := 0;
+				BrowserTab.Left := 0;
+				BrowserBottomPanel.Show;
+				CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
+				if CoolBand <> nil then
+					CoolBand.Visible := False;
+			end;
+		finally
+			BrowserTab.Tabs.EndUpdate;
+			BrowserTab.Show;
+		end;
 	end else begin
 		CoolBand := GetCoolBand(BrowserCoolBar, BrowserTabToolBar);
 		if CoolBand <> nil then
 			CoolBand.Visible := False;
 		BrowserBottomPanel.Visible := False;
-//		BrowserTab.Visible := False;
-//		BrowserTopPanel.Height := 26;
 		GikoDM.AllTabCloseAction.Execute;
 	end;
 end;
@@ -4118,7 +4206,6 @@ var
 	doc					: Variant;
 	threadItem	: TThreadItem;
 begin
-//	AddMessageList('DocumentComplete', nil, gmiWhat);
 	if TObject(Sender) is TWebBrowser then begin
 		BrowserRecord := nil;
 		if TWebBrowser(Sender) <> Browser then begin
@@ -4150,7 +4237,7 @@ begin
 					FEvent := nil;
 				end;
 			end;
-			
+
 		end;
 
 		if (BrowserRecord <> nil) and
@@ -4187,6 +4274,7 @@ begin
 			end;
 		end;
 	end;
+	LockWindowUpdate(0);
 end;
 
 procedure TGikoForm.RoundNamePopupMenuPopup(Sender: TObject);
@@ -4495,6 +4583,47 @@ begin
 	TopPanel.Height := Max(MainCoolBar.Height, AnimePanel.Height);
 
 end;
+//! Žw’肳‚ꂽƒXƒŒƒbƒh‚ðŠJ‚­(ƒƒO‚ª–³‚¢‚Æ‚« or Žw’èJUMP‚Ü‚Å‘«‚è‚È‚¢‚Æ‚«‚ÍDL‚·‚é)
+procedure TGikoForm.OpenThreadItem(Thread: TThreadItem; URL: String);
+var
+	stRes, edRes : Int64;
+	browserRec : TBrowserRecord;
+	threadNumber : String;
+	doc : Variant;
+begin
+	stRes := 0;
+	edRes := 0;
+	// ƒ^ƒu‚𐶐¬
+	browserRec := InsertBrowserTab(Thread);
+	if (browserRec <> nil) then begin
+		// JUMP‚·‚ׂ«ƒŒƒX”ԍ†‚ª‚ ‚é‚©ƒ`ƒFƒbƒN‚·‚é
+		threadNumber := ChangeFileExt(Thread.FileName, '');
+		GikoSys.GetPopupResNumber( URL, stRes, edRes );
+		// ƒXƒŒ‚̔ԍ†‚ðƒŒƒX”Ô‚ÆŒë‚Á‚Ä”FŽ¯‚µ‚Ä‚¢‚é‚Ì‚ðƒNƒŠƒA
+		if (StrToInt(threadNumber) = stRes) then begin
+			if not (AnsiEndsText(threadNumber + '/' + threadNumber, URL))
+				and (Pos('&st=' + threadNumber , URL) = 0) then begin
+				stRes := 0;
+			end;
+		end;
+		if ( stRes > 0 ) then begin
+			browserRec.Movement := IntToStr( stRes );
+		end;
+		// ƒƒO‚ðŽ‚Á‚Ä‚¢‚È‚¢‚© JUMP‚·‚ׂ«ƒŒƒX”ԍ†‚܂Ŏ擾‚µ‚Ä‚¢‚È‚¢‚Æ‚«‚ÍDL‚·‚é
+		if (not Thread.IsLogFile) or (stRes > Thread.Count) then begin
+			DownloadContent(Thread);
+		end else if (not browserRec.Repaint) and (browserRec.Movement <> '') then begin
+			try
+				//SetContent(browserRec);
+				browserRec.Move(browserRec.Movement);
+				browserRec.Movement := '';
+				doc := Idispatch( OleVariant( browserRec.Browser.ControlInterface ).Document ) as IHTMLDocument2;
+				Thread.ScrollTop := doc.Body.ScrollTop;
+			except
+			end;
+		end;
+	end;
+end;
 
 procedure TGikoForm.MoveToURL(const inURL: string);
 var
@@ -4507,13 +4636,8 @@ var
 	i, bi					: Integer;
 	boardURL			: string;
 	tmpThread			: TThreadItem;
-//	category			: TCategory;
-//	categoryNode	: TTreeNode;
-//	boardNode			: TTreeNode;
 	shiftDown			: Boolean;
 	ctrlDown			: Boolean;
-	stRes, edRes	: Int64;
-	browserRec		: TBrowserRecord;
 begin
 
 	GikoSys.ParseURI( inURL, protocol, host, path, document, port, bookmark );
@@ -4569,30 +4693,11 @@ 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 );
-								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 begin
-										browserRec.Movement := IntToStr( stRes );
-										if (stRes > ThreadItem.Count) then begin
-											DownloadContent( ThreadItem );
-										end;
-									end;
-								end else begin
-									if (browserRec <> nil) and (stRes > 0) then
-										browserRec.Movement := IntToStr( stRes );
-									DownloadContent( ThreadItem );
-								end;
-								Exit;
 							end;
+							OpenThreadItem(ThreadItem, inURL);
+							Exit;
 						end;
 					end;
 
@@ -4619,15 +4724,6 @@ begin
 	if (Length( Trim(BBSKey) ) > 0) and (Length( Trim(BBSID) ) > 0) then begin
 		boardURL := GikoSys.Get2chThreadURL2BoardURL( inURL );
 		Board := BBSsFindBoardFromURL( boardURL );
-		//if Board = nil then
-		//	Board := BBSsFindBoardFromBBSID( BBSID );
-		{ ‚±‚Ì•”•ª‚àBBS‚“FindBoardFromURL‚ÉŽ‚½‚¹‚½@20050523
-		if Board = nil then begin
-			// ¦ì‚Á‚Ä‚à’ljÁ‚·‚é‚Æ‚±‚낪–³‚¢‚Ì‚ÅŒƒ‚µ‚­•Û—¯
-			//@‰ß‹ŽƒƒO‘qŒÉ‚©‚çAƒ_ƒEƒ\‚µ‚½ƒXƒŒ‚ª”­Œ©‚Å‚«‚È‚¢‚Ì‚Å‚±‚±‚Å’T‚·‚悤‚É‚·‚é (2004/01/22)
-			Board := BBSs[ 0 ].FindBBSID( BBSID );
-		end;
-		}
 		if Board = nil then begin
 			 // “ü‚é‚ׂ«”‚ªŒ©‚‚©‚ç‚È‚©‚Á‚½‚̂ŁA•’ʂ̃uƒ‰ƒEƒU‚ÅŠJ‚­
 			 GikoSys.OpenBrowser(inURL, gbtUserApp);
@@ -4652,55 +4748,26 @@ begin
 		if ThreadItem = nil then begin
 			ThreadItem := Board.FindThreadFromFileName( BBSKey + '.dat' );
 		end;
-		if ThreadItem = nil then begin
-			//shift -> Ý’èƒuƒ‰ƒEƒUi–³‚¯‚ê‚ÎIEj
-			//ctrl	-> IE
-			{shiftDown	:= GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
-			ctrlDown	:= GetAsyncKeyState(VK_CONTROL) = Smallint($8001);
-			if shiftDown then
-				GikoSys.OpenBrowser(URL1, gbtUserApp)
-			else if ctrlDown then
-				GikoSys.OpenBrowser(URL1, gbtIE)
-			else begin
-			}
-			ThreadItem := TThreadItem.Create( nil, Board, URL );
-			ThreadItem.FileName := ChangeFileExt(BBSKey, '.dat');
-			if AnsiPos(Host, Board.URL) = 0 then
-				ThreadItem.DownloadHost := Host
-			else
-				ThreadItem.DownloadHost := '';
-			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 );
-			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 begin
-					browserRec.Movement := IntToStr( stRes );
-					if (stRes > ThreadItem.Count) then begin
-                    	DownloadContent(ThreadItem);
-					end;
+		try
+			// ƒXƒŒƒbƒhƒAƒCƒeƒ€‚ª‚È‚¢‚Ȃ琶¬‚·‚éB
+			if ThreadItem = nil then begin
+				ThreadItem := TThreadItem.Create( nil, Board, URL );
+				ThreadItem.FileName := ChangeFileExt(BBSKey, '.dat');
+				Board.Insert(0, ThreadItem);
+				if ActiveList is TBoard then begin
+					if TBoard(ActiveList) = Board then
+						ListView.Items.Count := ListView.Items.Count + 1;
 				end;
-			end else begin
+			end;
+			// ƒƒO‚È‚µƒXƒŒƒbƒh‚Ì‚Æ‚«‚́AƒzƒXƒg–¼‚̃`ƒFƒbƒN‚ð‚·‚é
+			if not ThreadItem.IsLogFile then 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 );
-				DownloadContent(ThreadItem);
 			end;
+			OpenThreadItem(ThreadItem, inURL);
+		except
 		end;
 	end else begin
 		Board := BBSsFindBoardFromURL( inURL );
@@ -4710,7 +4777,7 @@ begin
 			if FActiveBBS <> Board.ParentCategory.ParenTBBS then
 				ShowBBSTree( Board.ParentCategory.ParenTBBS );
 			SelectTreeNode( Board, True );
-    	end;
+		end;
 	end;
 end;
 
@@ -6613,6 +6680,7 @@ begin
 				Screen.Cursor := crDefault;
 			end;
 		end;
+		Sort.SetSortDate(Now());
 		SetActiveList(Node.data);
 	end;
 
@@ -6687,7 +6755,8 @@ begin
 				(FavoriteTreeView.Selected = FavoriteTreeView.GetNodeAt(X, Y)) then begin
 				//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
 				rect := FavoriteTreeView.Selected.DisplayRect(true);
-				if ((rect.Left <= X) and (rect.Right >= X)) and
+				// ƒAƒCƒRƒ“•ª¶‚É‚¸‚ç‚·
+				if ((rect.Left - FavoriteTreeView.Indent <= X) and (rect.Right >= X)) and
 					((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
 					if ssDouble in Shift then begin
 						FClickNode := FavoriteTreeView.Selected;
@@ -7580,61 +7649,6 @@ begin
 	MsgBox(Handle, s, 'ˆ—‚³‚ê‚È‚©‚Á‚½—áŠO', MB_OK or MB_ICONSTOP);
 end;
 // *************************************************************************
-//! ƒAƒNƒVƒ‡ƒ“‚̃`ƒFƒbƒNó‘Ԃ̏‰Šú‰» Form‚ÌCreate‚ŌĂяo‚µ‚Ä‚à”½‰f‚µ‚È‚¢
-// *************************************************************************
-procedure TGikoForm.InitActionChecked();
-begin
-	//ƒƒOƒCƒ“ó‘Ô‚ðÄÝ’è
-	GikoDM.LoginAction.Checked := GikoDM.LoginAction.Checked;
-	//ƒ~ƒ…[ƒg‚̏ó‘Ô‚ðÝ’è
-	GikoDM.MuteAction.Checked := GikoSys.Setting.Mute;
-	//‰æ–Ê‚Ì•ªŠ„‚̏ó‘Ô‚ðÄÝ’è
-	GikoDM.ArrangeAction.Checked := GikoDM.ArrangeAction.Checked;
-
-	//ƒXƒŒ‘S•”•\Ž¦ƒ{ƒ^ƒ“‚ð‰Ÿ‚³‚ꂽó‘Ô‚É‚·‚é
-	GikoDM.AllItemAction.Checked := True;
-	GikoDM.AllResAction.Checked := True;
-
-	// ƒŒƒX•\Ž¦”͈Í
-	FResRangeMenuSelect := GikoSys.ResRange;
-	case GikoSys.ResRange of
-	Ord( grrAll ):
-		begin
-			GikoDM.AllResAction.Execute;
-		end;
-	Ord( grrSelect ):
-		begin
-			SelectComboBox.Text := SelectComboBox.Items[ 1 ];
-			GikoDM.SelectResAction.Checked := True;
-		end;
-	else
-		case FResRangeMenuSelect of
-		Ord( grrKoko ):	GikoDM.OnlyKokoResAction.Checked	:= True;
-		Ord( grrNew ):	GikoDM.OnlyNewResAction.Checked	:= True;
-		100:			GikoDM.OnlyAHundredResAction.Checked		:= True;
-		end;
-	end;
-
-	// ƒXƒŒƒbƒhˆê——•\Ž¦”͈Í
-	case GikoSys.Setting.ThreadRange of
-	gtrAll:
-		begin
-			GikoDM.AllItemAction.Checked := True;
-			ViewType := gvtAll;
-		end;
-	gtrLog:
-		begin
-			GikoDM.LogItemAction.Checked := True;
-			ViewType := gvtLog;
-		end;
-	gtrNew:
-		begin
-			GikoDM.NewItemAction.Checked := True;
-			ViewType := gvtNew;
-		end;
-	end;
-end;
-// *************************************************************************
 //! ƒ_ƒEƒ“ƒ[ƒhƒRƒ“ƒgƒ[ƒ‹ƒXƒŒƒbƒh‚̐¶¬
 // *************************************************************************
 procedure TGikoForm.CreateControlThread();
@@ -7755,9 +7769,10 @@ begin
 				(TreeView.Selected = TreeView.GetNodeAt(X, Y)) then begin
 				//ƒ}ƒEƒX‚ªnode‚̏ã‚É‚¢‚é‚©
 				rect := TreeView.Selected.DisplayRect(true);
-				if ((rect.Left <= X) and (rect.Right >= X)) and
+				// ƒAƒCƒRƒ“•ª‚¾‚¯¶‚É‚¸‚ç‚·
+				if ((rect.Left - TreeView.Indent <= X) and (rect.Right >= X)) and
 					((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
-                    // ƒNƒŠƒbƒN‚ƃ_ƒuƒ‹ƒNƒŠƒbƒN‚ðƒRƒR‚Å”»’è
+					// ƒNƒŠƒbƒN‚ƃ_ƒuƒ‹ƒNƒŠƒbƒN‚ðƒRƒR‚Å”»’è
 					if ssDouble in Shift then begin
 						TreeDoubleClick( TreeView.Selected );
 					end else begin
@@ -7768,6 +7783,50 @@ begin
 		end;
 	end;
 end;
+//! ActionList‚ÌGroupIndex‚Ì•Û‘¶
+procedure TGikoForm.GetGroupIndex(ActionList: TActionList);
+var
+	i: Integer;
+begin
+	if ActionList <> nil then begin
+		SetLength(FActionListGroupIndexes, ActionList.ActionCount);
+
+		for i := 0 to ActionList.ActionCount - 1 do begin
+			try
+				FActionListGroupIndexes[i] :=
+					TCustomAction(ActionList.Actions[i]).GroupIndex;
+				TCustomAction(ActionList.Actions[i]).GroupIndex
+					:= 0;
+			except
+				;//Cast‚Å‚«‚È‚¢‚Æ‚«‘΍ô
+			end;
+		end;
+
+	end;
+end;
+//! ActionList‚ÌGroupIndex‚̐ݒè
+procedure TGikoForm.SetGroupIndex(ActionList: TActionList);
+var
+	i: Integer;
+begin
+	if ActionList <> nil then begin
+		if Length( FActionListGroupIndexes ) = ActionList.ActionCount then begin
+			for i := 0 to ActionList.ActionCount - 1 do begin
+				try
+					TCustomAction(ActionList.Actions[i]).GroupIndex
+						:= FActionListGroupIndexes[i];
+				except
+					;//Cast‚Å‚«‚È‚¢‚Æ‚«‘΍ô
+				end;
+			end;
+		end;
+	end;
+end;
+//! ‚±‚̃ŒƒX‚ÌURLŽæ“¾
+procedure TGikoForm.GetResURLMenuClick(Sender: TObject);
+begin
+;
+end;
 
 initialization
 				OleInitialize(nil);

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -37,7 +37,7 @@ object GikoDM: TGikoDM
     end
     object NewBoardAction: TAction
       Category = #12501#12449#12452#12523
-      Caption = #26495#26356#26032'(&B)...'
+      Caption = #26495#19968#35239#26356#26032'(&B)...'
       Hint = #12508#12540#12489#26356#26032#12480#12452#12450#12525#12464#12434#34920#31034#12377#12427
       OnExecute = NewBoardActionExecute
     end
@@ -1201,6 +1201,19 @@ object GikoDM: TGikoDM
       Hint = #12473#12524#12483#12489#12398#23481#37327#12434#12501#12449#12452#12523#12363#12425#20877#35336#31639#12377#12427
       OnExecute = ThreadSizeCalcForFileActionExecute
     end
+    object SetInputAssistAction: TAction
+      Category = #12484#12540#12523
+      Caption = #20837#21147#12450#12471#12473#12488#12398#35373#23450
+      Hint = #20837#21147#12450#12471#12473#12488#12398#35373#23450#12501#12457#12540#12512#12434#38283#12367
+      OnExecute = SetInputAssistActionExecute
+    end
+    object OpenFindDialogAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12398#26908#32034#12480#12452#12450#12525#12464#12434#34920#31034#12377#12427
+      Hint = #29694#22312#34920#31034#12375#12390#12356#12427#12473#12524#12483#12489#12398#26908#32034#12480#12452#12450#12525#12464#12434#34920#31034#12377#12427
+      ShortCut = 16454
+      OnExecute = OpenFindDialogActionExecute
+    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -11,7 +11,8 @@ uses
 	SHDocVw_TLB,
 	MSHTML_TLB,
 {$IFEND}
-  ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs;
+  ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs,
+  ActiveX;
 
 const
 	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
@@ -212,6 +213,8 @@ type
 	ToobarImageList: TImageList;
     SaveDialog: TSaveDialog;
     ThreadSizeCalcForFileAction: TAction;
+    SetInputAssistAction: TAction;
+    OpenFindDialogAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -394,6 +397,8 @@ type
 	procedure AllSelectActionExecute(Sender: TObject);
 	procedure AllSelectActionUpdate(Sender: TObject);
     procedure ThreadSizeCalcForFileActionExecute(Sender: TObject);
+    procedure SetInputAssistActionExecute(Sender: TObject);
+    procedure OpenFindDialogActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -434,7 +439,7 @@ uses
 	ToolBarUtil, NewBoard, HTMLCreate, IndividualAbon,
 	GikoBayesian, About, ShellAPI,
 	RoundName, RoundData, Menus, ListViewUtils,
-	ThreadControl, GikoMessage;
+	ThreadControl, GikoMessage, InputAssist;
 
 
 {$R *.dfm}
@@ -884,22 +889,16 @@ end;
 procedure TGikoDM.SetThreadAreaHorNormal;
 begin
 	//’ʏí•\Ž¦‚É‚·‚é
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
 	GikoForm.ViewPanel.Width := GikoForm.BrowserSizeWidth;
 	BrowserMaxAction.ImageIndex := TOOL_ICON_WIDTH_MAX;
 	BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_MIN;
 	GikoSys.Setting.ListWidthState := glsNormal;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 end;
 // *************************************************************************
 //! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒAÅ‘å/Å¬•\Ž¦‚É‚·‚é ’)ListOrientation = gloHorizontal@
 // *************************************************************************
 procedure TGikoDM.SetThreadAreaHorizontal(gls : TGikoListState);
 begin
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
 	if GikoSys.Setting.ListWidthState = glsNormal then
 		GikoForm.BrowserSizeWidth := GikoForm.ViewPanel.Width;
 	//Å‘å•\Ž¦
@@ -914,8 +913,6 @@ begin
 		BrowserMinAction.ImageIndex := TOOL_ICON_WIDTH_NORMAL;
 		GikoSys.Setting.ListWidthState := glsMin;
 	end;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 end;
 // *************************************************************************
 //! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒA’ʏí•\Ž¦‚É‚·‚é ’)ListOrientation = gloVertical
@@ -923,22 +920,16 @@ end;
 procedure TGikoDM.SetThreadAreaVerNormal;
 begin
 	//’ʏí•\Ž¦‚É‚·‚é
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
 	GikoForm.ViewPanel.Height := GikoForm.BrowserSizeHeight;
 	BrowserMaxAction.ImageIndex := TOOL_ICON_HEIGHT_MAX;
 	BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 	GikoSys.Setting.ListHeightState := glsNormal;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 end;
 // *************************************************************************
 //! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒAÅ‘å/Å¬•\Ž¦‚É‚·‚é ’)ListOrientation = gloVertical
 // *************************************************************************
 procedure TGikoDM.SetThreadAreaVertical(gls : TGikoListState);
 begin
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 0, 0);  //•`‰æ’âŽ~
 	if GikoSys.Setting.ListHeightState = glsNormal then
 		GikoForm.BrowserSizeHeight := GikoForm.ViewPanel.Height;
 	if (gls = glsMin) then begin
@@ -952,8 +943,6 @@ begin
 		BrowserMinAction.ImageIndex := TOOL_ICON_HEIGHT_MIN;
 		GikoSys.Setting.ListHeightState := glsMax;
 	end;
-	if GikoForm.ActiveContent <> nil then
-		SendMessage(GikoForm.ActiveContent.Browser.Handle, WM_SETREDRAW, 1, 0);  //•`‰æ
 end;
 // *************************************************************************
 //! ƒXƒŒƒbƒh•\Ž¦ƒGƒŠƒA‚ð‘å‚«‚­•\Ž¦‚·‚é
@@ -1062,7 +1051,6 @@ begin
 	if Item = nil then Exit;
 	Editor := TEditorForm.Create(GikoForm.GetMainForm);
 	Editor.SetThreadItem(Item);
-	GikoSys.LoadKeySetting(Editor.ActionList, GikoSys.GetEditorKeyFileName);
 	Editor.Show;
 	Editor.BodyEdit.SetFocus;
 end;
@@ -1563,7 +1551,7 @@ begin
 	try
 		if Dlg.ShowModal = mrOk then begin
 			GikoSys.SaveKeySetting(GikoFormActionList, Setting.KEY_SETTING_FILE_NAME);
-			GikoSys.SaveKeySetting(Dlg.EditorForm.ActionList, Setting.KEY_SETTING_FILE_NAME);
+			GikoSys.SaveKeySetting(Dlg.EditorForm.ActionList, Setting.EKEY_SETTING_FILE_NAME);
 			GikoSys.Setting.Gestures.SaveGesture( GikoSys.Setting.GetGestureFileName );
 		end;
 
@@ -2227,7 +2215,6 @@ begin
 
 	Editor := TEditorForm.Create(GikoForm);
 	Editor.SetThreadItem(Item);
-	GikoSys.LoadKeySetting(Editor.ActionList, GikoSys.GetEditorKeyFileName); 
 	Editor.BodyEdit.Text := '>>' + IntToStr(Number) + #13#10;
 	Editor.Show;
 	Editor.BodyEdit.SetFocus;
@@ -2781,6 +2768,7 @@ var
 	shiftDown: Boolean;
 begin
 	shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
+    GikoForm.ActiveListColumnSave;
 	if GikoForm.GetActiveList is TCategory then begin
 		List := TList.Create;
 		try
@@ -3782,6 +3770,53 @@ begin
 	GikoForm.ProgressBar.Position := 0;
 	ShowMessage('ŒvŽZI—¹‚µ‚Ü‚µ‚½B');
 end;
+//! “ü—̓AƒVƒXƒg‚̐ݒèƒtƒH[ƒ€‚ðŒÄ‚яo‚·
+procedure TGikoDM.SetInputAssistActionExecute(Sender: TObject);
+var
+	form : TInputAssistForm;
+begin
+	form := TInputAssistForm.Create(GikoForm);
+	try
+		form.SetUpFromMain;
+		form.ShowModal;
+	finally
+		form.Release;
+	end;
+end;
+// WebBrowser‚ÌŒŸõƒ_ƒCƒAƒƒO‚ðŒÄ‚яo‚·
+procedure OpenFindDialog(Browser: TWebbrowser);
+const
+	CGID_WebBrowser: TGUID = '{ED016940-BD5B-11cf-BA4E-00C04FD70816}';
+	HTMLID_FIND = 1;
+var
+	CmdTarget : IOleCommandTarget;
+	vaIn, vaOut: OleVariant;
+	PtrGUID: PGUID;
+begin
+	if Browser.Document <> nil then begin
+		New(PtrGUID);
+		PtrGUID^ := CGID_WebBrowser;
+		try
+			Browser.Document.QueryInterface(IOleCommandTarget, CmdTarget);
+			if CmdTarget <> nil then begin
+				try
+					CmdTarget.Exec(PtrGUID, HTMLID_FIND, 0, vaIn, vaOut);
+				finally
+					CmdTarget._Release;
+				end;
+			end;
+		except
+		end;
+		Dispose(PtrGUID);
+	end;
+end;
+//! Œ»Ý•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒƒbƒh‚ÌŒŸõƒ_ƒCƒAƒƒO‚ð•\Ž¦‚·‚é
+procedure TGikoDM.OpenFindDialogActionExecute(Sender: TObject);
+begin
+	if( GikoForm.ActiveContent <> nil) and (GikoForm.ActiveContent.Browser <> nil) then begin
+    	OpenFindDialog(GikoForm.ActiveContent.Browser);
+	end;
+end;
 
 end.
 

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -152,6 +152,7 @@ type
 
 		function GetMainKeyFileName : String;
 		function GetEditorKeyFileName: String;
+		function GetInputAssistFileName: String;
 		procedure ReadSubjectFile(Board: TBoard);
 		procedure CreateThreadDat(Board: TBoard);
 		procedure WriteThreadDat(Board: TBoard);
@@ -254,7 +255,7 @@ const
 	ZERO_DATE: Integer	= 25569;
 	BETA_VERSION_NAME_E = 'beta';
 	BETA_VERSION_NAME_J = 'ÊÞÀ';
-	BETA_VERSION				= 51;
+	BETA_VERSION				= 52;
 	BETA_VERSION_BUILD	= '';				//!< debug”Å‚È‚Ç
 	APP_NAME						= 'gikoNavi';
 	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';
@@ -3248,7 +3249,11 @@ function TGikoSys.GetEditorKeyFileName: String;
 begin
 	Result := Setting.GetEditorKeyFileName;
 end;
-
+//! “ü—̓AƒVƒXƒg‚̐ݒèƒtƒ@ƒCƒ‹–¼
+function TGikoSys.GetInputAssistFileName: String;
+begin
+	Result := Setting.GetInputAssistFileName;
+end;
 //! ƒMƒRƒiƒr‚̃ƒbƒZ[ƒW‚ðÝ’è‚·‚é
 procedure TGikoSys.SetGikoMessage;
 begin

--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -15,7 +15,7 @@ uses
 	{HttpApp,} YofUtils, {URLMon,} BoardGroup, {gzip,} {Dolib,}
 	{bmRegExp,} AbonUnit,	MojuUtils, Setting,
 	ExternalBoardManager, ExternalBoardPlugInMain{,}
-	{Sort,} ,GikoBayesian, HintWindow;
+	{Sort,} ,GikoBayesian, HintWindow, ActiveX;
 
 type
 
@@ -38,10 +38,10 @@ type
 		constructor Create;
 
 		function AddBeProfileLink(AID : string; ANum: Integer):string ;
-		procedure CreateUsePluginHTML(doc: Variant; ThreadItem: TThreadItem; var sTitle: string);
-		procedure CreateUseSKINHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList);
-		procedure CreateUseCSSHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
-		procedure CreateDefaultHTML (doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+		procedure CreateUsePluginHTML(html:TStringList; ThreadItem: TThreadItem; var sTitle: string);
+		procedure CreateUseSKINHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList);
+		procedure CreateUseCSSHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+		procedure CreateDefaultHTML (html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 		procedure ConvertResAnchor(PRes: PResRec);
 		procedure separateNumber(var st: String; var et: String; const Text, Separator: String);
 		function checkComma(const s : String; var j : Integer; var No  : String) : boolean;
@@ -54,7 +54,7 @@ type
 		function SkinedRes(const skin: string; PRes: PResRec; const No: string): string;
 		procedure ConvRes( PRes : PResRec; PResLink : PResLinkRec; DatToHTML: boolean = false); overload;
 		function ConvRes(const Body, Bbs, Key,	ParamBBS, ParamKey, ParamStart, ParamTo, ParamNoFirst, ParamTrue : string; DatToHTML: boolean = false): string; overload;
-		procedure CreateHTML2(doc: Variant; ThreadItem: TThreadItem; var sTitle: string);
+		procedure CreateHTML2(doc: IDispatch; ThreadItem: TThreadItem; var sTitle: string);
 		procedure CreateHTML3(var html: TStringList; ThreadItem: TThreadItem; var sTitle: string);
 		//ƒŒƒXƒ|ƒbƒvƒAƒbƒv‚̍쐬
 		procedure SetResPopupText(Hint :TResPopup; threadItem: TThreadItem; StNum, ToNum: Integer; Title, First: Boolean);
@@ -778,7 +778,7 @@ begin
 end;
 
 //Plugin‚ð—˜—p‚·‚éBoard‚̃XƒŒƒbƒh‚ÌHTML‚ðì¬‚µ‚Ädoc‚ɏ‘‚«ž‚Þ
-procedure THTMLCreate.CreateUsePluginHTML(doc: Variant; ThreadItem: TThreadItem; var sTitle: string);
+procedure THTMLCreate.CreateUsePluginHTML(html:TStringList; ThreadItem: TThreadItem; var sTitle: string);
 var
 	i: integer;
 	NewReceiveNo: Integer;
@@ -791,11 +791,11 @@ begin
 	// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
 	UserOptionalStyle := GikoSys.SetUserOptionalStyle;
 	try
-		doc.open;
+//		doc.open;
 		// ƒwƒbƒ_
-		doc.Write( boardPlugIn.GetHeader( DWORD( threadItem ),
+		html.add(boardPlugIn.GetHeader( DWORD( threadItem ),
 			'<style type="text/css">body {' + UserOptionalStyle + '}</style>' ));
-		doc.Write('<p id="idSearch"></p>');
+		html.Add('<p id="idSearch"></p>');
 
 		for i := 0 to threadItem.Count - 1 do begin
 			// 1 ‚Í•K‚¸•\Ž¦
@@ -819,56 +819,56 @@ begin
 				try
 					if GikoSys.Setting.UseSkin then begin
 						if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-							doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
+							html.Add( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
 						else
-							doc.Write( '<a name="new"></a>');
+							html.Add( '<a name="new"></a>');
 					end else if GikoSys.Setting.UseCSS then begin
-						doc.Write('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
+						html.Add('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
 					end else begin
-						doc.Write('</dl>');
-						doc.Write('<a name="new"></a>');
-						doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
-						doc.Write('<dl>');
+						html.Add('</dl>');
+						html.Add('<a name="new"></a>');
+						html.Add('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
+						html.Add('<dl>');
 					end;
 				except
-					doc.Write( '<a name="new"></a>');
+					html.Add( '<a name="new"></a>');
 				end;
 			end;
 
 			// ƒŒƒX
-			doc.Write( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ));
+			html.Add( boardPlugIn.GetRes( DWORD( threadItem ), i + 1 ));
 
 			if ThreadItem.Kokomade = (i + 1) then begin
 				// ‚±‚±‚Ü‚Å“Ç‚ñ‚¾
 				try
 					if GikoSys.Setting.UseSkin then begin
 						if FileExists( GikoSys.GetSkinBookmarkFileName ) then
-							doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
+							html.Add( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ))
 						else
-							doc.Write( '<a name="koko"></a>');
+							html.Add( '<a name="koko"></a>');
 					end else if GikoSys.Setting.UseCSS then begin
-						doc.Write('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
+						html.Add('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
 					end else begin
-						doc.Write('</dl>');
-						doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
-						doc.Write('<dl>');
+						html.Add('</dl>');
+						html.Add('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
+						html.Add('<dl>');
 					end;
 				except
-					doc.Write( '<a name="koko"></a>');
+					html.Add('<a name="koko"></a>');
 				end;
 			end;
 		end;
 
 
 		// ƒXƒLƒ“(ƒtƒbƒ^)
-		doc.Write( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ));
+		html.Add( boardPlugIn.GetFooter( DWORD( threadItem ), '<a name="bottom"></a>' ));
 	finally
-		doc.Close;
+		//doc.Close;
 	end;
 end;
 
 
-procedure THTMLCreate.CreateUseSKINHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList);
+procedure THTMLCreate.CreateUseSKINHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList);
 const
 	KOKO_TAG = '<a name="koko"></a>';
 	NEW_TAG = '<a name="new"></a>';
@@ -890,9 +890,9 @@ begin
 	ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
 	ResLink.FKey := ThreadName;
 	//,
-	doc.open;
+	//doc.open;
 	try
-		doc.charset := 'Shift_JIS';
+		//doc.charset := 'Shift_JIS';
 
 		// ƒXƒLƒ“‚̐ݒè
 		try
@@ -900,14 +900,14 @@ begin
 			if Length( UserOptionalStyle ) > 0 then
 				SkinHeader := CustomStringReplace( SkinHeader, '</head>',
 					'<style type="text/css">body {' + UserOptionalStyle + '}</style></head>');
-			doc.Write( SkinHeader );
+			html.Add( SkinHeader );
 		except
 		end;
 
 		SkinNewRes := LoadFromSkin( GikoSys.GetSkinNewResFileName, ThreadItem, ThreadItem.Size);
 		SkinRes := LoadFromSkin( GikoSys.GetSkinResFileName, ThreadItem, ThreadItem.Size );
 
-		doc.Write('<p id="idSearch"></p>'#13#10'<a name="top"></a>');
+		html.Add('<p id="idSearch"></p>'#13#10'<a name="top"></a>');
 
 		for i := 0 to ReadList.Count - 1 do begin
 			// 1 ‚Í•K‚¸•\Ž¦
@@ -929,9 +929,9 @@ begin
 			// V’…ƒ}[ƒN
 			if (NewReceiveNo = i + 1) or ((NewReceiveNo = 0) and (i = 0)) then begin
 				if FileExists( GikoSys.GetSkinNewmarkFileName ) then
-					doc.Write( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
+					html.Add( LoadFromSkin( GikoSys.GetSkinNewmarkFileName, ThreadItem, ThreadItem.Size ))
 				else
-					doc.Write( NEW_TAG );
+					html.Add( NEW_TAG );
 			end;
 
 			if (Trim(ReadList[i]) <> '') then begin
@@ -942,30 +942,30 @@ begin
 
 				if NewReceiveNo <= (i + 1) then
 					// V’…ƒŒƒX
-					doc.Write(SkinedRes(SkinNewRes, @Res, IntToStr(i + 1)))
+					html.Add(SkinedRes(SkinNewRes, @Res, IntToStr(i + 1)))
 				else
 					// ’ʏí‚̃ŒƒX
-					doc.Write(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
+					html.Add(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
 			end;
 
 			if ThreadItem.Kokomade = (i + 1) then begin
 				// ‚±‚±‚Ü‚Å“Ç‚ñ‚¾
 				if FileExists( GikoSys.GetSkinBookmarkFileName ) then
-					doc.Write( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ) + #13#10 )
+					html.Add( LoadFromSkin( GikoSys.GetSkinBookmarkFileName, ThreadItem, ThreadItem.Size ))
 				else
-					doc.Write( KOKO_TAG );
+					html.Add( KOKO_TAG );
 			end;
 		end;
 
-		doc.Write('<a name="bottom"></a>');
+		html.Add('<a name="bottom"></a>');
 		// ƒXƒLƒ“(ƒtƒbƒ^)
-		doc.Write( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
+		html.Add( LoadFromSkin( GikoSys.GetSkinFooterFileName, ThreadItem, ThreadItem.Size ) );
 	finally
-		doc.close;
+		//doc.close;
 	end;
 end;
 
-procedure THTMLCreate.CreateUseCSSHTML(doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+procedure THTMLCreate.CreateUseCSSHTML(html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 const
 	FORMAT_NOMAIL  = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
 					+ '<span class="name_label">–¼‘OF</span> <span class="name"><b>%s</b></span>'
@@ -975,13 +975,12 @@ const
 	FORMAT_SHOWMAIL = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
 					+ '<span class="name_label"> –¼‘OF </span><a class="name_mail" href="mailto:%s">'
 					+ '<b>%s</b></a><span class="mail"> [%s]</span><span class="date_label"> “Še“úF</span>'
-					+ '<span class="date"> %s</span></div><div class="mes">%s </div>';
+					+ '<span class="date"> %s</span></div><div class="mes">%s</div>';
 
 	FORMAT_NOSHOW = '<a name="%s"></a><div class="header"><span class="no"><a href="menu:%s">%s</a></span>'
 					+ '<span class="name_label"> –¼‘OF </span><a class="name_mail" href="mailto:%s">'
 					+ '<b>%s</b></a><span class="date_label"> “Še“úF</span><span class="date"> %s</span></div>'
-					+ '<div class="mes">%s </div>';
-
+					+ '<div class="mes">%s</div>';
 var
 	i: integer;
 	No: string;
@@ -992,9 +991,9 @@ var
 	ThreadName :String;
 	ResLink :TResLinkRec;
 begin
-	doc.open;
+	//doc.open;
 	try
-		doc.charset := 'Shift_JIS';
+		//doc.charset := 'Shift_JIS';
 		NewReceiveNo := ThreadItem.NewReceive;
 		ThreadName := ChangeFileExt(ThreadItem.FileName, '');
 		ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
@@ -1004,15 +1003,15 @@ begin
 		CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
 		if GikoSys.Setting.UseCSS and FileExists(CSSFileName) then begin
 			//CSSŽg—p
-			doc.Write('<html><head>');
-			doc.Write('<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">');
-			doc.Write('<title>' + sTitle + '</title>');
-			doc.Write('<link rel="stylesheet" href="'+CSSFileName+'" type="text/css">');
+			html.Add('<html><head>');
+			html.Add('<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">');
+			html.Add('<title>' + sTitle + '</title>');
+			html.Add('<link rel="stylesheet" href="'+CSSFileName+'" type="text/css">');
 			if Length( UserOptionalStyle ) > 0 then
-				doc.Write('<style type="text/css">body {' + UserOptionalStyle + '}</style>');
-			doc.Write('</head>'#13#10'<body>');
-			doc.Write('<a name="top"></a>'#13#10'<p id="idSearch"></p>');
-			doc.Write('<div class="title">' + sTitle + '</div>');
+				html.Add('<style type="text/css">body {' + UserOptionalStyle + '}</style>');
+			html.Add('</head>'#13#10'<body>');
+			html.Add('<a name="top"></a>'#13#10'<p id="idSearch"></p>');
+			html.Add('<div class="title">' + sTitle + '</div>');
 			for i := 0 to ReadList.Count - 1 do begin
 				// 1 ‚Í•K‚¸•\Ž¦
 				if i <> 0 then begin
@@ -1031,7 +1030,7 @@ begin
 				end;
 
 				if (NewReceiveNo = (i + 1)) or ((NewReceiveNo = 0) and (i = 0)) then begin
-					doc.Write('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
+					html.Add('<a name="new"></a><div class="new">V’…ƒŒƒX <span class="newdate">' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</span></div>');
 				end;
 
 				if (Trim(ReadList[i]) <> '') then begin
@@ -1041,29 +1040,29 @@ begin
 					ConvRes(@Res, @ResLink);
 					Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 					if Res.FMailTo = '' then
-						doc.Write(Format(FORMAT_NOMAIL, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]))
+						html.Add(Format(FORMAT_NOMAIL, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]))
 					else if GikoSys.Setting.ShowMail then
-						doc.Write(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
+						html.Add(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
 					else
-						doc.Write(Format(FORMAT_NOSHOW, [No, No, No, Res.FName, Res.FDateTime, Res.FBody]));
+						html.Add(Format(FORMAT_NOSHOW, [No, No, No, Res.FMailTo, Res.FName, Res.FDateTime, Res.FBody]));
 				end;
 
 				if ThreadItem.Kokomade = (i + 1) then begin
-					doc.Write('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
+					html.Add('<a name="koko"></a><div class="koko">ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</div>');
 				end;
 
 			end;
 
-			doc.Write('<a name="bottom"></a>');
-			doc.Write('<a name="last"></a>');
-			doc.Write('</body></html>');
+			html.Add('<a name="bottom"></a>');
+			html.Add('<a name="last"></a>');
+			html.Add('</body></html>');
 		end;
 	finally
-		doc.Close;
+		//doc.Close;
 	end;
 end;
 
-procedure THTMLCreate.CreateDefaultHTML (doc: Variant; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
+procedure THTMLCreate.CreateDefaultHTML (html:TStringList; ThreadItem: TThreadItem; ReadList: TStringList; sTitle: string );
 var
 	i: integer;
 	No: string;
@@ -1072,21 +1071,21 @@ var
 	ThreadName: String;
 	ResLink : TResLinkRec;
 begin
-	doc.open;
+//	doc.open;
 	try
-		doc.charset := 'Shift_JIS';
+//		doc.charset := 'Shift_JIS';
 		NewReceiveNo := ThreadItem.NewReceive;
 		ThreadName := ChangeFileExt(ThreadItem.FileName, '');
 		ResLink.FBbs := ThreadItem.ParentBoard.BBSID;
 		ResLink.FKey := ThreadName;
-		doc.Write('<html><head>'#13#10);
-		doc.Write('<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">'#13#10);
-		doc.Write('<title>' + sTitle + '</title></head>'#13#10);
-		doc.Write('<body TEXT="#000000" BGCOLOR="#EFEFEF" link="#0000FF" alink="#FF0000" vlink="#660099">'#13#10);
-		doc.Write('<a name="top"></a>'#13#10);
-		doc.Write('<font size=+1 color="#FF0000">' + sTitle + '</font>'#13#10);
-		doc.Write('<dl>'#13#10);
-		doc.Write('<p id="idSearch"></p>'#13#10);
+		html.Add('<html><head>');
+		html.Add('<meta http-equiv="Content-type" content="text/html; charset=Shift_JIS">');
+		html.Add('<title>' + sTitle + '</title></head>');
+		html.Add('<body TEXT="#000000" BGCOLOR="#EFEFEF" link="#0000FF" alink="#FF0000" vlink="#660099">');
+		html.Add('<a name="top"></a>');
+		html.Add('<font size=+1 color="#FF0000">' + sTitle + '</font>');
+		html.Add('<dl>');
+		html.Add('<p id="idSearch"></p>');
 		for i := 0 to ReadList.Count - 1 do begin
 			// 1 ‚Í•K‚¸•\Ž¦
 			if i <> 0 then begin
@@ -1105,10 +1104,10 @@ begin
 			end;
 
 			if (NewReceiveNo = (i + 1)) or ((NewReceiveNo = 0) and (i = 0)) then begin
-				doc.Write('</dl>');
-				doc.Write('<a name="new"></a>');
-				doc.Write('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
-				doc.Write('<dl>');
+				html.Add('</dl>');
+				html.Add('<a name="new"></a>');
+				html.Add('<table width="100%" bgcolor="#3333CC" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#6666FF" valign="middle"><font size="-1" color="#ffffff"><b>V’…ƒŒƒX ' + FormatDateTime('yyyy/mm/dd(ddd) hh:mm', ThreadItem.RoundDate) + '</b></font></td></tr></table>');
+				html.Add('<dl>');
 			end;
 
 			if (Trim(ReadList[i]) <> '') then begin
@@ -1118,30 +1117,32 @@ begin
 				ConvRes(@Res, @ResLink);
 				Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
 				if Res.FMailTo = '' then
-					doc.Write('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+					html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<font color="forestgreen"><b> ' + Res.FName + ' </b></font> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
 				else if GikoSys.Setting.ShowMail then
-					doc.Write('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+					html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
 				else
-					doc.Write('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
+					html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> –¼‘OF<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> “Še“úF <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
 			end;
 			if ThreadItem.Kokomade = (i + 1) then begin
-				doc.Write('</dl>');
-				doc.Write('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
-				doc.Write('<dl>');
+				html.Add('</dl>');
+				html.Add('<a name="koko"></a><table width="100%" bgcolor="#55AA55" cellpadding="0" cellspacing="1"><tr><td align="center" bgcolor="#77CC77" valign="middle"><font size="-1" color="#ffffff"><b>ƒRƒR‚Ü‚Å“Ç‚ñ‚¾</b></font></td></tr></table>');
+				html.Add('<dl>');
 			end;
 		end;
-		doc.Write('</dl>'#13#10'<a name="bottom"></a>'#13#10'</body></html>');
+		html.Add('</dl>'#13#10'<a name="bottom"></a>'#13#10'</body></html>');
 	finally
-		doc.Close;
+		//doc.Close;
 	end;
 end;
 
-procedure THTMLCreate.CreateHTML2(doc: Variant; ThreadItem: TThreadItem; var sTitle: string);
+procedure THTMLCreate.CreateHTML2(doc: IDispatch; ThreadItem: TThreadItem; var sTitle: string);
 var
 	ReadList: TStringList;
 	CSSFileName: string;
 	FileName: string;
 	Res: TResRec;
+	body : TStringList;
+	mStream : TMemoryStream;
 {$IFDEF DEBUG}
 	st, rt: Cardinal;
 {$ENDIF}
@@ -1151,45 +1152,60 @@ begin
 	st := GetTickCount;
 {$ENDIF}
 	if ThreadItem <> nil then begin
-		if ThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
-			CreateUsePluginHTML(doc, ThreadItem, sTitle);
-		end else begin
-			ShortDayNames[1] := '“ú';		ShortDayNames[2] := 'ŒŽ';
-			ShortDayNames[3] := '‰Î';		ShortDayNames[4] := '…';
-			ShortDayNames[5] := '–Ø';		ShortDayNames[6] := '‹à';
-			ShortDayNames[7] := '“y';
+		body := TStringList.Create;
+		try
+			body.BeginUpdate;
+			if ThreadItem.ParentBoard.IsBoardPlugInAvailable then begin
+				CreateUsePluginHTML(body, ThreadItem, sTitle);
+			end else begin
+				ShortDayNames[1] := '“ú';		ShortDayNames[2] := 'ŒŽ';
+				ShortDayNames[3] := '‰Î';		ShortDayNames[4] := '…';
+				ShortDayNames[5] := '–Ø';		ShortDayNames[6] := '‹à';
+				ShortDayNames[7] := '“y';
 
-			ReadList := TStringList.Create;
-			try
-				if ThreadItem.IsLogFile then begin
-					ReadList.BeginUpdate;
-					FileName := ThreadItem.GetThreadFileName;
-					ReadList.LoadFromFile(FileName);
-					ReadList.EndUpdate;
-					GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
-					GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
-					GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
-					if ThreadItem.Title = '' then begin
-						DivideStrLine(ReadList[0], @Res);
-						sTitle := Res.FTitle;
-					end else
-						sTitle := ThreadItem.Title
-				end else begin
-					sTitle := CustomStringReplace(ThreadItem.Title, '—M', ',');
-				end;
-				// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
-				CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
-				if GikoSys.Setting.UseSkin then begin
-					CreateUseSKINHTML(doc, ThreadItem, ReadList);
-				end else if GikoSys.Setting.UseCSS and FileExists(CSSFileName) then begin
-					CreateUseCSSHTML(doc, ThreadItem, ReadList, sTitle);
-				end else begin
-					CreateDefaultHTML(doc, ThreadItem, ReadList, sTitle);
+				ReadList := TStringList.Create;
+				try
+					if ThreadItem.IsLogFile then begin
+						ReadList.BeginUpdate;
+						FileName := ThreadItem.GetThreadFileName;
+						ReadList.LoadFromFile(FileName);
+						ReadList.EndUpdate;
+						GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
+						GikoSys.FAbon.Execute(ReadList);		//	 ‚ ‚ځ`‚ñ‚µ‚Ä
+						GikoSys.FSelectResFilter.Execute(ReadList); //ƒŒƒX‚̃tƒBƒ‹ƒ^ƒŠƒ“ƒO‚ð‚·‚é
+						if ThreadItem.Title = '' then begin
+							DivideStrLine(ReadList[0], @Res);
+							sTitle := Res.FTitle;
+						end else
+							sTitle := ThreadItem.Title
+					end else begin
+						sTitle := CustomStringReplace(ThreadItem.Title, '—M', ',');
+					end;
+					// ƒtƒHƒ“ƒg‚âƒTƒCƒY‚̐ݒè
+					CSSFileName := GikoSys.GetStyleSheetDir + GikoSys.Setting.CSSFileName;
+					if GikoSys.Setting.UseSkin then begin
+						CreateUseSKINHTML(body, ThreadItem, ReadList);
+					end else if GikoSys.Setting.UseCSS and FileExists(CSSFileName) then begin
+						CreateUseCSSHTML(body, ThreadItem, ReadList, sTitle);
+					end else begin
+						CreateDefaultHTML(body, ThreadItem, ReadList, sTitle);
+					end;
+                    body.EndUpdate;
+					//WebBrowser‚ɏ‘‚«ž‚Ý
+					mStream := TMemoryStream.Create;
+					try
+						body.SaveToStream(mStream);
+						mStream.Seek(soFromBeginning, 0);
+						(doc as IPersistStreamInit).Load(TStreamAdapter.Create(mStream));
+					finally
+						mStream.Free;
+					end;
+				finally
+					ReadList.Free;
 				end;
-
-			finally
-				ReadList.Free;
 			end;
+		finally
+			body.Free;
 		end;
 	end;
 {$IFDEF DEBUG}

--- /dev/null
+++ b/InputAssist.dfm
@@ -0,0 +1,405 @@
+object InputAssistForm: TInputAssistForm
+  Left = 589
+  Top = 279
+  Width = 397
+  Height = 460
+  Caption = #20837#21147#12450#12471#12473#12488#35373#23450
+  Color = clBtnFace
+  Font.Charset = SHIFTJIS_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -12
+  Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
+  Font.Style = []
+  OldCreateOrder = False
+  OnClose = FormClose
+  OnCreate = FormCreate
+  PixelsPerInch = 96
+  TextHeight = 12
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 389
+    Height = 200
+    Align = alTop
+    BevelOuter = bvLowered
+    Caption = 'Panel1'
+    TabOrder = 0
+    object Panel5: TPanel
+      Left = 295
+      Top = 33
+      Width = 93
+      Height = 166
+      Align = alRight
+      TabOrder = 0
+      object CloseButton: TButton
+        Left = 10
+        Top = 136
+        Width = 75
+        Height = 25
+        Caption = #32066#20102
+        TabOrder = 0
+        OnClick = CloseButtonClick
+      end
+      object ApplyButton: TButton
+        Left = 10
+        Top = 72
+        Width = 75
+        Height = 25
+        Caption = #36969#29992
+        TabOrder = 1
+        OnClick = ApplyButtonClick
+      end
+      object DeleteButton: TButton
+        Left = 10
+        Top = 40
+        Width = 75
+        Height = 25
+        Caption = #21066#38500
+        TabOrder = 2
+        OnClick = DeleteButtonClick
+      end
+      object AddButton: TButton
+        Left = 10
+        Top = 8
+        Width = 75
+        Height = 25
+        Caption = #36861#21152
+        TabOrder = 3
+        OnClick = AddButtonClick
+      end
+    end
+    object Panel6: TPanel
+      Left = 1
+      Top = 33
+      Width = 294
+      Height = 166
+      Align = alClient
+      BevelOuter = bvNone
+      Caption = 'Panel6'
+      TabOrder = 1
+      object GikoListView1: TGikoListView
+        Left = 0
+        Top = 0
+        Width = 294
+        Height = 166
+        Align = alClient
+        Columns = <>
+        ReadOnly = True
+        RowSelect = True
+        SmallImages = ColumnImageList
+        TabOrder = 0
+        ViewStyle = vsReport
+        OnColumnClick = GikoListView1ColumnClick
+        OnCompare = GikoListView1Compare
+        OnSelectItem = GikoListView1SelectItem
+      end
+    end
+    object Panel7: TPanel
+      Left = 1
+      Top = 1
+      Width = 387
+      Height = 32
+      Align = alTop
+      Caption = 'Panel7'
+      TabOrder = 2
+      object CategoryComboLabel: TLabel
+        Left = 12
+        Top = 10
+        Width = 77
+        Height = 12
+        Caption = #12459#12486#12468#12522#21517#36984#25246
+      end
+      object CategoryComboBox: TComboBox
+        Left = 105
+        Top = 6
+        Width = 176
+        Height = 20
+        ItemHeight = 12
+        TabOrder = 0
+        Text = 'CategoryComboBox'
+        OnChange = CategoryComboBoxChange
+        OnKeyPress = CategoryComboBoxKeyPress
+      end
+      object InsertButton: TButton
+        Left = 297
+        Top = 4
+        Width = 75
+        Height = 25
+        Action = InsertButtonAction
+        TabOrder = 1
+      end
+    end
+  end
+  object Panel2: TPanel
+    Left = 0
+    Top = 200
+    Width = 389
+    Height = 233
+    Align = alClient
+    BevelOuter = bvNone
+    Caption = 'Panel2'
+    TabOrder = 1
+    object Panel3: TPanel
+      Left = 0
+      Top = 0
+      Width = 389
+      Height = 48
+      Align = alTop
+      BevelOuter = bvNone
+      TabOrder = 0
+      object KeyNameEdit: TLabeledEdit
+        Left = 8
+        Top = 21
+        Width = 161
+        Height = 20
+        Hint = #20837#21147#12395#20351#12358#12461#12540#21517
+        EditLabel.Width = 36
+        EditLabel.Height = 12
+        EditLabel.Caption = #12461#12540#21517
+        LabelPosition = lpAbove
+        LabelSpacing = 3
+        TabOrder = 0
+      end
+      object CategoryNameEdit: TLabeledEdit
+        Left = 176
+        Top = 21
+        Width = 121
+        Height = 20
+        Hint = #20837#21147#12395#20351#12358#12459#12486#12468#12522#21517
+        EditLabel.Width = 53
+        EditLabel.Height = 12
+        EditLabel.Caption = #12459#12486#12468#12522#21517
+        LabelPosition = lpAbove
+        LabelSpacing = 3
+        TabOrder = 1
+      end
+    end
+    object Panel4: TPanel
+      Left = 0
+      Top = 48
+      Width = 389
+      Height = 185
+      Align = alClient
+      BevelOuter = bvNone
+      TabOrder = 1
+      object GroupBox1: TGroupBox
+        Left = 0
+        Top = 0
+        Width = 389
+        Height = 185
+        Align = alClient
+        Caption = #25407#20837#25991#23383#21015
+        TabOrder = 0
+        object TextMemo: TMemo
+          Left = 2
+          Top = 14
+          Width = 385
+          Height = 169
+          Hint = #25407#20837#12377#12427#25991#23383#21015
+          Align = alClient
+          ScrollBars = ssBoth
+          TabOrder = 0
+        end
+      end
+    end
+  end
+  object ColumnImageList: TImageList
+    Left = 312
+    Top = 192
+    Bitmap = {
+      494C010102000400040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      0000000000003600000028000000400000001000000001002000000000000010
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080808000FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008080
+      80008080800000000000000000000000000000000000FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008080800080808000FFFFFF00FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00008080800000000000000000000000000000000000FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000808080000000000000000000FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000080808000808080000000000000000000FFFFFF00FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000080808000808080000000000000000000FFFFFF00FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000808080000000000000000000FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00008080800000000000000000000000000000000000FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008080800080808000FFFFFF00FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008080
+      80008080800000000000000000000000000000000000FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000080808000FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008080
+      8000808080008080800080808000808080008080800080808000808080000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000424D3E000000000000003E000000
+      2800000040000000100000000100010000000000800000000000000000000000
+      000000000000000000000000FFFFFF00FFFFFFFF00000000FFFFFFFF00000000
+      FFFFFFFF00000000FFFFFFFF00000000E01FFCFF00000000E79FF87F00000000
+      F7BFFB7F00000000F33FF33F00000000FB7FF7BF00000000F87FE79F00000000
+      FCFFE01F00000000FFFFFFFF00000000FFFFFFFF00000000FFFFFFFF00000000
+      FFFFFFFF00000000FFFFFFFF0000000000000000000000000000000000000000
+      000000000000}
+  end
+  object InputAssistFormActionList: TActionList
+    Left = 360
+    Top = 192
+    object EditCut1: TEditCut
+      Category = #32232#38598
+      Caption = #20999#12426#21462#12426'(&T)'
+      Hint = #20999#12426#21462#12426'|'#36984#25246#37096#20998#12434#20999#12426#21462#12426#12289#12463#12522#12483#12503#12508#12540#12489#12395#36865#12427
+      ImageIndex = 0
+      ShortCut = 16472
+    end
+    object EditCopy1: TEditCopy
+      Category = #32232#38598
+      Caption = #12467#12500#12540'(&C)'
+      Hint = #12467#12500#12540'|'#36984#25246#37096#20998#12434#12467#12500#12540#12375#12289#12463#12522#12483#12503#12508#12540#12489#12395#36865#12427
+      ImageIndex = 1
+      ShortCut = 16451
+    end
+    object EditPaste1: TEditPaste
+      Category = #32232#38598
+      Caption = #36028#12426#20184#12369'(&P)'
+      Hint = #36028#12426#20184#12369'|'#12463#12522#12483#12503#12508#12540#12489#12398#20869#23481#12434#36028#12426#20184#12369#12427
+      ImageIndex = 2
+      ShortCut = 16470
+    end
+    object EditSelectAll1: TEditSelectAll
+      Category = #32232#38598
+      Caption = #12377#12409#12390#12434#36984#25246'(&A)'
+      Hint = #12377#12409#12390#12434#36984#25246'|'#12489#12461#12517#12513#12531#12488#20840#20307#12434#36984#25246#12377#12427
+      ShortCut = 16449
+    end
+    object EditUndo1: TEditUndo
+      Category = #32232#38598
+      Caption = #20803#12395#25147#12377'(&U)'
+      Hint = #20803#12395#25147#12377'|'#30452#21069#12398#22793#26356#12434#20803#12395#25147#12377
+      ImageIndex = 3
+      ShortCut = 16474
+    end
+    object EditDelete1: TEditDelete
+      Category = #32232#38598
+      Caption = #21066#38500'(&D)'
+      Hint = #21066#38500'|'#36984#25246#37096#20998#12434#21066#38500#12377#12427
+      ImageIndex = 5
+      ShortCut = 46
+    end
+    object InsertButtonAction: TAction
+      Category = #32232#38598
+      Caption = #25407#20837
+      OnExecute = InsertButtonActionExecute
+      OnUpdate = InsertButtonActionUpdate
+    end
+    object CloseAction: TAction
+      Category = #32232#38598
+      Caption = 'CloseAction'
+      OnExecute = CloseActionExecute
+    end
+  end
+end

--- /dev/null
+++ b/InputAssist.pas
@@ -0,0 +1,319 @@
+unit InputAssist;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, ComCtrls, GikoListView, Menus, ExtCtrls, ImgList,
+  InputAssistDataModule, StdActns, ActnList;
+
+type
+  TInputAssistForm = class(TForm)
+    Panel1: TPanel;
+    Panel2: TPanel;
+    GikoListView1: TGikoListView;
+    Panel3: TPanel;
+    KeyNameEdit: TLabeledEdit;
+    CategoryNameEdit: TLabeledEdit;
+	Panel4: TPanel;
+	TextMemo: TMemo;
+    ColumnImageList: TImageList;
+    InputAssistFormActionList: TActionList;
+    EditCut1: TEditCut;
+    EditCopy1: TEditCopy;
+    EditPaste1: TEditPaste;
+    EditSelectAll1: TEditSelectAll;
+    EditUndo1: TEditUndo;
+    EditDelete1: TEditDelete;
+    GroupBox1: TGroupBox;
+    Panel5: TPanel;
+    CloseButton: TButton;
+    ApplyButton: TButton;
+    DeleteButton: TButton;
+    AddButton: TButton;
+    Panel6: TPanel;
+    Panel7: TPanel;
+    CategoryComboBox: TComboBox;
+    CategoryComboLabel: TLabel;
+    InsertButton: TButton;
+    InsertButtonAction: TAction;
+    CloseAction: TAction;
+    procedure FormCreate(Sender: TObject);
+    procedure GikoListView1SelectItem(Sender: TObject; Item: TListItem;
+      Selected: Boolean);
+    procedure AddButtonClick(Sender: TObject);
+    procedure DeleteButtonClick(Sender: TObject);
+    procedure ApplyButtonClick(Sender: TObject);
+    procedure FormClose(Sender: TObject; var Action: TCloseAction);
+    procedure GikoListView1Compare(Sender: TObject; Item1,
+      Item2: TListItem; Data: Integer; var Compare: Integer);
+    procedure GikoListView1ColumnClick(Sender: TObject;
+      Column: TListColumn);
+    procedure CloseButtonClick(Sender: TObject);
+    procedure CategoryComboBoxKeyPress(Sender: TObject; var Key: Char);
+    procedure CategoryComboBoxChange(Sender: TObject);
+    procedure InsertButtonActionUpdate(Sender: TObject);
+    procedure InsertButtonActionExecute(Sender: TObject);
+    procedure CloseActionExecute(Sender: TObject);
+  private
+	{ Private éŒ¾ }
+	FSortColumn : Integer;
+	FInsertText : String;
+	procedure AddListViewItem(ResWord : TResistWord);
+  public
+	{ Public éŒ¾ }
+	procedure SetUpFromEditor();
+	procedure SetUpFromMain();
+	function GetInsertText(): String;
+  end;
+
+var
+  InputAssistForm: TInputAssistForm;
+
+implementation
+
+
+{$R *.dfm}
+//! ƒtƒH[ƒ€¶¬‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.FormCreate(Sender: TObject);
+var
+	i : Integer;
+	column: TListColumn;
+begin
+	FSortColumn := 0;
+	GikoListView1.Columns.Clear;
+	column := GikoListView1.Columns.Add;
+	column.ImageIndex := 0;
+	column.Caption := 'ƒL[';
+	column.Width := 150;
+	column := GikoListView1.Columns.Add;
+	column.Caption := 'ƒJƒeƒSƒŠ';
+	column.Width := 80;
+	for i := 0 to InputAssistDM.ResistWordCount - 1 do begin
+		AddListViewItem(InputAssistDM.GetResistWord(i));
+	end;
+	//ƒ\[ƒgó‘Ô‚ð‰ðœ (‰ðœ‚µ‚È‚¢‚ƃAƒCƒeƒ€‚̃L[–¼‚ð•ÏX‚Å‚«‚È‚¢)
+	InputAssistDM.Sorted := False;
+end;
+//! ˆê——‚ɃAƒCƒeƒ€‚ð’ljÁ‚·‚鏈—
+procedure TInputAssistForm.AddListViewItem(ResWord : TResistWord);
+var
+	item: TListItem;
+begin
+	item := GikoListView1.Items.Add;
+	item.ImageIndex := -1;
+	item.Caption := resWord.GetKey;
+	item.SubItems.Add(resWord.GetCategory);
+	item.Data := resWord;
+end;
+//! “o˜^’PŒêˆê——‚©‚çƒAƒCƒeƒ€‚ð‘I‘ð‚µ‚½‚Æ‚«‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.GikoListView1SelectItem(Sender: TObject;
+  Item: TListItem; Selected: Boolean);
+begin
+	if (Item <> nil) and (Item.Data <> nil) then begin
+		KeyNameEdit.Text := TResistWord(Item.Data).GetKey;
+		CategoryNameEdit.Text := TResistWord(Item.Data).GetCategory;
+		TextMemo.Lines.Text := TResistWord(Item.Data).GetText;
+	end else begin
+		TextMemo.Lines.Text := '';
+	end;
+end;
+//! ’ljÁƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.AddButtonClick(Sender: TObject);
+var
+	resWord : TResistWord;
+begin
+	if (Length(KeyNameEdit.Text) = 0) then begin
+		ShowMessage('ƒL[–¼‚ðÝ’肵‚Ä‚­‚¾‚³‚¢B');
+	end else begin
+		resWord := InputAssistDM.Add(KeyNameEdit.Text);
+		resWord.SetCategory(CategoryNameEdit.Text);
+		resWord.SetText(TextMemo.Text);
+		AddListViewItem(resWord);
+		GikoListView1.AlphaSort;
+	end;
+end;
+//! íœƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.DeleteButtonClick(Sender: TObject);
+begin
+	if GikoListView1.Selected <> nil then begin
+		InputAssistDM.DeleteResistWord(GikoListView1.Selected.Data);
+		GikoListView1.Selected.Data := nil;
+		GikoListView1.DeleteSelected;
+	end;
+end;
+//! “K—pƒ{ƒ^ƒ“‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.ApplyButtonClick(Sender: TObject);
+var
+	resWord : TResistWord;
+begin
+	if GikoListView1.Selected <> nil then begin
+		if (Length(KeyNameEdit.Text) = 0) then begin
+			ShowMessage('ƒL[–¼‚𖳂µ‚É‚Í‚Å‚«‚Ü‚¹‚ñB');
+		end else begin
+			resWord := TResistWord(GikoListView1.Selected.Data);
+			resWord.SetKey(KeyNameEdit.Text);
+			resWord.SetCategory(CategoryNameEdit.Text);
+			resWord.SetText(TextMemo.Text);
+			// ˆê——‚̍XV
+			GikoListView1.Selected.Caption := resWord.GetKey;
+			GikoListView1.Selected.SubItems[0] := resWord.GetCategory;
+			GikoListView1.AlphaSort;
+		end;
+	end;
+end;
+//! ƒtƒH[ƒ€‚ð•Â‚¶‚é‚Æ‚«‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.FormClose(Sender: TObject;
+  var Action: TCloseAction);
+begin
+	//ƒ\[ƒgó‘Ԃ̐ݒè
+	InputAssistDM.Sorted := True;
+end;
+//! “o˜^’PŒêˆê——‚̃\[ƒg—p‚Ì”äŠrˆ—
+procedure TInputAssistForm.GikoListView1Compare(Sender: TObject; Item1,
+  Item2: TListItem; Data: Integer; var Compare: Integer);
+begin
+	if ((FSortColumn and 2) > 0) then begin
+		// ƒJƒeƒSƒŠ‚Ń\[ƒg
+		Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
+		if (Compare = 0) then begin
+			Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
+		end;
+	end else begin
+		// ƒL[‚Ń\[ƒg
+		Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
+		if (Compare = 0) then begin
+			Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
+		end;
+	end;
+	// ¸‡~‡‚Ì”½“]
+	if ((FSortColumn and 1) > 0) then begin
+		Compare := Compare * -1;
+	end;
+	;
+end;
+//! “o˜^’PŒêˆê——‚̃ŠƒXƒg‚̃Jƒ‰ƒ€ƒNƒŠƒbƒNƒCƒxƒ“ƒg
+procedure TInputAssistForm.GikoListView1ColumnClick(Sender: TObject;
+  Column: TListColumn);
+var
+	i : Integer;
+begin
+	if Column <> nil then begin
+		// ƒCƒ[ƒW‚̍폜
+		for i := 0 to GikoListView1.Columns.Count - 1 do begin
+			GikoListView1.Column[i].ImageIndex := -1;
+		end;
+
+		// FSortColumn ‹ô”:¸‡ Šï”F~‡
+		if Column.Caption = 'ƒL[' then begin
+			if FSortColumn = 0 then begin
+				FSortColumn := 1;
+			end else begin
+				FSortColumn := 0;
+			end;
+		end else begin
+			if FSortColumn = 2 then begin
+				FSortColumn := 3;
+			end else begin
+				FSortColumn := 2;
+			end;
+		end;
+		Column.ImageIndex := (FSortColumn and 1);
+		GikoListView1.AlphaSort;
+	end;
+
+end;
+//! I—¹ƒ{ƒ^ƒ“‚ð‰Ÿ‰ºŽž‚̃Cƒxƒ“ƒg
+procedure TInputAssistForm.CloseButtonClick(Sender: TObject);
+begin
+	Close();
+end;
+//! ƒJƒeƒSƒŠiž‚݃Rƒ“ƒ{ƒ{ƒbƒNƒX‚ð“ÇŽæê—p‚É‚·‚邽‚߂̃Cƒxƒ“ƒgˆ—
+procedure TInputAssistForm.CategoryComboBoxKeyPress(Sender: TObject;
+  var Key: Char);
+begin
+	Key := #0;
+end;
+//! ƒJƒeƒSƒŠiž‚݃Rƒ“ƒ{ƒ{ƒbƒNƒX‚ł̃JƒeƒSƒŠ•ÏXˆ—
+procedure TInputAssistForm.CategoryComboBoxChange(Sender: TObject);
+var
+	i : Integer;
+	key : String;
+begin
+	LockWindowUpdate(GikoListView1.Handle);
+	GikoListView1.Clear;
+	if (CategoryComboBox.ItemIndex <= 0) then begin
+		for i := 0 to InputAssistDM.ResistWordCount - 1 do begin
+			AddListViewItem(InputAssistDM.GetResistWord(i));
+		end;
+	end else begin
+		key := CategoryComboBox.Items[CategoryComboBox.ItemIndex];
+		for i := 0 to InputAssistDM.ResistWordCount - 1 do begin
+			if (key = InputAssistDM.GetResistWord(i).GetCategory) then begin
+				AddListViewItem(InputAssistDM.GetResistWord(i));
+			end;
+		end;
+	end;
+	LockWindowUpdate(0);
+end;
+
+procedure TInputAssistForm.SetUpFromMain();
+begin
+	Self.Caption := '“ü—̓AƒVƒXƒgÝ’è';
+	Panel3.Visible := True;
+	Panel5.Visible := True;
+	Panel7.Visible := False;
+	TextMemo.ReadOnly := False;
+	FInsertText := '';
+	CloseAction.ShortCut := TShortCut(0);
+end;
+procedure TInputAssistForm.SetUpFromEditor();
+var
+	cat : TStringList;
+begin
+	Self.Caption := '“ü—̓AƒVƒXƒg';
+	Panel3.Visible := False;
+	Panel5.Visible := False;
+	Panel7.Visible := True;
+	TextMemo.ReadOnly := True;
+	FInsertText := '';
+	CloseAction.ShortCut := ShortCut(VK_ESCAPE, []);
+	// ŒŸõ—p
+	cat := TStringList.Create;
+	try
+		InputAssistDM.GetCategoryList(cat);
+		CategoryComboBox.Items.Clear;
+		CategoryComboBox.Items.Add('');
+		CategoryComboBox.Items.AddStrings(cat);
+		CategoryComboBox.ItemIndex := 0;
+	finally
+		cat.Free;
+	end;
+end;
+function TInputAssistForm.GetInsertText(): String;
+begin
+	Result := FInsertText;
+end;
+
+procedure TInputAssistForm.InsertButtonActionUpdate(Sender: TObject);
+begin
+	InsertButtonAction.Enabled := (GikoListView1.Selected <> nil);
+end;
+
+procedure TInputAssistForm.InsertButtonActionExecute(Sender: TObject);
+begin
+	if (GikoListView1.Selected = nil) then begin
+		FInsertText := '';
+		Self.ModalResult := mrNone;
+	end else begin
+		FInsertText :=  TResistWord(GikoListView1.Selected.Data).GetText;
+		Self.ModalResult := mrOk;
+	end;
+end;
+
+procedure TInputAssistForm.CloseActionExecute(Sender: TObject);
+begin
+	Self.ModalResult := mrCancel;
+end;
+
+end.

--- /dev/null
+++ b/InputAssistDataModule.dfm
@@ -0,0 +1,9 @@
+object InputAssistDM: TInputAssistDM
+  OldCreateOrder = False
+  OnCreate = DataModuleCreate
+  OnDestroy = DataModuleDestroy
+  Left = 582
+  Top = 174
+  Height = 150
+  Width = 215
+end

--- /dev/null
+++ b/InputAssistDataModule.pas
@@ -0,0 +1,371 @@
+unit InputAssistDataModule;
+
+interface
+
+uses
+  SysUtils, Classes;
+
+type
+  TResistWord = class;
+
+  TInputAssistDM = class(TDataModule)
+    procedure DataModuleDestroy(Sender: TObject);
+    procedure DataModuleCreate(Sender: TObject);
+  private
+	{ Private éŒ¾ }
+	FInit : Boolean;
+	FDictionary : TStringList;	///< “o˜^’PŒê‚Æ’èŒ^•¶‚ÌŽ«‘
+	function GetSorted: Boolean;	///< ƒ\[ƒg‚̏ó‘Ԃ̎擾
+	procedure SetSorted(Value: Boolean);	///< ƒ\[ƒgó‘Ԃ̐ݒè
+
+  public
+	{ Public éŒ¾ }
+	property Sorted : Boolean read GetSorted write SetSorted;
+	procedure Init(FilePath: String);
+	procedure SaveToFile(FilePath: String);
+	function ResistWordCount : Integer;	///<“o˜^’PŒê”Žæ“¾
+	function GetResistWord(Index: Integer): TResistWord;	///< “o˜^’PŒêŽæ“¾
+	procedure DeleteResistWord(ResistWord: TResistWord);  ///< “o˜^’PŒê‚̍폜
+	function Add(Key: String): TResistWord;	///< “o˜^’PŒê’ljÁ
+	procedure ChangeKey(ResistWord: TResistWord);  ///< “o˜^’PŒê‚̃L[•ÏX
+	//! Key‚ðƒL[‚ÉŽ‚“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+	function GetStartWithKeyResistWords(Key: String; var list: TStringList): Integer;
+	//! Key‚ðƒJƒeƒSƒŠ‚ÉŽ‚“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+	function GetStartWithCategoryResistWords(Key: String; var list: TStringList): Integer;
+	//! Key‚̃JƒeƒSƒŠ‚É“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+	function GetCategoryResistWords(Key: String; var list: TStringList): Integer;
+	//! “o˜^Ï‚݃L[‚Ì‘S‚ẴJƒeƒSƒŠƒŠƒXƒgŽæ“¾
+	procedure GetCategoryList(var list: TStringList);
+
+  end;
+
+  TResistWord = class(TObject)
+  private
+	FKey : String;		///< •ÏŠ·Žž‚̃L[‚É‚È‚é
+	FCategory : String;	///< •ª—Þ
+	FText : String;		///< ’èŒ^•¶
+  public
+	function GetKey: String;
+	procedure SetKey(Value: String);
+	function GetCategory: String;
+	procedure SetCategory(Value: String);
+	function GetText: String;
+	procedure SetText(Value: String);
+	property Key: String read FKey write FKey;
+	property Category: String read FCategory write FCategory;
+	property Text: String read GetText write SetText;
+  end;
+
+  function CategorySort(List: TStringList; Index1, Index2: Integer): Integer;
+var
+  InputAssistDM: TInputAssistDM;
+
+implementation
+
+uses
+  MojuUtils, IniFiles;
+
+{$R *.dfm}
+//! FKey‚ɐݒ肳‚ê‚Ä‚¢‚é’l‚ðŽæ“¾‚·‚é
+function TResistWord.GetKey: String;
+begin
+	//ƒGƒXƒP[ƒv‚µ‚Ä‚¢‚é=‚𕜌³‚·‚é
+	Result := MojuUtils.CustomStringReplace(FKey, '&#61;', '=');
+end;
+//! FKey‚É’l‚ðÝ’è‚·‚é
+procedure TResistWord.SetKey(Value: String);
+begin
+	//=‚Í•Û‘¶Žž‚ÉŽg‚¤‚̂ŃGƒXƒP[ƒv‚·‚é
+	FKey := MojuUtils.CustomStringReplace(Value, '=', '&#61;');
+end;
+//! FCategory‚ɐݒ肳‚ê‚Ä‚¢‚é’l‚ðŽæ“¾‚·‚é
+function TResistWord.GetCategory: String;
+begin
+	//ƒGƒXƒP[ƒv‚µ‚Ä‚¢‚é=‚𕜌³‚·‚é
+	Result := MojuUtils.CustomStringReplace(FCategory, '&#61;', '=');
+end;
+//! FCategory‚É’l‚ðÝ’è‚·‚é
+procedure TResistWord.SetCategory(Value: String);
+begin
+	//=‚Í•Û‘¶Žž‚ÉŽg‚¤‚̂ŃGƒXƒP[ƒv‚·‚é
+	FCategory := MojuUtils.CustomStringReplace(Value, '=', '&#61;');
+end;
+//! FText‚ɐݒ肳‚ê‚Ä‚¢‚é’l‚ðŽæ“¾‚·‚é
+function TResistWord.GetText: String;
+begin
+	//ƒGƒXƒP[ƒv‚µ‚Ä‚¢‚é=‚𕜌³‚·‚é
+	Result := MojuUtils.CustomStringReplace(FText, '&#61;', '=');
+	// #1‚É‚µ‚½‰üsƒR[ƒh‚ð#13#10‚É•œŒ³‚·‚é
+	Result := MojuUtils.CustomStringReplace(Result, #1, #13#10);
+end;
+procedure TResistWord.SetText(Value: String);
+begin
+	//=‚Í•Û‘¶Žž‚ÉŽg‚¤‚̂ŃGƒXƒP[ƒv‚·‚é
+	FText := MojuUtils.CustomStringReplace(Value, '=', '&#61;');
+	//‰üsƒR[ƒh‚ð#1‚É‚·‚éi1s‚É‚·‚邽‚ß)
+	FText := MojuUtils.CustomStringReplace(FText, #13#10, #1);
+end;
+//! ƒtƒ@ƒCƒ‹‚ð“ǂݍž‚ñ‚ŏ‰Šú‰»‚·‚é
+procedure TInputAssistDM.Init(FilePath: String);
+var
+	ini : TMemIniFile;
+	sections: TStringList;
+	keys: TStringList;
+	i, j : Integer;
+	resWord : TResistWord;
+begin
+	FInit := True;
+	try
+		// ƒtƒ@ƒCƒ‹‚Ì‘¶Ý‚ðŠm”F
+		if FileExists(FilePath) then begin
+			ini := TMemIniFile.Create(FilePath);
+			sections := TStringList.Create;
+			keys := TStringList.Create;
+			try
+				ini.ReadSections(sections);
+
+				for i :=0 to sections.Count - 1 do begin
+					keys.Clear;
+					ini.ReadSection(sections[i], keys);
+					for j := 0 to keys.Count - 1 do begin
+						resWord := TResistWord.Create;
+						resWord.SetCategory(sections[i]);
+						resWord.SetKey(keys[j]);
+						resWord.SetText(ini.ReadString(sections[i], keys[j], ''));
+						FDictionary.AddObject(resWord.GetKey, resWord);
+					end;
+				end;
+			finally
+				keys.Free;
+				sections.Free;
+				ini.Free;
+			end;
+		end;
+
+	except
+		FInit := False;
+	end;
+end;
+//! Žw’肳‚ꂽƒpƒX‚̃tƒ@ƒCƒ‹‚É•Û‘¶‚·‚é
+procedure TInputAssistDM.SaveToFile(FilePath: String);
+var
+	ini : TMemIniFile;
+	i : Integer;
+	resWord : TResistWord;
+begin
+	if FileExists(FilePath) then begin
+		try
+			DeleteFile(FilePath);
+		except
+		end;
+	end;
+	ini := TMemIniFile.Create(FilePath);
+	try
+		for i :=0 to FDictionary.Count - 1 do begin
+			resWord := TResistWord(FDictionary.Objects[i]);
+			ini.WriteString(resWord.FCategory, resWord.FKey, resWord.FText);
+		end;
+		ini.UpdateFile;
+	finally
+		ini.Free;
+	end;
+end;
+//! ƒfƒXƒgƒ‰ƒNƒ^
+procedure TInputAssistDM.DataModuleDestroy(Sender: TObject);
+var
+	i : Integer;
+begin
+	if (FDictionary <> nil) then begin
+		for i := FDictionary.Count - 1 downto 0 do begin
+			TResistWord(FDictionary.Objects[i]).Free;
+		end;
+		FDictionary.Clear;
+		FDictionary.Capacity := 0;
+		FDictionary.Free;
+	end;
+end;
+//! ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+procedure TInputAssistDM.DataModuleCreate(Sender: TObject);
+begin
+	FDictionary := TStringList.Create;
+	FDictionary.Duplicates := dupAccept;
+	FDictionary.Sorted := True;
+end;
+//! “o˜^’PŒê”Žæ“¾
+function TInputAssistDM.ResistWordCount : Integer;
+begin
+	Result := 0;
+	if (FDictionary <> nil) then begin
+		Result := FDictionary.Count;
+	end;
+end;
+//! “o˜^’PŒêŽæ“¾
+function TInputAssistDM.GetResistWord(Index: Integer): TResistWord;
+begin
+	Result := nil;
+	if (FDictionary <> nil) then begin
+		if (Index >= 0) and (Index < FDictionary.Count) then begin
+			Result := TResistWord(FDictionary.Objects[index]);
+		end;
+	end;
+end;
+//! “o˜^’PŒê‚̍폜
+procedure TInputAssistDM.DeleteResistWord(ResistWord: TResistWord);
+var
+	i : Integer;
+begin
+	if (FDictionary <> nil) then begin
+		for i := 0 to FDictionary.Count - 1 do begin
+			if (ResistWord = FDictionary.Objects[i]) then begin
+				TResistWord(FDictionary.Objects[i]).Free;
+				FDictionary.Delete(i);
+				break;
+			end;
+		end;
+	end;
+end;
+//! “o˜^’PŒê’ljÁ
+function TInputAssistDM.Add(Key: String): TResistWord;
+var
+	resWord : TResistWord;
+begin
+	Result := nil;
+	if (FDictionary <> nil) then begin
+		resWord := TResistWord.Create;
+		resWord.SetKey(Key);
+		resWord.SetCategory('ƒJƒeƒSƒŠ');
+		resWord.SetText('’èŒ^•¶');
+		FDictionary.AddObject(Key, resWord);
+		Result := resWord;
+	end;
+end;
+//! “o˜^’PŒê‚̃L[•ÏX
+procedure TInputAssistDM.ChangeKey(ResistWord: TResistWord);
+var
+	i : Integer;
+begin
+	if (FDictionary <> nil) then begin
+		for i := 0 to FDictionary.Count - 1 do begin
+			if (ResistWord = FDictionary.Objects[i]) then begin
+				FDictionary.Strings[i] := ResistWord.GetKey;
+				break;
+			end;
+		end;
+	end;
+end;
+//! Key‚ðŽ‚Â“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+function TInputAssistDM.GetStartWithKeyResistWords(Key: String; var list: TStringList): Integer;
+var
+	i : Integer;
+	resWord : TResistWord;
+
+begin
+	Result := 0;
+	if (FDictionary <> nil) and (list <> nil) then begin
+		Key := ZenToHan(Key);
+		for i := 0 to FDictionary.Count - 1 do begin
+			if (AnsiPos(Key, ZenToHan(FDictionary.Strings[i])) = 1) then begin
+				Inc(Result);
+				resWord := TResistWord(FDictionary.Objects[i]);
+				list.AddObject(resWord.GetKey + '(' +
+								resWord.GetCategory + ')', resWord);
+			end else if (Result > 0) then begin
+				//ƒ\[ƒg‚³‚ê‚Ä‚¢‚é‚©‚çAƒqƒbƒg‚·‚ê‚ΘA‘±‚·‚é‚Í‚¸
+				break;
+			end;
+		end;
+	end;
+end;
+//! Key‚ðƒJƒeƒSƒŠ‚ÉŽ‚“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+function TInputAssistDM.GetStartWithCategoryResistWords(Key: String; var list: TStringList): Integer;
+var
+	i : Integer;
+	resWord : TResistWord;
+begin
+	Result := 0;
+	if (FDictionary <> nil) and (list <> nil) then begin
+		Key := ZenToHan(Key);
+		for i := 0 to FDictionary.Count - 1 do begin
+			resWord := TResistWord(FDictionary.Objects[i]);
+			if (AnsiPos(Key, ZenToHan(resWord.GetCategory)) = 1) then begin
+				Inc(Result);
+				list.AddObject(resWord.GetKey + '(' +
+								resWord.GetCategory + ')', resWord);
+			end;
+		end;
+		list.CustomSort(CategorySort);
+	end;
+end;
+
+//! ƒ\[ƒg‚̏ó‘Ԃ̎擾
+function TInputAssistDM.GetSorted: Boolean;
+begin
+	Result := False;
+	if (FDictionary <> nil) then begin
+		Result := FDictionary.Sorted;
+	end;
+end;
+//! ƒ\[ƒgó‘Ԃ̐ݒè
+procedure TInputAssistDM.SetSorted(Value: Boolean);
+begin
+	if (FDictionary <> nil) then begin
+		FDictionary.Sorted := Value;
+	end;
+end;
+//! Key‚̃JƒeƒSƒŠ‚É“o˜^‚³‚ê‚Ä‚¢‚é’PŒê‚ðŽæ“¾
+function TInputAssistDM.GetCategoryResistWords(Key: String; var list: TStringList): Integer;
+var
+	i : Integer;
+	resWord : TResistWord;
+begin
+	Result := 0;
+	if (FDictionary <> nil) and (list <> nil) then begin
+		for i := 0 to FDictionary.Count - 1 do begin
+			resWord := TResistWord(FDictionary.Objects[i]);
+			if (Key = resWord.GetCategory) then begin
+				Inc(Result);
+				list.AddObject(resWord.GetKey + '(' +
+								resWord.GetCategory + ')', resWord);
+			end;
+		end;
+		list.CustomSort(CategorySort);
+	end;
+end;
+
+//! “o˜^Ï‚݃L[‚Ì‘S‚ẴJƒeƒSƒŠƒŠƒXƒgŽæ“¾
+procedure TInputAssistDM.GetCategoryList(var list: TStringList);
+var
+	i : Integer;
+begin
+	if (FDictionary <> nil) and (list <> nil) then begin
+		// d•¡ƒ`ƒFƒbƒN‚ðTStringList‚Ì‹@”\‚ōs‚¤
+		list.Clear;
+		list.Duplicates := dupIgnore;
+		list.Sorted := true;
+		list.BeginUpdate;
+		for i := 0 to FDictionary.Count - 1 do begin
+			list.Add(TResistWord(FDictionary.Objects[i]).GetCategory);
+		end;
+		list.EndUpdate;
+	end;
+end;
+
+//! Key‚ðƒJƒeƒSƒŠ‚ÉŽ‚“o˜^’PŒê‚ð•Ô‚·Žž‚̃\[ƒg—p”äŠrƒƒ\ƒbƒh
+function CategorySort(List: TStringList; Index1, Index2: Integer): Integer;
+var
+	resWord1 : TResistWord;
+	resWord2 : TResistWord;
+begin
+	Result := 0;
+	try
+		resWord1 := TResistWord(List.Objects[Index1]);
+		resWord2 := TResistWord(List.Objects[Index2]);
+		Result := AnsiCompareStr(resWord1.GetCategory, resWord2.GetCategory);
+		if (Result = 0) then begin
+			Result := AnsiCompareStr(resWord1.GetKey, resWord2.GetKey);
+		end;
+	except
+	end;
+end;
+
+end.

--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -111,7 +111,6 @@ begin
 	if ListView.Items.Count > 0 then
 		ListView.Selected := ListView.Items[0];
 	EditorForm := TEditorForm.Create(Self);
-	GikoSys.LoadKeySetting(EditorForm.ActionList, GikoSys.GetEditorKeyFileName);
 	try
 		for i := 0 to EditorForm.ActionList.ActionCount - 1 do begin
 			if EditorForm.ActionList.Actions[i] is TAction then begin

--- a/ListViewUtils.pas
+++ b/ListViewUtils.pas
@@ -10,6 +10,7 @@ type
 	TListViewUtils = class(TObject)
 	private
 		{Private éŒ¾}
+
 		class procedure DrawCategoryItem(BBS: TBBS; Item: TListItem; ListView: TListView);
 		class procedure DrawBoardItem(Category: TCategory; Item: TListItem; ListView: TListView);
 		class procedure DrawThreadItem(Board: TBoard; Item: TListItem; ListView: TListView);
@@ -30,11 +31,10 @@ type
 		class procedure ListViewData(Sender: TObject; Item: TListItem);
 	end;
 
-
 implementation
 
 uses
-	GikoSystem, Sort, Setting, Giko, MojuUtils, GikoDataModule;
+	GikoSystem, Sort, Setting, Giko, MojuUtils, GikoDataModule, DateUtils, Math;
 
 const
 	//ƒcƒŠ[EƒŠƒXƒgƒAƒCƒRƒ“
@@ -612,6 +612,7 @@ end;
 class procedure TListViewUtils.DrawItemLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
 var
 	i, idx : Integer;
+	spanday: Double;
 begin
 	idx := 0;
 	for i := 0 to ColumnCount - 1 do begin
@@ -655,6 +656,16 @@ begin
 				Item.SubItems[ idx ] := '';
 			end else
 				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.LastModified);
+		gbcVigor:
+			begin
+				spanday := DaySpan(Sort.GetSortDate, Thread.CreateDate);
+				if (spanday > 0) then begin
+					Item.SubItems[ idx ] := Format('%f', [Thread.AllResCount / spanday]);
+				end else begin
+					Item.SubItems[ idx ] := '';
+				end;
+
+			end;
 		end;
 		Inc( idx );
 	end;
@@ -668,6 +679,7 @@ end;
 class procedure TListViewUtils.DrawItemNoLogThread(Thread: TThreadItem; Item: TListItem; ColumnCount: Integer);
 var
 	i, idx: Integer;
+	spanday: Double;
 begin
 	idx := 0;
 	for i := 0 to ColumnCount - 1do begin
@@ -686,9 +698,20 @@ begin
 				Item.SubItems[ idx ] := FormatDateTime('yyyy/mm/dd hh:mm:ss', Thread.CreateDate);
 		gbcLastModified:
 			Item.SubItems[ idx ] := '';
+		gbcVigor:
+			begin
+				spanday := DaySpan(Sort.GetSortDate, Thread.CreateDate);
+				if (spanday > 0) then begin
+					Item.SubItems[ idx ] := Format('%f', [Thread.AllResCount / spanday]);
+				end else begin
+					Item.SubItems[ idx ] := '';
+				end;
+
+			end;
 		else
 			Item.SubItems[ idx ] := '';
 		end;
+
 		Inc( idx );
 	end;
 	if Thread.NewArrival then

--- a/MojuUtils.pas
+++ b/MojuUtils.pas
@@ -32,6 +32,10 @@ uses
 	//<font>ƒ^ƒO‚ð‘S‚č폜‚·‚é
 	function DeleteFontTag( inSource : string) : string;
 	function RemoveToken(var s: string;const delimiter: string): string;
+	// –³ŠQ‰»(& -> &amp; " -> &auot; ‚É•ÏŠ·‚·‚é)
+	function Sanitize(const s: String): String;
+	// –³ŠQ‰»‰ðœ(&amp; -> & &auot; -> " ‚É•ÏŠ·‚·‚é)
+	function UnSanitize(const s: String): String;
 
 implementation
 // ƒ|ƒCƒ“ƒ^[•ƒAƒZƒ“ƒuƒ‰‚É‚æ‚鍂‘¬ƒ|ƒX
@@ -358,6 +362,17 @@ begin
 		s := '';
 	end;
 end;
-
+//! –³ŠQ‰»(& -> &amp; " -> &auot; ‚É•ÏŠ·‚·‚é)
+function Sanitize(const s: String): String;
+begin
+	Result := CustomStringReplace(s, '&', '&amp;');
+	Result := CustomStringReplace(Result, '"', '&quot;');
+end;
+//! –³ŠQ‰»‰ðœ(&amp; -> & &auot; -> " ‚É•ÏŠ·‚·‚é)
+function UnSanitize(const s: String): String;
+begin
+	Result := CustomStringReplace(s, '&quot;', '"');
+	Result := CustomStringReplace(Result, '&amp;', '&');
+end;
 
 end.

--- a/Setting.pas
+++ b/Setting.pas
@@ -73,15 +73,15 @@ type
 	end;
 	/// ƒXƒŒƒŠƒXƒg‚̃Jƒ‰ƒ€ ID
 	type	TGikoBoardColumnID = (gbcTitle, gbcAllCount, gbcLocalCount, gbcNonAcqCount,
-		gbcNewCount, gbcUnReadCount, gbcRoundName, gbcRoundDate, gbcCreated, gbcLastModified );{gbcLastModified,}
+		gbcNewCount, gbcUnReadCount, gbcRoundName, gbcRoundDate, gbcCreated, gbcLastModified, gbcVigor );{gbcLastModified,}
 	/// ƒXƒŒƒŠƒXƒg‚̃Jƒ‰ƒ€–¼
-	const	GikoBoardColumnCaption : array[0..9] of string =
+	const	GikoBoardColumnCaption : array[0..10] of string =
 		( 'ƒXƒŒƒbƒh–¼', 'ƒJƒEƒ“ƒg', 'Žæ“¾', '–¢Žæ“¾', 'V’…',
-		'–¢“Ç', '„‰ñ—\–ñ', 'Žæ“¾“úŽž', 'ƒXƒŒì¬“úŽž', 'ÅIXV“úŽž' );
-	const GikoBoardColumnAlignment : array[0..9] of TAlignment = (
+		'–¢“Ç', '„‰ñ—\–ñ', 'Žæ“¾“úŽž', 'ƒXƒŒì¬“úŽž', 'ÅIXV“úŽž', '¨‚¢' );
+	const GikoBoardColumnAlignment : array[0..10] of TAlignment = (
 		taLeftJustify, taRightJustify, taRightJustify, taRightJustify,
 		taRightJustify, taRightJustify, taLeftJustify, taLeftJustify,
-		taLeftJustify, taLeftJustify);
+		taLeftJustify, taLeftJustify, taRightJustify);
 	/// ƒXƒŒƒŠƒXƒgƒJƒ‰ƒ€”z—ñ
 	type	TGikoBoardColumnList = class( TList )
 	private
@@ -259,7 +259,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..10] of Integer;
 
 		/// ƒJƒeƒSƒŠƒŠƒXƒgƒJƒ‰ƒ€‡˜
 		FBBSColumnOrder : TGikoBBSColumnList;
@@ -491,7 +491,7 @@ type
 		function GetMainKeyFileName: String;
 		function GetEditorKeyFileName: String;
 		procedure WriteLogFolder(AVal : String);
-
+		function GetInputAssistFileName : String;
 		//ŽóMƒoƒbƒtƒ@ƒTƒCƒY
 		property RecvBufferSize: Integer read FRecvBufferSize write FRecvBufferSize;
 		//HTTP1.1Žg—p
@@ -772,7 +772,8 @@ const
 	MAX_POPUP_RES : Integer = 10;
 	GESTURE_FILE_NAME							= 'Gestures.ini';
 	SPAMFILTER_FILE_NAME					= 'SpamFilter.ini';
-        LANGUAGE_FILE_NAME    = 'language.ini';
+		LANGUAGE_FILE_NAME    = 'language.ini';
+	INPUTASSIST_FILE_NAME	= 'InputAssist.ini';
 
 
 
@@ -935,7 +936,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..10] of Integer = (350, 60, 60, 60, 60, 60, 80, 130, 130, 130, 60);
 	MAX_WIDTH: Integer = 2000;
 var
 	ini: TMemIniFile;
@@ -1164,8 +1165,12 @@ begin
 			end;
 			if FBoardColumnOrder.Count = 0 then begin
 				// Ý’肪–³‚¢‚̂ō쐬
-				for i := 0 to Integer( High( TGikoBoardColumnID ) ) do
-					FBoardColumnOrder.Add( TGikoBoardColumnID( i ) );
+				for i := 0 to Integer( High( TGikoBoardColumnID ) ) do begin
+					// ¨‚¢‚̃Jƒ‰ƒ€‚̓fƒtƒHƒ‹ƒg‚Å”ñ•\Ž¦‚É‚·‚é
+					if ( i <> Ord(gbcVigor) ) then begin
+						FBoardColumnOrder.Add( TGikoBoardColumnID( i ) );
+					end;
+				end;
 			end;
 		finally
 			wkList.Free;
@@ -1257,7 +1262,7 @@ begin
 		FBoardSortIndex := ini.ReadInteger('ThreadList', 'BoardSortIndex', 0);
 		FBoardSortOrder := ini.ReadBool('ThreadList', 'BoardSortOrder', True);
 		// DLŒã‚ÌŽ©“®ƒ\[ƒg
-		FAutoSortThreadList := ini.ReadBool('ThreadList', 'AutoSort', True);
+		FAutoSortThreadList := ini.ReadBool('ThreadList', 'AutoSort', False);
 		//Dat—Ž‚¿ƒXƒŒƒ\[ƒg‡
 		FDatOchiSortIndex := ini.ReadInteger('ThreadList', 'DatOchiSortIndex', -1);
 		FDatOchiSortOrder := ini.ReadBool('ThreadList', 'DatOchiSortOrder', False);
@@ -2175,8 +2180,13 @@ begin
 end;
 function TSetting.GetEditorKeyFileName: String;
 begin
-    Result := GetConfigDir + EKEY_SETTING_FILE_NAME;
+	Result := GetConfigDir + EKEY_SETTING_FILE_NAME;
+end;
+function TSetting.GetInputAssistFileName : String;
+begin
+	Result := GetConfigDir + INPUTASSIST_FILE_NAME;
 end;
+
 end.
 
 

--- a/Sort.pas
+++ b/Sort.pas
@@ -4,7 +4,7 @@ interface
 uses
 	Windows, Messages, SysUtils, Classes, Controls, Forms,
 	BoardGroup,DateUtils,
-	Setting;
+	Setting, Math;
 
 	function CategorySortProc(Item1, Item2: Pointer): integer;
 	function BoardSortProc(List: TStringList; Item1, Item2: Integer): integer;
@@ -12,13 +12,16 @@ uses
 	function CompareBool(Item1, Item2: Boolean): integer;
 	function CompareInt(Item1, Item2: Integer): Integer;
 	function CompareDate(Item1, Item2: TDateTime): Integer;
-
+	procedure SetSortDate(Date: TDateTime);
+	function GetSortDate(): TDateTime;
 var
 	SortOrder: Boolean;
 	SortIndex: Integer;
 	SortNoFlag: Boolean;
 
 implementation
+var
+	FSortDate: TDateTime;
 
 function CategorySortProc(Item1, Item2: Pointer): integer;
 var
@@ -73,6 +76,7 @@ function ThreadItemSortProc(List: TStringList; Item1, Item2: Integer): integer;
 var
 	ThreadItem1: TThreadItem;
 	ThreadItem2: TThreadItem;
+	SpanDay1, SpanDay2: Double;
 begin
 	ThreadItem1 := TThreadItem(List.Objects[ Item1 ]);
 	ThreadItem2 := TThreadItem(List.Objects[ Item2 ]);
@@ -105,6 +109,22 @@ begin
 		gbcRoundDate:	Result := CompareDateTime(ThreadItem1.RoundDate, ThreadItem2.RoundDate); {gbcLastModified:}
 		gbcCreated:				Result := CompareDateTime(ThreadItem1.CreateDate, ThreadItem2.CreateDate);
 		gbcLastModified:	Result := CompareDateTime(ThreadItem1.LastModified, ThreadItem2.LastModified); {gbcLastModified:}
+		gbcVigor:
+			begin
+				SpanDay1 := DaySpan(FSortDate, ThreadItem1.CreateDate);
+				SpanDay2 := DaySpan(FSortDate, ThreadItem2.CreateDate);
+				if (SpanDay1 > 0) and (SpanDay2 > 0) then begin
+					Result := CompareValue(
+								ThreadItem1.AllResCount / SpanDay1,
+								ThreadItem2.AllResCount / SpanDay2);
+				end else if (SpanDay1 > 0) then begin
+					Result := 1;
+				end else if (SpanDay2 > 0) then begin
+					Result := -1;
+				end else begin
+					Result := 0;
+				end;
+			end;
 	else
 		Result := 0;
 	end;
@@ -163,5 +183,12 @@ begin
 	else
 		Result := 0;
 end;
-
+procedure SetSortDate(Date: TDateTime);
+begin
+	FSortDate := Date;
+end;
+function GetSortDate(): TDateTime;
+begin
+	Result := FSortDate;
+end;
 end.

--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -71,7 +71,9 @@ uses
   ListViewUtils in 'ListViewUtils.pas',
   GikoDataModule in 'GikoDataModule.pas' {GikoDM: TDataModule},
   BrowserRecord in 'BrowserRecord.pas',
-  GikoMessage in 'GikoMessage.pas';
+  GikoMessage in 'GikoMessage.pas',
+  InputAssist in 'InputAssist.pas' {InputAssistForm},
+  InputAssistDataModule in 'InputAssistDataModule.pas' {InputAssistDM: TDataModule};
 
 {$R *.RES}
 {$R gikoResource.res}
@@ -90,7 +92,11 @@ begin
 		Wnd := FindWindow('TGikoForm', nil);
 		if Wnd <> 0 then begin
 			//Šù‚É‹N“®Ï‚݃MƒRƒiƒr‚̃AƒNƒeƒBƒu‰»•ƒAƒCƒRƒ“‰»‚³‚ê‚Ä‚½‚ç•œŒ³
-			SetForegroundWindow(Wnd);
+			try
+				SetForegroundWindow(Wnd);
+			except
+            	//‰Šú‰»‚ªI‚í‚Á‚Ä‚¢‚È‚¢‚ƃtƒHƒAƒOƒ‰ƒEƒ“ƒh‚Ɉڂ¹‚¸‚É—áŠO”­¶
+			end;
 			if IsIconic(Wnd) then
 				SendMessage(Wnd, WM_SYSCOMMAND, SC_RESTORE, -1);
 //			AppWnd := GetWindowLong(Wnd, GWL_HWNDPARENT);
@@ -122,6 +128,7 @@ begin
   Application.CreateForm(TFavoriteDM, FavoriteDM);
   Application.CreateForm(TAddressHistoryDM, AddressHistoryDM);
   Application.CreateForm(TGikoDM, GikoDM);
+  Application.CreateForm(TInputAssistDM, InputAssistDM);
   Application.CreateForm(TGikoForm, GikoForm);
   Application.Run;
 		ReleaseMutex(hMutex);

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

--- /dev/null
+++ b/readme/InputAssist.ini
@@ -0,0 +1,23 @@
+[ƒMƒR”L]
+‚¬‚±=@@@@@@ÈÈ@@
`ŒPP(,,߄Dß)@
@@UUPU U
+‚¬‚±Œã‚ë=@@@ ÈÈ
@@@(@@,,)
@@@/@@|
@`iQQj
+‚¬‚±À‚è=@@ÈÈ@
@@(,,߄Dß)
@@/ ‚‚Â
`iQQj
+‚¬‚±—§‚¿=@@ÈÈ
@@(,,߄Dß)
@ ¼@@‚Â
@ `@@|
@@ ‚µM‚i
+
+[ƒJƒeƒSƒŠ]
+‚«‚½[=·À„ª„ª„ª( LÍ`)߁Íß)*߁[ß)¥ƒÖ¥) ߄Dß)L[`)¥Í¥)P°P)L_T`)`„DL)-Q-)L„DM)„ª„ª!!!
+
+[‘½”s]
+‚«‚½[=·À„ª„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª„ª!!!!
·À„ª„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª„ª!!!!
·À„ª„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª„ª!!!!
·À„ª„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª„ª!!!!
·À„ª„ª„ª„ª„ª(߁Íß)„ª„ª„ª„ª„ª!!!!
+
+[“®•¨]
+‚­‚Á‚­‚é=@ @ÉÉÉɁ@@-Q__
@@(߁¸ß*)@@„Ÿ_Q___@______P
@@˜¦_Ɂ܁_@@____@___
@œc^_@/Rƒ~@__@__Q
@@@@./É_ƒm_@@Q
@@@./^._^RЁ@ß-
@@И¦@-__P___________
+
+[ƒNƒ}[]
+‚­‚܁[=@@ ¿QQQ¿ 
@@ | ƒm@@@@@ R 
@@/@@œ@@@œ |@ƒNƒ}„Ÿ„ŸII 
@ |@@@@( _œ_)@ ƒ~ 
@œc¤@@@|¾|@@¤M_ 
/@QQ@ Rƒm@/L>@ ) 
(QQQj@@@/@(_^ 
@|@@@@@@ / 
@|@@^_@_ 
@|@/@@@ )@ ) 
@¾@@@ i@ _ 
@@@@@@ _Q)
+‰£‚é=@@@@@@@@@@@@@@@@@@@@@@Q ^-@ƒC¤_ 
@@@@@@@@@@ QQ@@@@@ @@^: : : : : : : : : : : ( 
@@@@@@@@@ qqqq@R@@@@@/: : : : ::;:;: ;: ;:;: ; : : : ::T 
@@@@@@@@@@q½@@}@@@@@{:: : : :ƒm@--]'@¤__: : ::p 
@@ ¿QQQ¿@ |@@ |@@@@@ {:: : :ƒm ,_;:;:;ƒm¤ ƒFª S: :::} 
@@ | ƒm@@@@@ R !@@ !@@@A@@‚Œ: :Ɂ@^“ñ\-¤@|: ::É 
@@/@@œ@@@œ |@@/@@@C,¥_@@|@/^@ P7/ /::ƒm 
@ |@@@@( _œ_)@ ƒ~^@, f,ˆ ¥@N@ r(_“ñ„Ÿ-„£{^ 
@œc¤@@@|¾|@@^@@¤¥æ f@@^¤^/|@PPR 
/@QQ@ Rƒm@/@@@@@@@@ ^@@ //@|^^_ r 
(QQQj@@@/@@@@@@@ @/@@@ //@@ /_ ^ 
@@@@@@@/@@@@@@@ @ / @@@@@@@/@
+
+[AA]
+‚µ‚å‚Ú=(L¥ƒÖ¥`)
+‚à‚¤‚±‚Ë‚¦‚æ=@@@@@@@@@@@@@@@@@„¡„Ÿ„¢ 
@@@@@@@@@@@@@@@@@b‚à.b 
@@@@@@@@@@@@@@@@@b‚¤@| 
@@@@@@@@@@@@@@@@@„ —ˆ„  
@@@@@@@@@@@@@@@@@„ ‚Ë„  
@@@@@@@@@@@@@@@@@„ ‚¦ .| 
@@@@@@@@@@@@@@@@@„ ‚æ .| 
@@@@@@ÊÞ¶@@@@ºÞÙ§@@„  !!.„  
@@@@@@@@@@@@@@@@@„¤„Ÿ„§@@@@ÌßÝÌßÝ 
@@@@R(`„DL)Ɂ@R(`„DL)Ɂ@@(`„DL)Ɂ@@@ i@`„Dj 
@@@@|PPP|„Ÿ|PPP|„Ÿ|PPP|„Ÿ i R„¢U 
` `@PP@@.PP@@PP@@ |>„£
+

--- a/readme/Samba.default
+++ b/readme/Samba.default
@@ -9,11 +9,11 @@ comic6=30
 dso=10
 etc3=30
 etc4=30
-ex9=20
-ex10=20
-ex11=20
-ex12=20
-ex13=20
+ex9=15
+ex11=15
+ex12=15
+ex13=15
+ex14=15
 food6=30
 game9=30
 game10=30
@@ -21,12 +21,9 @@ hobby7=30
 hobby8=30
 human5=30
 life7=30
-live14=15
-live16=15
-live18=15
-live19=15
-live20=15
-live21=15
+live14=10
+live19=10
+live22x=10
 love3=30
 money4=30
 music4=30
@@ -43,8 +40,8 @@ school5=30
 science4=30
 society3=30
 sports2=0
-sports9=30
-that3=30
+sports9=60
+that4=30
 tmp5=45
 travel2=30
 tv7=30
@@ -53,4 +50,4 @@ idol=30
 pie=30
 sakura01=30
 sakura02=30
-sakura03=30
\ No newline at end of file
+sakura03=30

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ51 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ52 Readme.txt
 
 
 ------------------------------
@@ -107,21 +107,28 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-200X/XX/XX
+2006/XX/YY
+  Version ÊÞÀ52
+@“ü—̓AƒVƒXƒg‹@\’ljÁ
+@ƒXƒŒƒbƒhˆê——‚Ɂh¨‚¢hƒJƒ‰ƒ€’ljÁiƒfƒtƒHƒ‹ƒg”ñ•\Ž¦j
+@‚¨‹C‚É“ü‚èA—š—ðA‘—MƒƒO‚̃XƒŒƒbƒhƒ^ƒCƒgƒ‹–¼‚ðƒTƒjƒ^ƒCƒY‚·‚é‚悤‚ɏC³
+iƒm[ƒgƒ“‚̌딽‰ž–â‘è‚Ö‚Ì•”•ª“I‘Ήžj
+  
+2006/01/14
   Version ÊÞÀ51
+@ƒƒCƒ“ƒtƒH[ƒ€ã‚ł̃Vƒ‡[ƒgƒJƒbƒgƒL[‚Ì—Dæ‡ˆÊ‚ªƒMƒRƒiƒrŽ©‘Ì‚ªÅãˆÊ‚ɕύX
 @ƒXƒŒƒbƒh•`‰æˆ—‚̍œK‰»
 @ƒŒƒX”ÔŽw’èURL‚ðƒNƒŠƒbƒN‚µ‚½‚Æ‚«‚Ì“®ì‚ŁAŽæ“¾Ï‚ÝŠO‚̃ŒƒX”Ԃ̏ꍇŽ©“®‚ÅDL‚·‚é‚悤‚ɕύX
 @ƒŒƒXƒGƒfƒBƒ^‚©‚çSamba‚̐ݒè’l‚ð•ÏX‚Å‚«‚é‚悤‚ɕύX
 @ƒLƒƒƒrƒlƒbƒgã‚ŃNƒŠƒbƒNEƒ_ƒuƒ‹ƒNƒŠƒbƒNƒCƒxƒ“ƒg‚ª‰ßè‚É”­¶‚·‚é•s‹ï‡‚̏C³
 @ƒ}ƒEƒXƒWƒFƒXƒ`ƒƒ[—LŒøŽž‚ɃvƒŒƒrƒ…[ã‚ʼnEƒNƒŠƒbƒN‚Å‚«‚È‚¢•s‹ï‡‚̏C³
-@ƒƒCƒ“ƒtƒH[ƒ€ã‚ł̃Vƒ‡[ƒgƒJƒbƒgƒL[‚Ì—Dæ‡ˆÊ‚ªƒMƒRƒiƒrŽ©‘Ì‚ªÅãˆÊ‚ɕύX
 @ƒƒCƒ“ƒƒjƒ…[‚Ì‚¨‹C‚É“ü‚è‚Ì•`‰æ‚̍‚‘¬‰»
 @ƒXƒe[ƒ^ƒXƒo[‚ÉŒ»Ý•\Ž¦‚µ‚Ä‚¢‚éƒXƒŒƒbƒh‚Ì—e—Ê‚ð•\Ž¦‚·‚é‚悤‚É‚µ‚½
 @DAT—Ž‚¿‚µ‚½ƒXƒŒ‚Ì—e—Ê‚ðŽæ“¾‚Å‚«‚È‚¢•s‹ï‡‚̏C³
 @”XV‚э[ƒJƒ‹ƒtƒ@ƒCƒ‹‚ðŽw’è‚Å‚«‚é‚悤‚ɕύX
 @ƒXƒŒƒbƒhˆê——ƒ_ƒEƒ“ƒ[ƒhŒã‚̃\[ƒg‚ðƒIƒvƒVƒ‡ƒ“‰»
 @NGƒ[ƒh‚É‘S”¼Šp‚Ђ炪‚ȃJƒ^ƒJƒi‚̈Ⴂ‚𓯈ꎋ‚·‚éƒIƒvƒVƒ‡ƒ“‚̒ljÁ
-@ƒŒƒX‚̍iž‚Ý‚Å‘S”¼Šp‚Ђ炪‚ȃJƒ^ƒJƒ^‚̈Ⴂ‚𖳎‹‚·‚é‚悤‚ɕύX
+@ƒŒƒX‚̍iž‚Ý‚Å‘S”¼Šp‚Ђ炪‚ȃJƒ^ƒJƒi‚̈Ⴂ‚𖳎‹‚·‚é‚悤‚ɕύX
 
 2005/10/10
   Version ÊÞÀ50 ƒŠƒŠ[ƒX3

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