浏览代码

* add underline support. Patch by Oleg, mantis #35946

git-svn-id: trunk@42935 -
marco 5 年之前
父节点
当前提交
61e777a4ff
共有 6 个文件被更改,包括 67 次插入0 次删除
  1. 12 0
      utils/fpdoc/dw_html.pp
  2. 12 0
      utils/fpdoc/dw_latex.pp
  3. 12 0
      utils/fpdoc/dw_linrtf.pp
  4. 13 0
      utils/fpdoc/dw_man.pp
  5. 10 0
      utils/fpdoc/dw_txt.pp
  6. 8 0
      utils/fpdoc/dwriter.pp

+ 12 - 0
utils/fpdoc/dw_html.pp

@@ -145,6 +145,8 @@ type
     procedure DescrEndItalic; override;
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
@@ -1101,6 +1103,16 @@ begin
   PopOutputNode;
   PopOutputNode;
 end;
 end;
 
 
+procedure THTMLWriter.DescrBeginUnderline;
+begin
+  PushOutputNode(CreateEl(CurOutputNode, 'u'));
+end;
+
+procedure THTMLWriter.DescrEndUnderline;
+begin
+  PopOutputNode;
+end;
+
 procedure THTMLWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString);
 procedure THTMLWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString);
 
 
 Var
 Var

+ 12 - 0
utils/fpdoc/dw_latex.pp

@@ -87,6 +87,8 @@ Type
     procedure DescrEndItalic; override;
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
@@ -287,6 +289,16 @@ begin
   Write('}');
   Write('}');
 end;
 end;
 
 
+procedure TLaTeXWriter.DescrBeginUnderline;
+begin
+  Write('\underline{');
+end;
+
+procedure TLaTeXWriter.DescrEndUnderline;
+begin
+  Write('}');
+end;
+
 procedure TLaTeXWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); 
 procedure TLaTeXWriter.DescrWriteImageEl(const AFileName, ACaption, ALinkName : DOMString); 
 
 
 Var
 Var

+ 12 - 0
utils/fpdoc/dw_linrtf.pp

@@ -121,6 +121,8 @@ type
     procedure DescrEndItalic; override;
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -344,6 +346,16 @@ begin
   Write('}')
   Write('}')
 end;
 end;
 
 
+procedure TRTFWriter.DescrBeginUnderline;
+begin
+  Write('{\ul ');
+end;
+
+procedure TRTFWriter.DescrEndUnderline;
+begin
+  Write('}');
+end;
+
 procedure TRTFWriter.DescrWriteFileEl(const AText: DOMString);
 procedure TRTFWriter.DescrWriteFileEl(const AText: DOMString);
 begin
 begin
   Write('{\f0 ');
   Write('{\f0 ');

+ 13 - 0
utils/fpdoc/dw_man.pp

@@ -138,6 +138,8 @@ Type
     procedure DescrEndItalic; override;
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -425,6 +427,17 @@ begin
   NewLine;
   NewLine;
 end;
 end;
 
 
+procedure TManWriter.DescrBeginUnderline;
+begin
+  NewLine;
+  Write('.I '); //use ITALIC!
+end;
+
+procedure TManWriter.DescrEndUnderline;
+begin
+  NewLine;
+end;
+
 procedure TManWriter.DescrWriteFileEl(const AText: DOMString);
 procedure TManWriter.DescrWriteFileEl(const AText: DOMString);
 
 
 Var
 Var

+ 10 - 0
utils/fpdoc/dw_txt.pp

@@ -89,6 +89,8 @@ Type
     procedure DescrEndItalic; override;
     procedure DescrEndItalic; override;
     procedure DescrBeginEmph; override;
     procedure DescrBeginEmph; override;
     procedure DescrEndEmph; override;
     procedure DescrEndEmph; override;
+    procedure DescrBeginUnderline; override;
+    procedure DescrEndUnderline; override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteFileEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteKeywordEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
     procedure DescrWriteVarEl(const AText: DOMString); override;
@@ -270,6 +272,14 @@ procedure TTXTWriter.DescrEndEmph;
 begin
 begin
 end;
 end;
 
 
+procedure TTXTWriter.DescrBeginUnderline;
+begin
+end;
+
+procedure TTXTWriter.DescrEndUnderline;
+begin
+end;
+
 procedure TTXTWriter.DescrWriteFileEl(const AText: DOMString);
 procedure TTXTWriter.DescrWriteFileEl(const AText: DOMString);
 begin
 begin
   DescrWriteText(AText);
   DescrWriteText(AText);

+ 8 - 0
utils/fpdoc/dwriter.pp

@@ -117,6 +117,8 @@ type
     procedure DescrEndBold; virtual; abstract;
     procedure DescrEndBold; virtual; abstract;
     procedure DescrBeginItalic; virtual; abstract;
     procedure DescrBeginItalic; virtual; abstract;
     procedure DescrEndItalic; virtual; abstract;
     procedure DescrEndItalic; virtual; abstract;
+    procedure DescrBeginUnderline; virtual; abstract;
+    procedure DescrEndUnderline; virtual; abstract;
     procedure DescrBeginEmph; virtual; abstract;
     procedure DescrBeginEmph; virtual; abstract;
     procedure DescrEndEmph; virtual; abstract;
     procedure DescrEndEmph; virtual; abstract;
     procedure DescrWriteImageEl(const AFileName, ACaption,ALinkName : DOMString); virtual; 
     procedure DescrWriteImageEl(const AFileName, ACaption,ALinkName : DOMString); virtual; 
@@ -637,6 +639,12 @@ begin
       ConvertBaseShortList(AContext, Node, False);
       ConvertBaseShortList(AContext, Node, False);
       DescrEndEmph;
       DescrEndEmph;
     end else
     end else
+    if Node.NodeName = 'u' then
+    begin
+      DescrBeginUnderline;
+      ConvertBaseShortList(AContext, Node, False);
+      DescrEndUnderline;
+    end else
     if Node.NodeName = 'file' then
     if Node.NodeName = 'file' then
       DescrWriteFileEl(ConvertTextContent)
       DescrWriteFileEl(ConvertTextContent)
     else if Node.NodeName = 'kw' then
     else if Node.NodeName = 'kw' then