зеркало из https://github.com/mozilla/pjs.git
26093: whitespace in copy/paste from plaintext.
27848: spaces between table cells in unformatted output. r=slamm.
This commit is contained in:
akkana%netscape.com
Родитель
dab37a370d
Коммит
b2a6e34776
|
|
@ -663,6 +663,26 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
EnsureVerticalSpace((mFlags & nsIDocumentEncoder::OutputFormatted) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
else if (type == eHTMLTag_td)
|
||||
{
|
||||
// We are after a table cell an thus maybe between two cells.
|
||||
// Something should be done to avoid the two cells to be written
|
||||
// together. This really need some intelligence about how the
|
||||
// contents in the cell looks.
|
||||
// Fow now, I will only add a SPACE. Could be a TAB or something
|
||||
// else but I'm not sure everything can handle the TAB so SPACE
|
||||
// seems like a better solution.
|
||||
if(!mInWhitespace) {
|
||||
// Maybe add something else? Several spaces? A TAB? SPACE+TAB?
|
||||
if(mCacheLine) {
|
||||
AddToLine(nsAutoString(" ").GetUnicode(), 1);
|
||||
} else {
|
||||
nsAutoString space(" ");
|
||||
WriteSimple(space);
|
||||
}
|
||||
mInWhitespace = PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
// The rest of this routine is formatted output stuff,
|
||||
// which we should skip if we're not formatted:
|
||||
|
|
@ -687,26 +707,6 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
else if(mIndent >= gTabSize)
|
||||
mIndent -= gTabSize;
|
||||
}
|
||||
else if (type == eHTMLTag_td)
|
||||
{
|
||||
// We are after a table cell an thus maybe between two cells.
|
||||
// Something should be done to avoid the two cells to be written
|
||||
// together. This really need some intelligence about how the
|
||||
// contents in the cell looks.
|
||||
// Fow now, I will only add a SPACE. Could be a TAB or something
|
||||
// else but I'm not sure everything can handle the TAB so SPACE
|
||||
// seems like a better solution.
|
||||
if(!mInWhitespace) {
|
||||
// Maybe add something else? Several spaces? A TAB? SPACE+TAB?
|
||||
if(mCacheLine) {
|
||||
AddToLine(nsAutoString(" ").GetUnicode(), 1);
|
||||
} else {
|
||||
nsAutoString space(" ");
|
||||
WriteSimple(space);
|
||||
}
|
||||
mInWhitespace = PR_TRUE;
|
||||
}
|
||||
}
|
||||
else if (type == eHTMLTag_a)
|
||||
{ // these brackets must stay here
|
||||
if (!mURL.IsEmpty())
|
||||
|
|
@ -730,7 +730,6 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This method is used to add a leaf to the currently
|
||||
* open container.
|
||||
|
|
@ -760,8 +759,8 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
|
|||
|
||||
if (mTagStackIndex > 1 && mTagStack[mTagStackIndex-2] == eHTMLTag_select)
|
||||
{
|
||||
// Don't output the contents of SELECT elements;
|
||||
// Might be nice, eventually, to output just the selected element.
|
||||
// Don't output the contents of SELECT elements;
|
||||
// Might be nice, eventually, to output just the selected element.
|
||||
return NS_OK;
|
||||
}
|
||||
else if (type == eHTMLTag_text)
|
||||
|
|
@ -1223,8 +1222,11 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
bol=totLen;
|
||||
mInWhitespace=PR_FALSE;
|
||||
} else {
|
||||
if(mInWhitespace && (nextpos == bol) &&
|
||||
!(mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// There's still whitespace left in the string
|
||||
|
||||
// If we're already in whitespace and not preformatted, just skip it:
|
||||
if (mInWhitespace && (nextpos == bol) && !mPreFormatted &&
|
||||
!(mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// Skip whitespace
|
||||
bol++;
|
||||
continue;
|
||||
|
|
@ -1245,7 +1247,6 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
continue;
|
||||
}
|
||||
|
||||
|
||||
if(!mCacheLine) {
|
||||
aString.Mid(tempstr,bol,nextpos-bol);
|
||||
if(mFlags & nsIDocumentEncoder::OutputPreformatted) {
|
||||
|
|
@ -1261,7 +1262,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
|
||||
offsetIntoBuffer = aString.GetUnicode();
|
||||
offsetIntoBuffer = &offsetIntoBuffer[bol];
|
||||
if(mFlags & nsIDocumentEncoder::OutputPreformatted) {
|
||||
if(mPreFormatted || (mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// Preserve the real whitespace character
|
||||
nextpos++;
|
||||
AddToLine(offsetIntoBuffer, nextpos-bol);
|
||||
|
|
|
|||
|
|
@ -663,6 +663,26 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
EnsureVerticalSpace((mFlags & nsIDocumentEncoder::OutputFormatted) ? 1 : 0);
|
||||
}
|
||||
}
|
||||
else if (type == eHTMLTag_td)
|
||||
{
|
||||
// We are after a table cell an thus maybe between two cells.
|
||||
// Something should be done to avoid the two cells to be written
|
||||
// together. This really need some intelligence about how the
|
||||
// contents in the cell looks.
|
||||
// Fow now, I will only add a SPACE. Could be a TAB or something
|
||||
// else but I'm not sure everything can handle the TAB so SPACE
|
||||
// seems like a better solution.
|
||||
if(!mInWhitespace) {
|
||||
// Maybe add something else? Several spaces? A TAB? SPACE+TAB?
|
||||
if(mCacheLine) {
|
||||
AddToLine(nsAutoString(" ").GetUnicode(), 1);
|
||||
} else {
|
||||
nsAutoString space(" ");
|
||||
WriteSimple(space);
|
||||
}
|
||||
mInWhitespace = PR_TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
// The rest of this routine is formatted output stuff,
|
||||
// which we should skip if we're not formatted:
|
||||
|
|
@ -687,26 +707,6 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
else if(mIndent >= gTabSize)
|
||||
mIndent -= gTabSize;
|
||||
}
|
||||
else if (type == eHTMLTag_td)
|
||||
{
|
||||
// We are after a table cell an thus maybe between two cells.
|
||||
// Something should be done to avoid the two cells to be written
|
||||
// together. This really need some intelligence about how the
|
||||
// contents in the cell looks.
|
||||
// Fow now, I will only add a SPACE. Could be a TAB or something
|
||||
// else but I'm not sure everything can handle the TAB so SPACE
|
||||
// seems like a better solution.
|
||||
if(!mInWhitespace) {
|
||||
// Maybe add something else? Several spaces? A TAB? SPACE+TAB?
|
||||
if(mCacheLine) {
|
||||
AddToLine(nsAutoString(" ").GetUnicode(), 1);
|
||||
} else {
|
||||
nsAutoString space(" ");
|
||||
WriteSimple(space);
|
||||
}
|
||||
mInWhitespace = PR_TRUE;
|
||||
}
|
||||
}
|
||||
else if (type == eHTMLTag_a)
|
||||
{ // these brackets must stay here
|
||||
if (!mURL.IsEmpty())
|
||||
|
|
@ -730,7 +730,6 @@ nsHTMLToTXTSinkStream::CloseContainer(const nsIParserNode& aNode)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This method is used to add a leaf to the currently
|
||||
* open container.
|
||||
|
|
@ -760,8 +759,8 @@ nsHTMLToTXTSinkStream::AddLeaf(const nsIParserNode& aNode)
|
|||
|
||||
if (mTagStackIndex > 1 && mTagStack[mTagStackIndex-2] == eHTMLTag_select)
|
||||
{
|
||||
// Don't output the contents of SELECT elements;
|
||||
// Might be nice, eventually, to output just the selected element.
|
||||
// Don't output the contents of SELECT elements;
|
||||
// Might be nice, eventually, to output just the selected element.
|
||||
return NS_OK;
|
||||
}
|
||||
else if (type == eHTMLTag_text)
|
||||
|
|
@ -1223,8 +1222,11 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
bol=totLen;
|
||||
mInWhitespace=PR_FALSE;
|
||||
} else {
|
||||
if(mInWhitespace && (nextpos == bol) &&
|
||||
!(mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// There's still whitespace left in the string
|
||||
|
||||
// If we're already in whitespace and not preformatted, just skip it:
|
||||
if (mInWhitespace && (nextpos == bol) && !mPreFormatted &&
|
||||
!(mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// Skip whitespace
|
||||
bol++;
|
||||
continue;
|
||||
|
|
@ -1245,7 +1247,6 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
continue;
|
||||
}
|
||||
|
||||
|
||||
if(!mCacheLine) {
|
||||
aString.Mid(tempstr,bol,nextpos-bol);
|
||||
if(mFlags & nsIDocumentEncoder::OutputPreformatted) {
|
||||
|
|
@ -1261,7 +1262,7 @@ nsHTMLToTXTSinkStream::Write(const nsString& aString)
|
|||
|
||||
offsetIntoBuffer = aString.GetUnicode();
|
||||
offsetIntoBuffer = &offsetIntoBuffer[bol];
|
||||
if(mFlags & nsIDocumentEncoder::OutputPreformatted) {
|
||||
if(mPreFormatted || (mFlags & nsIDocumentEncoder::OutputPreformatted)) {
|
||||
// Preserve the real whitespace character
|
||||
nextpos++;
|
||||
AddToLine(offsetIntoBuffer, nextpos-bol);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче