作りかけの新ＮＧワード機能が入ってしまっていたので、

IFDEF/IFNDEFで取り除いた。

diff --git a/HTMLCreate.pas b/HTMLCreate.pas
index 15e230f..ad65434 100644 (file)
--- a/HTMLCreate.pas
+++ b/HTMLCreate.pas
@@ -771,8 +771,11 @@ begin
                end;
 
                if (Trim(ReadList[i]) <> '') then begin
+
                        DivideStrLine(ReadList[i], @Res);
+{$IFDEF NEWNGWORD}
             if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
                        AddAnchorTag(@Res);
                        ConvRes(@Res, @ResLink);
                        Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
@@ -783,11 +786,11 @@ begin
                        else
                                // \92Ê\8fí\82Ì\83\8c\83X
                                html.Add(SkinedRes(SkinRes, @Res, IntToStr(i + 1)));
+{$IFDEF NEWNGWORD}
             end else begin
-{$IFDEF DEBUG}
                 html.Add('<h4>\82 \82Ú\81`\82ñ</h4>');
-{$ENDIF}
             end;
+{$ENDIF}
                end;
 
                if ThreadItem.Kokomade = (i + 1) then begin
@@ -865,7 +868,9 @@ begin
                        if (Trim(ReadList[i]) <> '') then begin
                                No := IntToStr(i + 1);
                                DivideStrLine(ReadList[i], @Res);
+{$IFDEF NEWNGWORD}
                 if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
                     AddAnchorTag(@Res);
                     ConvRes(@Res, @ResLink);
                     Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
@@ -875,13 +880,12 @@ begin
                         html.Add(Format(FORMAT_SHOWMAIL, [No, No, No, Res.FMailTo, Res.FName, Res.FMailTo, Res.FDateTime, Res.FBody]))
                     else
                         html.Add(Format(FORMAT_NOSHOW, [No, No, No, Res.FMailTo, Res.FName, Res.FDateTime, Res.FBody]));
-                           end;
-            end else begin
-{$IFDEF DEBUG}
-                html.Add('<h4>\82 \82Ú\81`\82ñ</h4>');
+{$IFDEF NEWNGWORD}
+                           end else begin
+                    html.Add('<h4>\82 \82Ú\81`\82ñ</h4>');
+                end;
 {$ENDIF}
             end;
-
                        if ThreadItem.Kokomade = (i + 1) then begin
                                html.Add('<a name="koko"></a><div class="koko">\83R\83R\82Ü\82Å\93Ç\82ñ\82¾</div>');
                        end;
@@ -935,22 +939,24 @@ begin
                if (Trim(ReadList[i]) <> '') then begin
                        No := IntToStr(i + 1);
                        DivideStrLine(ReadList[i], @Res);
-
-                       AddAnchorTag(@Res);
-                       ConvRes(@Res, @ResLink);
-                       Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
-                       if Res.FMailTo = '' then
-                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<font color="forestgreen"><b> ' + Res.FName + ' </b></font> \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-                       else if GikoSys.Setting.ShowMail then
-                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
-                       else
-                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
-        end else begin
-{$IFDEF DEBUG}
+{$IFDEF NEWNGWORD}
+            if (NGWordList.IsNG(@Res) = -1) then begin
+{$ENDIF}
+                           AddAnchorTag(@Res);
+                       ConvRes(@Res, @ResLink);
+                       Res.FDateTime := AddBeProfileLink(Res.FDateTime, i + 1);
+                       if Res.FMailTo = '' then
+                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<font color="forestgreen"><b> ' + Res.FName + ' </b></font> \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+                       else if GikoSys.Setting.ShowMail then
+                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> [' + Res.FMailTo + '] \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10)
+                       else
+                               html.Add('<a name="' + No + '"></a><dt><a href="menu:' + No + '">' + No + '</a> \96¼\91O\81F<a href="mailto:' + Res.FMailTo + '"><b> ' + Res.FName + ' </B></a> \93\8a\8de\93ú\81F <span class="date">' + Res.FDateTime+ '</span><br><dd>' + Res.Fbody + ' <br><br><br>'#13#10);
+{$IFDEF NEWNGWORD}
+            end else begin
                 html.Add('<h4>\82 \82Ú\81`\82ñ</h4>');
+            end;
 {$ENDIF}
         end;
-
                if ThreadItem.Kokomade = (i + 1) then begin
                        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>\83R\83R\82Ü\82Å\93Ç\82ñ\82¾</b></font></td></tr></table>');
@@ -996,7 +1002,9 @@ begin
                                                ReadList.LoadFromFile(FileName);
                                                ReadList.EndUpdate;
                                                GikoSys.FAbon.IndividualAbon(ReadList, ChangeFileExt(FileName,'.NG'));
-                                               //GikoSys.FAbon.Execute(ReadList);              //       \82 \82Ú\81`\82ñ\82µ\82Ä
+                        {$IFNDEF NEWNGWORD}
+                                               GikoSys.FAbon.Execute(ReadList);                //       \82 \82Ú\81`\82ñ\82µ\82Ä
+                        {$ENDIF}
                                                GikoSys.FSelectResFilter.Execute(ReadList); //\83\8c\83X\82Ì\83t\83B\83\8b\83^\83\8a\83\93\83O\82ð\82·\82é
                                                if ThreadItem.Title = '' then begin
                                                        DivideStrLine(ReadList[0], @Res);

diff --git a/gikoNavi.res b/gikoNavi.res
index caf6b00..718ca71 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ