HTMLを作っているところで、フォント等の設定の共通部分を関数化。

diff --git a/GikoSystem.pas b/GikoSystem.pas
index d670537..e8da9a3 100644 (file)
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -96,7 +96,7 @@ type
 
 //             FExitWrite: TStringList;
 //             function StrToFloatDef(s: string; Default: Double): Double;
-
+               function SetUserOptionalStyle(): string;
        public
                { Public \90é\8c¾ }
                FAbon : TAbon;
@@ -1086,27 +1086,7 @@ begin
                        boardPlugIn             := ThreadItem.BoardPlugIn;
                        NewReceiveNo    := ThreadItem.NewReceive;
                        // \83t\83H\83\93\83g\82â\83T\83C\83Y\82Ì\90Ý\92è
-                       if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-                       if GikoSys.Setting.BrowserFontSize <> 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-                       if GikoSys.Setting.BrowserFontColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-                       if GikoSys.Setting.BrowserBackColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-                       case GikoSys.Setting.BrowserFontBold of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-                       end;
-                       case GikoSys.Setting.BrowserFontItalic of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-                       end;
-
+                       UserOptionalStyle := SetUserOptionalStyle;
                        SaveList := TStringList.Create;
                        try
                                doc.open;
@@ -1221,27 +1201,7 @@ begin
                        doc.charset := 'Shift_JIS';
 
                        // \83t\83H\83\93\83g\82â\83T\83C\83Y\82Ì\90Ý\92è
-                       if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-                       if GikoSys.Setting.BrowserFontSize <> 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-                       if GikoSys.Setting.BrowserFontColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-                       if GikoSys.Setting.BrowserBackColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-                       case GikoSys.Setting.BrowserFontBold of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-                       end;
-                       case GikoSys.Setting.BrowserFontItalic of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-                       end;
-
+                       UserOptionalStyle := SetUserOptionalStyle;
                        CSSFileName := GetStyleSheetDir + Setting.CSSFileName;
                        if GikoSys.Setting.UseSkin then begin
                                // \83X\83L\83\93\8eg\97p
@@ -1532,27 +1492,7 @@ begin
                        //===== \83v\83\89\83O\83C\83\93\82É\82æ\82é\95\\8e¦
                        boardPlugIn             := ThreadItem.BoardPlugIn;
                        // \83t\83H\83\93\83g\82â\83T\83C\83Y\82Ì\90Ý\92è
-                       if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-                       if GikoSys.Setting.BrowserFontSize <> 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-                       if GikoSys.Setting.BrowserFontColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-                       if GikoSys.Setting.BrowserBackColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-                       case GikoSys.Setting.BrowserFontBold of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-                       end;
-                       case GikoSys.Setting.BrowserFontItalic of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-                       end;
-
+                       UserOptionalStyle := SetUserOptionalStyle;
                        try
                                // \95¶\8e\9a\83R\81[\83h\82Í\83v\83\89\83O\83C\83\93\82É\94C\82¹\82é
                                // \83w\83b\83_
@@ -1607,27 +1547,7 @@ begin
                end;
                try
                        // \83t\83H\83\93\83g\82â\83T\83C\83Y\82Ì\90Ý\92è
-                       if Length( GikoSys.Setting.BrowserFontName ) > 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
-                       if GikoSys.Setting.BrowserFontSize <> 0 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
-                       if GikoSys.Setting.BrowserFontColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
-                       if GikoSys.Setting.BrowserBackColor <> -1 then
-                               UserOptionalStyle := UserOptionalStyle +
-                                                               'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
-                       case GikoSys.Setting.BrowserFontBold of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-weight:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-weight:bold;';
-                       end;
-                       case GikoSys.Setting.BrowserFontItalic of
-                               -1: UserOptionalStyle := UserOptionalStyle + 'font-style:normal;';
-                               1: UserOptionalStyle := UserOptionalStyle + 'font-style:italic;';
-                       end;
-
+                       UserOptionalStyle := SetUserOptionalStyle;
 
                        if GikoSys.Setting.UseSkin then begin
                                // \83X\83L\83\93\8eg\97p
@@ -1730,7 +1650,7 @@ begin
                                        end;
                                end;
                                html.Append('<a name="bottom"></a>');
-                               html.Append('</body></html>');
+                               //html.Append('</body></html>');
                                html.Append('<a name="last"></a>');
                                html.Append('</body></html>');
                        end else begin
@@ -4019,6 +3939,26 @@ begin
        end;
 
 end;
+function TGikoSys.SetUserOptionalStyle(): string;
+begin
+    Result := '';
+       if Length( GikoSys.Setting.BrowserFontName ) > 0 then
+               Result := 'font-family:"' + GikoSys.Setting.BrowserFontName + '";';
+       if GikoSys.Setting.BrowserFontSize <> 0 then
+               Result := Result + 'font-size:' + IntToStr( GikoSys.Setting.BrowserFontSize ) + 'pt;';
+       if GikoSys.Setting.BrowserFontColor <> -1 then
+               Result := Result + 'color:#' + IntToHex( GikoSys.Setting.BrowserFontColor, 6 ) + ';';
+       if GikoSys.Setting.BrowserBackColor <> -1 then
+               Result := Result + 'background-color:#' + IntToHex( GikoSys.Setting.BrowserBackColor, 6 ) + ';';
+       case GikoSys.Setting.BrowserFontBold of
+               -1: Result := Result + 'font-weight:normal;';
+               1:  Result := Result + 'font-weight:bold;';
+       end;
+       case GikoSys.Setting.BrowserFontItalic of
+               -1: Result := Result + 'font-style:normal;';
+               1:  Result := Result + 'font-style:italic;';
+       end;
+end;
 
 initialization
        GikoSys := TGikoSys.Create;