Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

5924: Fix XIF handling of HTML comments, and also pass through the document's original formatting whitespace

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@36697 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com
1999-06-24 20:15:52 +00:00
parent 814fdc1213
commit 2787dec93c
16 changed files with 216 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -197,9 +197,8 @@ static PRBool EatClose(eHTMLTags aTag);
static PRBool PermitWSAfterOpen(eHTMLTags aTag);
static PRBool PermitWSBeforeClose(eHTMLTags aTag);
static PRBool PermitWSAfterClose(eHTMLTags aTag);
#endif // OBSOLETE
static PRBool IgnoreWS(eHTMLTags aTag);
#endif // OBSOLETE
/**
@@ -367,6 +366,7 @@ nsHTMLContentSinkStream::nsHTMLContentSinkStream(nsIOutputStream* aOutStream,
mUnicodeEncoder = nsnull;
mStream = aOutStream;
mString = aOutString;
mInBody = PR_FALSE;
if (aCharsetOverride != nsnull)
mCharsetOverride = *aCharsetOverride;
}
@@ -870,6 +870,10 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
const nsString& name = aNode.GetText();
nsString tagName;
if (tag == eHTMLTag_body)
mInBody = PR_TRUE;
mHTMLTagStack[mHTMLStackPos++] = tag;
tagName = name;
@@ -879,13 +883,13 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
tagName.ToUpperCase();
if (mColPos != 0 && BreakBeforeOpen(tag))
if ((mDoFormat || !mInBody) && mColPos != 0 && BreakBeforeOpen(tag))
{
Write(NS_LINEBREAK);
mColPos = 0;
}
if (PermitWSBeforeOpen(tag))
if ((mDoFormat || !mInBody) && PermitWSBeforeOpen(tag))
AddIndent();
EnsureBufferSize(tagName.Length());
@@ -896,7 +900,7 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
mColPos += 1 + tagName.Length();
if (tag == eHTMLTag_style)
if (mDoFormat && tag == eHTMLTag_style)
{
Write(">");
Write(NS_LINEBREAK);
@@ -916,7 +920,7 @@ void nsHTMLContentSinkStream::AddStartTag(const nsIParserNode& aNode)
mColPos += 1;
}
if (BreakAfterOpen(tag))
if (mDoFormat && BreakAfterOpen(tag))
{
Write(NS_LINEBREAK);
mColPos = 0;
@@ -935,10 +939,17 @@ void nsHTMLContentSinkStream::AddEndTag(const nsIParserNode& aNode)
// const nsString& name = aNode.GetText();
nsString tagName;
if (tag == eHTMLTag_body)
mInBody = PR_FALSE;
if (tag == eHTMLTag_unknown)
{
tagName = aNode.GetText();
}
else if (tag == eHTMLTag_comment)
{
tagName = "--";
}
else
{
const char* name = NS_EnumToTag(tag);
@@ -952,7 +963,7 @@ void nsHTMLContentSinkStream::AddEndTag(const nsIParserNode& aNode)
if (IndentChildren(tag))
mIndent--;
if (BreakBeforeClose(tag))
if (mDoFormat && BreakBeforeClose(tag))
{
if (mColPos != 0)
{
@@ -964,15 +975,19 @@ void nsHTMLContentSinkStream::AddEndTag(const nsIParserNode& aNode)
EnsureBufferSize(tagName.Length());
tagName.ToCString(mBuffer,mBufferSize);
Write(kLessThan);
Write(kForwardSlash);
if (tag != eHTMLTag_comment)
{
Write(kLessThan);
Write(kForwardSlash);
mColPos += 1 + 1;
}
Write(mBuffer);
Write(kGreaterThan);
mColPos += 1 + 1 + strlen(mBuffer) + 1;
mColPos += strlen(mBuffer) + 1;
if (BreakAfterClose(tag))
if ((mDoFormat || !mInBody) && BreakAfterClose(tag))
{
Write(NS_LINEBREAK);
mColPos = 0;
@@ -1029,7 +1044,7 @@ nsHTMLContentSinkStream::AddLeaf(const nsIParserNode& aNode){
else if (type == eHTMLTag_text)
{
const nsString& text = aNode.GetText();
if ((mDoFormat == PR_FALSE) || preformatted == PR_TRUE)
if (!mDoFormat || preformatted)
{
Write(text);
mColPos += text.Length();
@@ -1093,7 +1108,7 @@ nsHTMLContentSinkStream::AddLeaf(const nsIParserNode& aNode){
}
else if (type == eHTMLTag_whitespace)
{
if ((mDoFormat == PR_FALSE) || preformatted || IgnoreWS(tag) == PR_FALSE)
if (!mDoFormat || preformatted)
{
const nsString& text = aNode.GetText();
Write(text);
@@ -1102,7 +1117,7 @@ nsHTMLContentSinkStream::AddLeaf(const nsIParserNode& aNode){
}
else if (type == eHTMLTag_newline)
{
if ((mDoFormat == PR_FALSE) || preformatted)
if (!mDoFormat || preformatted)
{
const nsString& text = aNode.GetText();
Write(text);
@@ -1150,6 +1165,8 @@ nsHTMLContentSinkStream::AddComment(const nsIParserNode& aNode){
DebugDump("<",aNode.GetText(),(mNodeStackPos)*2);
#endif
Write("<!--");
return NS_OK;
}
@@ -1509,8 +1526,6 @@ PRBool PermitWSAfterClose(eHTMLTags aTag) {
return PR_TRUE;
}
#endif /* OBSOLETE */
/** @see PermitWSBeforeOpen */
PRBool IgnoreWS(eHTMLTags aTag) {
PRBool result = PR_FALSE;
@@ -1535,4 +1550,6 @@ PRBool IgnoreWS(eHTMLTags aTag) {
return result;
}
#endif /* OBSOLETE */