Browse Source

* Patch from Graeme Geldenhuys (enhanced) to use span and class when inserting images

git-svn-id: trunk@11175 -
michael 17 years ago
parent
commit
5fd3502349
1 changed files with 8 additions and 4 deletions
  1. 8 4
      utils/fpdoc/dw_html.pp

+ 8 - 4
utils/fpdoc/dw_html.pp

@@ -122,7 +122,7 @@ type
     function CreateH1(Parent: TDOMNode): THTMLElement;
     function CreateH1(Parent: TDOMNode): THTMLElement;
     function CreateH2(Parent: TDOMNode): THTMLElement;
     function CreateH2(Parent: TDOMNode): THTMLElement;
     function CreateH3(Parent: TDOMNode): THTMLElement;
     function CreateH3(Parent: TDOMNode): THTMLElement;
-    function CreateTable(Parent: TDOMNode): THTMLElement;
+    function CreateTable(Parent: TDOMNode; const AClass: DOMString = ''): THTMLElement;
     function CreateContentTable(Parent: TDOMNode): THTMLElement;
     function CreateContentTable(Parent: TDOMNode): THTMLElement;
     function CreateTR(Parent: TDOMNode): THTMLElement;
     function CreateTR(Parent: TDOMNode): THTMLElement;
     function CreateTD(Parent: TDOMNode): THTMLElement;
     function CreateTD(Parent: TDOMNode): THTMLElement;
@@ -860,11 +860,13 @@ begin
   Result := CreateEl(Parent, 'h3');
   Result := CreateEl(Parent, 'h3');
 end;
 end;
 
 
-function THTMLWriter.CreateTable(Parent: TDOMNode): THTMLElement;
+function THTMLWriter.CreateTable(Parent: TDOMNode; const AClass: DOMString = ''): THTMLElement;
 begin
 begin
   Result := CreateEl(Parent, 'table');
   Result := CreateEl(Parent, 'table');
   Result['cellspacing'] := '0';
   Result['cellspacing'] := '0';
   Result['cellpadding'] := '0';
   Result['cellpadding'] := '0';
+  if AClass <> '' then
+    Result['class'] := AClass;
 end;
 end;
 
 
 function THTMLWriter.CreateContentTable(Parent: TDOMNode): THTMLElement;
 function THTMLWriter.CreateContentTable(Parent: TDOMNode): THTMLElement;
@@ -914,7 +916,6 @@ begin
   Result['class'] := 'warning';
   Result['class'] := 'warning';
 end;
 end;
 
 
-
 procedure THTMLWriter.PushOutputNode(ANode: TDOMNode);
 procedure THTMLWriter.PushOutputNode(ANode: TDOMNode);
 begin
 begin
   OutputNodeStack.Add(CurOutputNode);
   OutputNodeStack.Add(CurOutputNode);
@@ -976,9 +977,12 @@ begin
     Pel:=CurOutputNode
     Pel:=CurOutputNode
   else
   else
     begin
     begin
-    Cel:=CreateTable(CurOutputNode);
+    Cel:=CreateTable(CurOutputNode, 'imagetable');
     Pel:=CreateTD(CreateTR(Cel));
     Pel:=CreateTD(CreateTR(Cel));
     Cel:=CreateTD(CreateTR(Cel));
     Cel:=CreateTD(CreateTR(Cel));
+    El := CreateEl(Cel, 'span');
+    El['class'] := 'imagecaption';
+    Cel := El;
     If (ALinkName<>'') then
     If (ALinkName<>'') then
       Cel:=CreateAnchor(Cel,ALinkName);
       Cel:=CreateAnchor(Cel,ALinkName);
     AppendText(Cel,ACaption);
     AppendText(Cel,ACaption);