Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 268168 [mozTXTToHTMLConv] "x^2" text to html conversion is broken for non-integer powers and is not implemented for negative powers

Browse Source 
patch by Hans-A.Engel@unibas.ch r=benb sr=darin
This commit is contained in:
timeless%mozdev.org 2004-11-23 17:38:40 +00:00
parent 9e94a3b521
commit 5280e1b42c
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
View File

@ -928,32 +928,36 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo
}
}
if // x^2 -> sup
// x^2 => x<sup>2</sup>, also handle powers x^-2, x^0.5
// implement regular expression /[\dA-Za-z\)\]}]\^-?\d+(\.\d+)*[^\dA-Za-z]/
if
(
text1 == '^' // Performance increase
&&
(
ItMatchesDelimited(aInString, aInLength,
NS_LITERAL_STRING("^").get(), 1,
LT_DIGIT, LT_DIGIT) ||
ItMatchesDelimited(aInString, aInLength,
NS_LITERAL_STRING("^").get(), 1,
LT_ALPHA, LT_DIGIT) ||
ItMatchesDelimited(&aInString[1], aInLength - 1,
NS_LITERAL_STRING("^").get(), 1,
LT_IGNORE, LT_DIGIT)
&& text0 == ')'
)
text1 == '^'
&&
(
nsCRT::IsAsciiDigit(text0) || nsCRT::IsAsciiAlpha(text0) ||
text0 == ')' || text0 == ']' || text0 == '}'
)
&&
(
2 < aInLength && nsCRT::IsAsciiDigit(aInString[2]) ||
3 < aInLength && aInString[2] == '-' && nsCRT::IsAsciiDigit(aInString[3])
)
)
{
// Find first non-digit
PRInt32 delimPos = 3; // 3 = Position after first digit after "^"
for (; delimPos < aInLength &&
nsCRT::IsAsciiDigit(aInString[PRUint32(delimPos)]); delimPos++)
PRInt32 delimPos = 3; // skip "^" and first digit (or '-')
for (; delimPos < aInLength
&&
(
nsCRT::IsAsciiDigit(aInString[delimPos]) ||
aInString[delimPos] == '.' && delimPos + 1 < aInLength &&
nsCRT::IsAsciiDigit(aInString[delimPos + 1])
);
delimPos++)
;
// Note: (delimPos == text.Length()) could be true
if (nsCRT::IsAsciiAlpha(aInString[PRUint32(delimPos)]))
if (delimPos < aInLength && nsCRT::IsAsciiAlpha(aInString[delimPos]))
{
MOZ_TIMER_STOP(mGlyphHitTimer);
return PR_FALSE;