corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a dozen bugs

Browse Source
This commit is contained in:
rickg@netscape.com
1999-03-19 08:47:51 +00:00
parent b76ecfa96e
commit 5d13ef5293
40 changed files with 592 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@@ -1367,31 +1367,34 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
PRInt32 theRadix[2]={16,10};
if(mTextValue.Length()>1) {
PRUnichar theChar1=mTextValue[0];
PRBool isDigit1=nsString::IsDigit(theChar1);
PRUnichar theChar0=mTextValue[0];
PRBool isDigit0=nsString::IsDigit(theChar0);
if(isDigit1 || ('x'==theChar1) || ('X'==theChar1)) {
PRInt32 err=0;
value=mTextValue.ToInteger(&err,theRadix[isDigit1]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf)-1);
value = NS_EntityToUnicode(cbuf);
if(-1<value) {
//we found a named entity...
aString=PRUnichar(value);
}
else {
if(isDigit0 || ('x'==theChar0) || ('X'==theChar0)) {
PRInt32 err=0;
value=mTextValue.ToInteger(&err,theRadix[isDigit0]);
if(0==err) {
#ifdef PA_REMAP_128_TO_160_ILLEGAL_NCR
/* for some illegal, but popular usage */
if ((value >= 0x0080) && (value <= 0x009f)) {
value = PA_HackTable[value - 0x0080];
}
#endif
aString.Append(PRUnichar(value));
}//if
}//if
return value;
}//if
}//else
}//if
char cbuf[30];
mTextValue.ToCString(cbuf, sizeof(cbuf));
value = NS_EntityToUnicode(cbuf);
if(-1 != value) {
aString = PRUnichar(value);
}
return value;
}