「&」を & に置換するようになった。

diff --git a/Editor.pas b/Editor.pas
index 7a8155f..8c4d9a1 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -360,6 +360,9 @@ var
 begin
 
        body := BodyEdit.Text;
+       if GikoSys.Setting.AmpToCharRef then
+               // & \82Ì\92u\8a·\82Í\88ê\94Ô\8dÅ\8f\89\82É\82â\82é\82±\82Æ
+               body := CustomStringReplace( body, '&', '&' );
        if GikoSys.Setting.SpaceToNBSP then begin
                body := CustomStringReplace( body, #09, '    ' );
                body := CustomStringReplace( body, '  ', '  ' );

diff --git a/Option.dfm b/Option.dfm
index fc555e1..0ca6f8d 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -1336,7 +1336,7 @@ object OptionDialog: TOptionDialog
           TabOrder = 4
         end
         object DeleteSyriaCheckBox: TCheckBox
-          Left = 13
+          Left = 12
           Top = 44
           Width = 205
           Height = 17
@@ -1439,7 +1439,7 @@ object OptionDialog: TOptionDialog
         Left = 12
         Top = 8
         Width = 477
-        Height = 49
+        Height = 73
         Caption = #12486#12461#12473#12488
         TabOrder = 0
         object SpaceToNBSPCheckBox: TCheckBox
@@ -1447,9 +1447,17 @@ object OptionDialog: TOptionDialog
           Top = 20
           Width = 317
           Height = 17
-          Caption = #12473#12506#12540#12473#12420' Tab '#12398#34920#31034#12434#32173#25345#12377#12427'(  '#12395#32622#25563')(&S)'
+          Caption = #12473#12506#12540#12473#12420' Tab '#12398#34920#31034#12434#32173#25345#12377#12427'(&  '#12395#32622#25563')(&S)'
           TabOrder = 0
         end
+        object AmpToCharRefCheckBox: TCheckBox
+          Left = 12
+          Top = 44
+          Width = 285
+          Height = 17
+          Caption = #12300'&&'#12301#35352#21495#12398#34920#31034#12434#32173#25345#12377#12427'(&& '#12395#32622#25563')(&A)'
+          TabOrder = 1
+        end
       end
     end
   end

diff --git a/Option.pas b/Option.pas
index 8133c9d..32d7bf8 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -186,6 +186,7 @@ type
     TabSheet5: TTabSheet;
     GroupBox17: TGroupBox;
     SpaceToNBSPCheckBox: TCheckBox;
+    AmpToCharRefCheckBox: TCheckBox;
                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure ApplyButtonClick(Sender: TObject);
@@ -793,6 +794,7 @@ begin
 
        // \83G\83f\83B\83^
        SpaceToNBSPCheckBox.Checked     := GikoSys.Setting.SpaceToNBSP;
+       AmpToCharRefCheckBox.Checked    := GikoSys.Setting.AmpToCharRef;
 
 end;
 
@@ -1023,7 +1025,8 @@ begin
                GikoSys.Setting.DeleteSyria := DeleteSyriaCheckBox.Checked;
 
        // \83G\83f\83B\83^
-       GikoSys.Setting.SpaceToNBSP     := SpaceToNBSPCheckBox.Checked;
+       GikoSys.Setting.SpaceToNBSP             := SpaceToNBSPCheckBox.Checked;
+       GikoSys.Setting.AmpToCharRef    := AmpToCharRefCheckBox.Checked;
 end;
 
 procedure TOptionDialog.SettingApply;

diff --git a/Setting.pas b/Setting.pas
index 15595f5..783afa3 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -303,7 +303,8 @@ type
                FResAnchorJamp: Boolean;
 
                // \83G\83f\83B\83^
-               FSpaceToNBSP    : Boolean;
+               FSpaceToNBSP    : Boolean;      ///< \94¼\8ap\83X\83y\81[\83X\81ATab \82ð &nbsp; \82É\92u\8a·
+               FAmpToCharRef   : Boolean;      ///< '&' \82ð &amp; \82É\92u\8a·
                
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
@@ -566,7 +567,8 @@ type
         property ResAnchorJamp: Boolean read FResAnchorJamp write FResAnchorJamp;
 
                // \83G\83f\83B\83^
-               property SpaceToNBSP    : Boolean       read FSpaceToNBSP write FSpaceToNBSP;
+               property SpaceToNBSP    : Boolean       read FSpaceToNBSP               write FSpaceToNBSP;
+               property AmpToCharRef   : Boolean       read FAmpToCharRef      write FAmpToCharRef;
 end;
 
 
@@ -959,6 +961,7 @@ begin
 
                // \83G\83f\83B\83^
                FSpaceToNBSP    := ini.ReadBool( 'Editor', 'SpaceToNBSP', True );
+               FAmpToCharRef   := ini.ReadBool( 'Editor', 'AmpToCharRef', True );
        finally
                ini.Free;
        end;
@@ -1238,6 +1241,7 @@ begin
 
                // \83G\83f\83B\83^
                ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
+               ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
 
                ini.UpdateFile;
        finally