View Issue Details

IDProjectCategoryView StatusLast Update
0035946FPCUtilitiespublic2019-09-08 09:37
ReporterOlegAssigned ToMarco van de Voort 
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Platformi386, x86_64OSWin32, Win64OS VersionWindows 7, 10
Product Version3.3.1Product Buildr42488 
Target VersionFixed in Version 
Summary0035946: FPDOC utility does not process the tag in the description XML file.
DescriptionThe "Free Pascal code documenter: Reference manual.Document version 3.0.4" (page 41) describes the tag - Format underlined.
When applying this tag in the description file, the FPDOC skips all the text after it to the end of the paragraph and displays an error message: Invalid paragraph content.
Steps To ReproduceThe source file and the description file for reproducing the error for the Reference for unit 'test_doc_unit' section are in the attached archive testing.zip
Additional Informationattached are files of possible patches.
TagsNo tags attached.
Fixed in Revision42935
FPCOldBugId
FPCTarget-
Attached Files
  • testing.zip (1,473 bytes)
  • dw_html.pp.patch (2,904 bytes)
    Index: dw_html.pp
    ===================================================================
    --- dw_html.pp	(revision 42488)
    +++ dw_html.pp	(working copy)
    @@ -145,6 +145,8 @@
         procedure DescrEndItalic; override;
         procedure DescrBeginEmph; override;
         procedure DescrEndEmph; override;
    +    procedure DescrBeginUnderline; override;
    +    procedure DescrEndUnderline; override;
         procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
         procedure DescrWriteFileEl(const AText: DOMString); override;
         procedure DescrWriteKeywordEl(const AText: DOMString); override;
    @@ -1101,6 +1103,16 @@
       PopOutputNode;
     end;
     
    +procedure THTMLWriter.DescrBeginUnderline;
    +begin
    +  PushOutputNode(CreateEl(CurOutputNode, 'u'));
    +end;
    +
    +procedure THTMLWriter.DescrEndUnderline;
    +begin
    +  PopOutputNode;
    +end;
    +
     procedure THTMLWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString);
     
     Var
    @@ -1520,7 +1532,7 @@
       end;
     end;
     
    -Procedure THTMLWriter.AppendShortDescr(AContext: TPasElement; Parent: TDOMNode; DocNode : TDocNode);
    +procedure THTMLWriter.AppendShortDescr(AContext: TPasElement; Parent: TDOMNode; DocNode: TDocNode);
     
     Var
       N : TDocNode;
    @@ -2160,7 +2172,8 @@
         [ExtractFileName(AElement.SourceFilename), AElement.SourceLinenumber]));
     end;
     
    -Procedure THTMLWriter.AppendSeeAlsoSection(AElement : TPasElement;DocNode : TDocNode);
    +procedure THTMLWriter.AppendSeeAlsoSection(AElement: TPasElement;
    +  DocNode: TDocNode);
     
     var
       Node: TDOMNode;
    @@ -2234,7 +2247,8 @@
          end; // While
     end;
     
    -Procedure THTMLWriter.AppendExampleSection(AElement : TPasElement;DocNode : TDocNode);
    +procedure THTMLWriter.AppendExampleSection(AElement: TPasElement;
    +  DocNode: TDocNode);
     
     var
       Node: TDOMNode;
    @@ -2335,7 +2349,7 @@
         end;
     end;
     
    -Procedure THTMLWriter.CreateTopicPageBody(AElement : TTopicElement);
    +procedure THTMLWriter.CreateTopicPageBody(AElement: TTopicElement);
     
     var
       DocNode: TDocNode;
    @@ -2652,7 +2666,8 @@
       end;  
     end;
     
    -Procedure THTMLWriter.AddElementsFromList(L : TStrings; List : TFPList; UsePathName : Boolean = False);
    +procedure THTMLWriter.AddElementsFromList(L: TStrings; List: TFPList;
    +  UsePathName: Boolean);
     
     Var
       I : Integer;
    @@ -2757,7 +2772,7 @@
         end;
     end;
     
    -Procedure THTMLWriter.CreateTopicLinks(Node : TDocNode; PasElement : TPasElement);
    +procedure THTMLWriter.CreateTopicLinks(Node: TDocNode; PasElement: TPasElement);
     
     var
       DocNode: TDocNode;
    @@ -3821,7 +3836,7 @@
       FinishElementPage(AProc);
     end;
     
    -Function THTMLWriter.InterPretOption(Const Cmd,Arg : String) : boolean;
    +function THTMLWriter.InterPretOption(const Cmd, Arg: String): boolean;
     
     begin
       Result:=True;
    @@ -3890,7 +3905,7 @@
         end;
     end;
     
    -Class Function THTMLWriter.FileNameExtension : String; 
    +class function THTMLWriter.FileNameExtension: String;
     begin
       result:='';
     end;
    
    dw_html.pp.patch (2,904 bytes)
  • dw_latex.pp.patch (1,143 bytes)
    Index: dw_latex.pp
    ===================================================================
    --- dw_latex.pp	(revision 42488)
    +++ dw_latex.pp	(working copy)
    @@ -87,6 +87,8 @@
         procedure DescrEndItalic; override;
         procedure DescrBeginEmph; override;
         procedure DescrEndEmph; override;
    +    procedure DescrBeginUnderline; override;
    +    procedure DescrEndUnderline; override;
         procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
         procedure DescrWriteFileEl(const AText: DOMString); override;
         procedure DescrWriteKeywordEl(const AText: DOMString); override;
    @@ -156,7 +158,7 @@
           Result[i] := ':';
     end;
     
    -Function TLaTeXWriter.SplitLine (ALine : String): String;
    +function TLaTeXWriter.SplitLine(ALine: String): String;
     
       Function FindLastSplit(S : String) : Integer;
     
    @@ -287,6 +289,16 @@
       Write('}');
     end;
     
    +procedure TLaTeXWriter.DescrBeginUnderline;
    +begin
    +  Write('\underline{');
    +end;
    +
    +procedure TLaTeXWriter.DescrEndUnderline;
    +begin
    +  Write('}');
    +end;
    +
     procedure TLaTeXWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); 
     
     Var
    
    dw_latex.pp.patch (1,143 bytes)
  • dw_linrtf.pp.patch (875 bytes)
    Index: dw_linrtf.pp
    ===================================================================
    --- dw_linrtf.pp	(revision 42488)
    +++ dw_linrtf.pp	(working copy)
    @@ -121,6 +121,8 @@
         procedure DescrEndItalic; override;
         procedure DescrBeginEmph; override;
         procedure DescrEndEmph; override;
    +    procedure DescrBeginUnderline; override;
    +    procedure DescrEndUnderline; override;
         procedure DescrWriteFileEl(const AText: DOMString); override;
         procedure DescrWriteKeywordEl(const AText: DOMString); override;
         procedure DescrWriteVarEl(const AText: DOMString); override;
    @@ -344,6 +346,16 @@
       Write('}')
     end;
     
    +procedure TRTFWriter.DescrBeginUnderline;
    +begin
    +  Write('{\ul ');
    +end;
    +
    +procedure TRTFWriter.DescrEndUnderline;
    +begin
    +  Write('}');
    +end;
    +
     procedure TRTFWriter.DescrWriteFileEl(const AText: DOMString);
     begin
       Write('{\f0 ');
    
    dw_linrtf.pp.patch (875 bytes)
  • dw_man.pp.patch (4,198 bytes)
    Index: dw_man.pp
    ===================================================================
    --- dw_man.pp	(revision 42488)
    +++ dw_man.pp	(working copy)
    @@ -138,6 +138,8 @@
         procedure DescrEndItalic; override;
         procedure DescrBeginEmph; override;
         procedure DescrEndEmph; override;
    +    procedure DescrBeginUnderline; override;
    +    procedure DescrEndUnderline; override;
         procedure DescrWriteFileEl(const AText: DOMString); override;
         procedure DescrWriteKeywordEl(const AText: DOMString); override;
         procedure DescrWriteVarEl(const AText: DOMString); override;
    @@ -315,7 +317,7 @@
       Writing support
       ---------------------------------------------------------------------}
     
    -Function TManWriter.PushWriteContext(S : TStream) : TStream;
    +function TManWriter.PushWriteContext(S: TStream): TStream;
     
     begin
       Result:=FStream;
    @@ -322,7 +324,7 @@
       FStream:=S;
     end;
     
    -Procedure TManWriter.PopWriteContext(S : TSTream);
    +procedure TManWriter.PopWriteContext(S: TSTream);
     
     begin
       FStream:=S;
    @@ -354,7 +356,7 @@
         end;
     end;
     
    -Procedure TManWriter.NewLine;
    +procedure TManWriter.NewLine;
     
     begin
       if Not FAtLineStart then
    @@ -425,6 +427,17 @@
       NewLine;
     end;
     
    +procedure TManWriter.DescrBeginUnderline;
    +begin
    +  NewLine;
    +  Write('.I '); //use ITALIC!
    +end;
    +
    +procedure TManWriter.DescrEndUnderline;
    +begin
    +  NewLine;
    +end;
    +
     procedure TManWriter.DescrWriteFileEl(const AText: DOMString);
     
     Var
    @@ -680,7 +693,8 @@
     end;
     
     
    -Function TManWriter.GetDescrString(AContext: TPasElement; DescrNode: TDOMElement) : String;
    +function TManWriter.GetDescrString(AContext: TPasElement; DescrNode: TDOMElement
    +  ): String;
     
     Var
       S : TStringStream;
    @@ -716,7 +730,7 @@
       Writeln('.TP');
     end;
     
    -procedure TManWriter.WriteB(Const Msg : String);
    +procedure TManWriter.WriteB(const Msg: String);
     
     begin
       NewLine;
    @@ -723,7 +737,7 @@
       Writeln('.B '+MSG);
     end;
     
    -procedure TManWriter.WriteBI(Const Msg : String);
    +procedure TManWriter.WriteBI(const Msg: String);
     
     begin
       NewLine;
    @@ -759,7 +773,7 @@
     end;
     
     
    -procedure TManWriter.StartSection(Const SectionName: String);
    +procedure TManWriter.StartSection(const SectionName: String);
     begin
       NewLine;
       Writeln('');
    @@ -766,7 +780,7 @@
       Writeln('.SH '+SectionName);
     end;
     
    -procedure TManWriter.StartSubSection(Const SubSectionName: String);
    +procedure TManWriter.StartSubSection(const SubSectionName: String);
     begin
       NewLine;
       Writeln('.SS '+SubSectionName);
    @@ -773,7 +787,8 @@
     end;
     
     
    -procedure TManWriter.PageTitle(Const ATitle,ASection,ASource,Amanual : String);
    +procedure TManWriter.PageTitle(const ATitle, ASection, ASource, Amanual: String
    +  );
     
     Var
       D : String;
    @@ -784,7 +799,7 @@
     end;
     
     
    -procedure TManWriter.WriteManRef(Const ManPage : String; Comma : Boolean);
    +procedure TManWriter.WriteManRef(const ManPage: String; Comma: Boolean);
     
     begin
       If Comma then
    @@ -795,7 +810,7 @@
     
     
     
    -Function TManWriter.ElementToManPage(APasElement : TPasElement) : String;
    +function TManWriter.ElementToManPage(APasElement: TPasElement): String;
     
     Var
       E : TPasElement;
    @@ -991,7 +1006,7 @@
       ---------------------------------------------------------------------}
     
     
    -Procedure TManWriter.WritePackagePage;
    +procedure TManWriter.WritePackagePage;
     
     var
       D,DocNode: TDocNode;
    @@ -1048,7 +1063,7 @@
       Topic support
       ---------------------------------------------------------------------}
     
    -Procedure TManWriter.WriteTopicRefs(DocNode : TDocNode);
    +procedure TManWriter.WriteTopicRefs(DocNode: TDocNode);
     
     Var
       Node : TDocNode;
    @@ -1065,7 +1080,7 @@
         end;
     end;
     
    -Procedure TManWriter.ProcessTopics(DocNode : TDocNode; Subs : Boolean);
    +procedure TManWriter.ProcessTopics(DocNode: TDocNode; Subs: Boolean);
     
     Var
       Node,SubNode : TDocNode;
    @@ -1092,7 +1107,7 @@
     end;
     
     
    -Procedure TManWriter.WriteTopicPage(Parent,Node : TDocNode);
    +procedure TManWriter.WriteTopicPage(Parent, Node: TDocNode);
     
     Var
       Element : TTopicElement;
    @@ -1784,7 +1799,7 @@
     end;
     
     
    -Class procedure TManWriter.Usage(List: TStrings);
    +class procedure TManWriter.Usage(List: TStrings);
     begin
       List.add('--nounitprefix');
       List.Add(SManUsageNoUnitPrefix);
    
    dw_man.pp.patch (4,198 bytes)
  • dw_txt.pp.patch (830 bytes)
    Index: dw_txt.pp
    ===================================================================
    --- dw_txt.pp	(revision 42488)
    +++ dw_txt.pp	(working copy)
    @@ -89,6 +89,8 @@
         procedure DescrEndItalic; override;
         procedure DescrBeginEmph; override;
         procedure DescrEndEmph; override;
    +    procedure DescrBeginUnderline; override;
    +    procedure DescrEndUnderline; override;
         procedure DescrWriteFileEl(const AText: DOMString); override;
         procedure DescrWriteKeywordEl(const AText: DOMString); override;
         procedure DescrWriteVarEl(const AText: DOMString); override;
    @@ -270,6 +272,14 @@
     begin
     end;
     
    +procedure TTXTWriter.DescrBeginUnderline;
    +begin
    +end;
    +
    +procedure TTXTWriter.DescrEndUnderline;
    +begin
    +end;
    +
     procedure TTXTWriter.DescrWriteFileEl(const AText: DOMString);
     begin
       DescrWriteText(AText);
    
    dw_txt.pp.patch (830 bytes)
  • dwriter.pp.patch (1,014 bytes)
    Index: dwriter.pp
    ===================================================================
    --- dwriter.pp	(revision 42488)
    +++ dwriter.pp	(working copy)
    @@ -117,6 +117,8 @@
         procedure DescrEndBold; virtual; abstract;
         procedure DescrBeginItalic; virtual; abstract;
         procedure DescrEndItalic; virtual; abstract;
    +    procedure DescrBeginUnderline; virtual; abstract;
    +    procedure DescrEndUnderline; virtual; abstract;
         procedure DescrBeginEmph; virtual; abstract;
         procedure DescrEndEmph; virtual; abstract;
         procedure DescrWriteImageEl(const AFileName, ACaption,ALinkName : DOMString); virtual; 
    @@ -637,6 +639,12 @@
           ConvertBaseShortList(AContext, Node, False);
           DescrEndEmph;
         end else
    +    if Node.NodeName = 'u' then
    +    begin
    +      DescrBeginUnderline;
    +      ConvertBaseShortList(AContext, Node, False);
    +      DescrEndUnderline;
    +    end else
         if Node.NodeName = 'file' then
           DescrWriteFileEl(ConvertTextContent)
         else if Node.NodeName = 'kw' then
    
    dwriter.pp.patch (1,014 bytes)

Activities

Oleg

2019-08-10 08:52

reporter  

testing.zip (1,473 bytes)
dw_html.pp.patch (2,904 bytes)
Index: dw_html.pp
===================================================================
--- dw_html.pp	(revision 42488)
+++ dw_html.pp	(working copy)
@@ -145,6 +145,8 @@
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
@@ -1101,6 +1103,16 @@
   PopOutputNode;
 end;
 
+procedure THTMLWriter.DescrBeginUnderline;
+begin
+  PushOutputNode(CreateEl(CurOutputNode, 'u'));
+end;
+
+procedure THTMLWriter.DescrEndUnderline;
+begin
+  PopOutputNode;
+end;
+
 procedure THTMLWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString);
 
 Var
@@ -1520,7 +1532,7 @@
   end;
 end;
 
-Procedure THTMLWriter.AppendShortDescr(AContext: TPasElement; Parent: TDOMNode; DocNode : TDocNode);
+procedure THTMLWriter.AppendShortDescr(AContext: TPasElement; Parent: TDOMNode; DocNode: TDocNode);
 
 Var
   N : TDocNode;
@@ -2160,7 +2172,8 @@
     [ExtractFileName(AElement.SourceFilename), AElement.SourceLinenumber]));
 end;
 
-Procedure THTMLWriter.AppendSeeAlsoSection(AElement : TPasElement;DocNode : TDocNode);
+procedure THTMLWriter.AppendSeeAlsoSection(AElement: TPasElement;
+  DocNode: TDocNode);
 
 var
   Node: TDOMNode;
@@ -2234,7 +2247,8 @@
      end; // While
 end;
 
-Procedure THTMLWriter.AppendExampleSection(AElement : TPasElement;DocNode : TDocNode);
+procedure THTMLWriter.AppendExampleSection(AElement: TPasElement;
+  DocNode: TDocNode);
 
 var
   Node: TDOMNode;
@@ -2335,7 +2349,7 @@
     end;
 end;
 
-Procedure THTMLWriter.CreateTopicPageBody(AElement : TTopicElement);
+procedure THTMLWriter.CreateTopicPageBody(AElement: TTopicElement);
 
 var
   DocNode: TDocNode;
@@ -2652,7 +2666,8 @@
   end;  
 end;
 
-Procedure THTMLWriter.AddElementsFromList(L : TStrings; List : TFPList; UsePathName : Boolean = False);
+procedure THTMLWriter.AddElementsFromList(L: TStrings; List: TFPList;
+  UsePathName: Boolean);
 
 Var
   I : Integer;
@@ -2757,7 +2772,7 @@
     end;
 end;
 
-Procedure THTMLWriter.CreateTopicLinks(Node : TDocNode; PasElement : TPasElement);
+procedure THTMLWriter.CreateTopicLinks(Node: TDocNode; PasElement: TPasElement);
 
 var
   DocNode: TDocNode;
@@ -3821,7 +3836,7 @@
   FinishElementPage(AProc);
 end;
 
-Function THTMLWriter.InterPretOption(Const Cmd,Arg : String) : boolean;
+function THTMLWriter.InterPretOption(const Cmd, Arg: String): boolean;
 
 begin
   Result:=True;
@@ -3890,7 +3905,7 @@
     end;
 end;
 
-Class Function THTMLWriter.FileNameExtension : String; 
+class function THTMLWriter.FileNameExtension: String;
 begin
   result:='';
 end;
dw_html.pp.patch (2,904 bytes)
dw_latex.pp.patch (1,143 bytes)
Index: dw_latex.pp
===================================================================
--- dw_latex.pp	(revision 42488)
+++ dw_latex.pp	(working copy)
@@ -87,6 +87,8 @@
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
@@ -156,7 +158,7 @@
       Result[i] := ':';
 end;
 
-Function TLaTeXWriter.SplitLine (ALine : String): String;
+function TLaTeXWriter.SplitLine(ALine: String): String;
 
   Function FindLastSplit(S : String) : Integer;
 
@@ -287,6 +289,16 @@
   Write('}');
 end;
 
+procedure TLaTeXWriter.DescrBeginUnderline;
+begin
+  Write('\underline{');
+end;
+
+procedure TLaTeXWriter.DescrEndUnderline;
+begin
+  Write('}');
+end;
+
 procedure TLaTeXWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); 
 
 Var
dw_latex.pp.patch (1,143 bytes)
dw_linrtf.pp.patch (875 bytes)
Index: dw_linrtf.pp
===================================================================
--- dw_linrtf.pp	(revision 42488)
+++ dw_linrtf.pp	(working copy)
@@ -121,6 +121,8 @@
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -344,6 +346,16 @@
   Write('}')
 end;
 
+procedure TRTFWriter.DescrBeginUnderline;
+begin
+  Write('{\ul ');
+end;
+
+procedure TRTFWriter.DescrEndUnderline;
+begin
+  Write('}');
+end;
+
 procedure TRTFWriter.DescrWriteFileEl(const AText: DOMString);
 begin
   Write('{\f0 ');
dw_linrtf.pp.patch (875 bytes)
dw_man.pp.patch (4,198 bytes)
Index: dw_man.pp
===================================================================
--- dw_man.pp	(revision 42488)
+++ dw_man.pp	(working copy)
@@ -138,6 +138,8 @@
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -315,7 +317,7 @@
   Writing support
   ---------------------------------------------------------------------}
 
-Function TManWriter.PushWriteContext(S : TStream) : TStream;
+function TManWriter.PushWriteContext(S: TStream): TStream;
 
 begin
   Result:=FStream;
@@ -322,7 +324,7 @@
   FStream:=S;
 end;
 
-Procedure TManWriter.PopWriteContext(S : TSTream);
+procedure TManWriter.PopWriteContext(S: TSTream);
 
 begin
   FStream:=S;
@@ -354,7 +356,7 @@
     end;
 end;
 
-Procedure TManWriter.NewLine;
+procedure TManWriter.NewLine;
 
 begin
   if Not FAtLineStart then
@@ -425,6 +427,17 @@
   NewLine;
 end;
 
+procedure TManWriter.DescrBeginUnderline;
+begin
+  NewLine;
+  Write('.I '); //use ITALIC!
+end;
+
+procedure TManWriter.DescrEndUnderline;
+begin
+  NewLine;
+end;
+
 procedure TManWriter.DescrWriteFileEl(const AText: DOMString);
 
 Var
@@ -680,7 +693,8 @@
 end;
 
 
-Function TManWriter.GetDescrString(AContext: TPasElement; DescrNode: TDOMElement) : String;
+function TManWriter.GetDescrString(AContext: TPasElement; DescrNode: TDOMElement
+  ): String;
 
 Var
   S : TStringStream;
@@ -716,7 +730,7 @@
   Writeln('.TP');
 end;
 
-procedure TManWriter.WriteB(Const Msg : String);
+procedure TManWriter.WriteB(const Msg: String);
 
 begin
   NewLine;
@@ -723,7 +737,7 @@
   Writeln('.B '+MSG);
 end;
 
-procedure TManWriter.WriteBI(Const Msg : String);
+procedure TManWriter.WriteBI(const Msg: String);
 
 begin
   NewLine;
@@ -759,7 +773,7 @@
 end;
 
 
-procedure TManWriter.StartSection(Const SectionName: String);
+procedure TManWriter.StartSection(const SectionName: String);
 begin
   NewLine;
   Writeln('');
@@ -766,7 +780,7 @@
   Writeln('.SH '+SectionName);
 end;
 
-procedure TManWriter.StartSubSection(Const SubSectionName: String);
+procedure TManWriter.StartSubSection(const SubSectionName: String);
 begin
   NewLine;
   Writeln('.SS '+SubSectionName);
@@ -773,7 +787,8 @@
 end;
 
 
-procedure TManWriter.PageTitle(Const ATitle,ASection,ASource,Amanual : String);
+procedure TManWriter.PageTitle(const ATitle, ASection, ASource, Amanual: String
+  );
 
 Var
   D : String;
@@ -784,7 +799,7 @@
 end;
 
 
-procedure TManWriter.WriteManRef(Const ManPage : String; Comma : Boolean);
+procedure TManWriter.WriteManRef(const ManPage: String; Comma: Boolean);
 
 begin
   If Comma then
@@ -795,7 +810,7 @@
 
 
 
-Function TManWriter.ElementToManPage(APasElement : TPasElement) : String;
+function TManWriter.ElementToManPage(APasElement: TPasElement): String;
 
 Var
   E : TPasElement;
@@ -991,7 +1006,7 @@
   ---------------------------------------------------------------------}
 
 
-Procedure TManWriter.WritePackagePage;
+procedure TManWriter.WritePackagePage;
 
 var
   D,DocNode: TDocNode;
@@ -1048,7 +1063,7 @@
   Topic support
   ---------------------------------------------------------------------}
 
-Procedure TManWriter.WriteTopicRefs(DocNode : TDocNode);
+procedure TManWriter.WriteTopicRefs(DocNode: TDocNode);
 
 Var
   Node : TDocNode;
@@ -1065,7 +1080,7 @@
     end;
 end;
 
-Procedure TManWriter.ProcessTopics(DocNode : TDocNode; Subs : Boolean);
+procedure TManWriter.ProcessTopics(DocNode: TDocNode; Subs: Boolean);
 
 Var
   Node,SubNode : TDocNode;
@@ -1092,7 +1107,7 @@
 end;
 
 
-Procedure TManWriter.WriteTopicPage(Parent,Node : TDocNode);
+procedure TManWriter.WriteTopicPage(Parent, Node: TDocNode);
 
 Var
   Element : TTopicElement;
@@ -1784,7 +1799,7 @@
 end;
 
 
-Class procedure TManWriter.Usage(List: TStrings);
+class procedure TManWriter.Usage(List: TStrings);
 begin
   List.add('--nounitprefix');
   List.Add(SManUsageNoUnitPrefix);
dw_man.pp.patch (4,198 bytes)
dw_txt.pp.patch (830 bytes)
Index: dw_txt.pp
===================================================================
--- dw_txt.pp	(revision 42488)
+++ dw_txt.pp	(working copy)
@@ -89,6 +89,8 @@
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -270,6 +272,14 @@
 begin
 end;
 
+procedure TTXTWriter.DescrBeginUnderline;
+begin
+end;
+
+procedure TTXTWriter.DescrEndUnderline;
+begin
+end;
+
 procedure TTXTWriter.DescrWriteFileEl(const AText: DOMString);
 begin
   DescrWriteText(AText);
dw_txt.pp.patch (830 bytes)
dwriter.pp.patch (1,014 bytes)
Index: dwriter.pp
===================================================================
--- dwriter.pp	(revision 42488)
+++ dwriter.pp	(working copy)
@@ -117,6 +117,8 @@
     procedure DescrEndBold; virtual; abstract;
     procedure DescrBeginItalic; virtual; abstract;
     procedure DescrEndItalic; virtual; abstract;
+    procedure DescrBeginUnderline; virtual; abstract;
+    procedure DescrEndUnderline; virtual; abstract;
     procedure DescrBeginEmph; virtual; abstract;
     procedure DescrEndEmph; virtual; abstract;
     procedure DescrWriteImageEl(const AFileName, ACaption,ALinkName : DOMString); virtual; 
@@ -637,6 +639,12 @@
       ConvertBaseShortList(AContext, Node, False);
       DescrEndEmph;
     end else
+    if Node.NodeName = 'u' then
+    begin
+      DescrBeginUnderline;
+      ConvertBaseShortList(AContext, Node, False);
+      DescrEndUnderline;
+    end else
     if Node.NodeName = 'file' then
       DescrWriteFileEl(ConvertTextContent)
     else if Node.NodeName = 'kw' then
dwriter.pp.patch (1,014 bytes)

Oleg

2019-08-10 08:58

reporter   ~0117619

Sorry I'm talking about the "u" tag

Marco van de Voort

2019-09-07 17:16

manager   ~0117974

Cleaned up (no formatting please!), committed. Thanks!

Oleg

2019-09-08 09:37

reporter   ~0117983

OK

Issue History

Date Modified Username Field Change
2019-08-10 08:52 Oleg New Issue
2019-08-10 08:52 Oleg File Added: testing.zip
2019-08-10 08:52 Oleg File Added: dw_html.pp.patch
2019-08-10 08:52 Oleg File Added: dw_latex.pp.patch
2019-08-10 08:52 Oleg File Added: dw_linrtf.pp.patch
2019-08-10 08:52 Oleg File Added: dw_man.pp.patch
2019-08-10 08:52 Oleg File Added: dw_txt.pp.patch
2019-08-10 08:52 Oleg File Added: dwriter.pp.patch
2019-08-10 08:58 Oleg Note Added: 0117619
2019-09-07 17:16 Marco van de Voort Assigned To => Marco van de Voort
2019-09-07 17:16 Marco van de Voort Status new => resolved
2019-09-07 17:16 Marco van de Voort Resolution open => fixed
2019-09-07 17:16 Marco van de Voort Fixed in Revision => 42935
2019-09-07 17:16 Marco van de Voort FPCTarget => -
2019-09-07 17:16 Marco van de Voort Note Added: 0117974
2019-09-08 09:37 Oleg Status resolved => closed
2019-09-08 09:37 Oleg Note Added: 0117983