paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 18:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* enhance html display

Browse Source 
git-svn-id: trunk@7141 -
This commit is contained in:
pierre 2007-04-20 09:57:09 +00:00
parent 1d1412c593
commit e98fc7e396
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/whtml.pas
View File

@ -103,10 +103,10 @@ type
procedure DocDiv(Entered: boolean); virtual; procedure DocDiv(Entered: boolean); virtual;
procedure DocList(Entered: boolean); virtual; procedure DocList(Entered: boolean); virtual;
procedure DocOrderedList(Entered: boolean); virtual; procedure DocOrderedList(Entered: boolean); virtual;
procedure DocListItem; virtual; procedure DocListItem(Entered: boolean); virtual;
procedure DocDefList(Entered: boolean); virtual; procedure DocDefList(Entered: boolean); virtual;
procedure DocDefTerm; virtual; procedure DocDefTerm(Entered: boolean); virtual;
procedure DocDefExp; virtual; procedure DocDefExp(Entered: boolean); virtual;
procedure DocTable(Entered: boolean); virtual; procedure DocTable(Entered: boolean); virtual;
procedure DocTableRow(Entered: boolean); virtual; procedure DocTableRow(Entered: boolean); virtual;
procedure DocTableHeaderItem(Entered: boolean); virtual; procedure DocTableHeaderItem(Entered: boolean); virtual;
@ -593,11 +593,11 @@ begin
{ Unordered & ordered lists } { Unordered & ordered lists }
if (ETagName='UL') then DocList(NotEndTag) else if (ETagName='UL') then DocList(NotEndTag) else
if (ETagName='OL') then DocOrderedList(NotEndTag) else if (ETagName='OL') then DocOrderedList(NotEndTag) else
if (UTagName='LI') then DocListItem else if (ETagName='LI') then DocListItem(NotEndTag) else
{ Definition list } { Definition list }
if (ETagName='DL') then DocDefList(NotEndTag) else if (ETagName='DL') then DocDefList(NotEndTag) else
if (UTagName='DT') then DocDefTerm else if (ETagName='DT') then DocDefTerm(NotEndTag) else
if (UTagName='DD') then DocDefExp else if (ETagName='DD') then DocDefExp(NotEndTag) else
{ Table } { Table }
if (ETagName='TABLE') then DocTable(NotEndTag) else if (ETagName='TABLE') then DocTable(NotEndTag) else
if (ETagName='TR') then DocTableRow(NotEndTag) else if (ETagName='TR') then DocTableRow(NotEndTag) else
@ -793,7 +793,7 @@ procedure THTMLParser.DocOrderedList(Entered: boolean);
begin begin
end; end;
procedure THTMLParser.DocListItem; procedure THTMLParser.DocListItem(Entered: boolean);
begin begin
end; end;
@ -801,11 +801,11 @@ procedure THTMLParser.DocDefList(Entered: boolean);
begin begin
end; end;
procedure THTMLParser.DocDefTerm; procedure THTMLParser.DocDefTerm(Entered: boolean);
begin begin
end; end;
procedure THTMLParser.DocDefExp; procedure THTMLParser.DocDefExp(Entered: boolean);
begin begin
end; end;

37
ide/whtmlhlp.pas
View File

@ -106,10 +106,10 @@ type
procedure DocSpan(Entered: boolean); virtual; procedure DocSpan(Entered: boolean); virtual;
procedure DocList(Entered: boolean); virtual; procedure DocList(Entered: boolean); virtual;
procedure DocOrderedList(Entered: boolean); virtual; procedure DocOrderedList(Entered: boolean); virtual;
procedure DocListItem; virtual; procedure DocListItem(Entered: boolean); virtual;
procedure DocDefList(Entered: boolean); virtual; procedure DocDefList(Entered: boolean); virtual;
procedure DocDefTerm; virtual; procedure DocDefTerm(Entered: boolean); virtual;
procedure DocDefExp; virtual; procedure DocDefExp(Entered: boolean); virtual;
procedure DocTable(Entered: boolean); virtual; procedure DocTable(Entered: boolean); virtual;
procedure DocTableRow(Entered: boolean); virtual; procedure DocTableRow(Entered: boolean); virtual;
procedure DocTableHeaderItem(Entered: boolean); virtual; procedure DocTableHeaderItem(Entered: boolean); virtual;
@ -127,6 +127,7 @@ type
InAnchor: boolean; InAnchor: boolean;
InParagraph: boolean; InParagraph: boolean;
InPreformatted: boolean; InPreformatted: boolean;
InDefExp: boolean;
TopicTitle: string; TopicTitle: string;
Indent: integer; Indent: integer;
AnyCharsInLine: boolean; AnyCharsInLine: boolean;
@ -311,6 +312,9 @@ var
TextBegin,TextEnd : sw_word; TextBegin,TextEnd : sw_word;
i,j,k,Length : sw_word; i,j,k,Length : sw_word;
begin begin
{ do nothing for single cell tables }
if (NumCols=1) and (NumLines=1) then
exit;
GetMem(ColLengthArray,Sizeof(sw_word)*NumCols); GetMem(ColLengthArray,Sizeof(sw_word)*NumCols);
FillChar(ColLengthArray^,Sizeof(sw_word)*NumCols,#0); FillChar(ColLengthArray^,Sizeof(sw_word)*NumCols,#0);
GetMem(RowSizeArray,Sizeof(sw_word)*NumLines); GetMem(RowSizeArray,Sizeof(sw_word)*NumLines);
@ -906,8 +910,10 @@ begin
DocList(Entered); DocList(Entered);
end; end;
procedure THTMLTopicRenderer.DocListItem; procedure THTMLTopicRenderer.DocListItem(Entered: boolean);
begin begin
if not Entered then
exit;
if AnyCharsInLine then if AnyCharsInLine then
DocBreak; DocBreak;
AddText('þ'+hscLineStart); AddText('þ'+hscLineStart);
@ -922,19 +928,32 @@ begin
else else
begin begin
if AnyCharsInLine then DocBreak; if AnyCharsInLine then DocBreak;
InDefExp:=false;
end; end;
end; end;
procedure THTMLTopicRenderer.DocDefTerm; procedure THTMLTopicRenderer.DocDefTerm(Entered: boolean);
begin begin
if not Entered then
exit;
DocBreak; DocBreak;
end; end;
procedure THTMLTopicRenderer.DocDefExp; procedure THTMLTopicRenderer.DocDefExp(Entered: boolean);
begin begin
Inc(Indent,DefIndent); if not Entered then
DocBreak; begin
Dec(Indent,DefIndent); if InDefExp then
Dec(Indent,DefIndent);
InDefExp:=false;
end
else
begin
if not InDefExp then
Inc(Indent,DefIndent);
InDefExp:=true;
DocBreak;
end;
end; end;
procedure THTMLTopicRenderer.DocTable(Entered: boolean); procedure THTMLTopicRenderer.DocTable(Entered: boolean);