diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2008-03-07 20:44:54 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2008-03-07 20:44:54 +0000 |
| commit | fd7b2b9b33826fa41ca8359188f8bad0f258435d (patch) | |
| tree | 6a87305794173e99cb0cdc902ce748916f13ae1c /src/dom/xpathparser.cpp | |
| parent | Fix for bug 199387 (p3, p6 modes of Clone Tiler broken) (diff) | |
| download | inkscape-fd7b2b9b33826fa41ca8359188f8bad0f258435d.tar.gz inkscape-fd7b2b9b33826fa41ca8359188f8bad0f258435d.zip | |
Update charclass.h/cpp to use complete Unicode character database
(bzr r4984)
Diffstat (limited to 'src/dom/xpathparser.cpp')
| -rw-r--r-- | src/dom/xpathparser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dom/xpathparser.cpp b/src/dom/xpathparser.cpp index 916158ec2..f2e000e6d 100644 --- a/src/dom/xpathparser.cpp +++ b/src/dom/xpathparser.cpp @@ -187,7 +187,7 @@ int XPathParser::skipwhite(int p0) while (p < parselen) { int ch = peek(p); - if (!isWhitespace(ch)) + if (!uni_is_space(ch)) break; ch = get(p++); } @@ -200,7 +200,7 @@ int XPathParser::getword(int p0, DOMString &str) while (p < parselen) { int ch = peek(p); - if (!isLetterOrDigit(ch)) + if (!uni_is_letter_or_digit(ch)) break; ch = get(p++); str.push_back((XMLCh)ch); @@ -270,7 +270,7 @@ int XPathParser::getNumber(int p0, double &dresult) return p0; seen_eminus = true; } - else if (!isDigit(ch)) + else if (!uni_is_digit(ch)) break; num.push_back((XMLCh)ch); i++; @@ -344,7 +344,7 @@ int XPathParser::getNCName(int p0, DOMString &result) { int p = p0; int ch = peek(p); - if (ch != '_' && !isLetter(ch)) + if (ch != '_' && !uni_is_letter(ch)) return p0; result.push_back((XMLCh)ch); @@ -352,9 +352,9 @@ int XPathParser::getNCName(int p0, DOMString &result) while (p < parselen) { ch = peek(p); - if ( isLetterOrDigit(ch) || - isCombiningChar(ch) || - isExtender(ch) || + if ( uni_is_letter_or_digit(ch) || + // isCombiningChar(ch) || + // isExtender(ch) || ch == '.' || ch == '-' || ch == '_' ) { result.push_back((XMLCh)ch); |