mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-05 21:45:37 +00:00
ICU-1828 Remove tabs
X-SVN-Rev: 8331
This commit is contained in:
George Rhoten
parent
4efd9510f3
commit
7777030a4f
60 changed files with 2187 additions and 2251 deletions
|
|
@ -166,7 +166,7 @@ DateFormat::parse(const UnicodeString& text,
|
|||
// was illegal so we set the error index to the start.
|
||||
pos.setIndex(start);
|
||||
pos.setErrorIndex(start);
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0; // Error return UDate is 0 (the epoch)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -625,8 +625,8 @@ NFRuleSet::parse(const UnicodeString& text, ParsePosition& pos, double upperBoun
|
|||
{
|
||||
char ubstr[64];
|
||||
util64_toa(ub, ubstr, 64);
|
||||
char ubstrhex[64];
|
||||
util64_toa(ub, ubstrhex, 64, 16);
|
||||
char ubstrhex[64];
|
||||
util64_toa(ub, ubstrhex, 64, 16);
|
||||
fprintf(stderr, "ub: %g, i64: %s (%s)\n", upperBound, ubstr, ubstrhex);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -690,7 +690,7 @@ NFRuleSet::appendRules(UnicodeString& result) const
|
|||
// utility functions
|
||||
|
||||
int64_t util64_fromDouble(double d) {
|
||||
int64_t result = 0;
|
||||
int64_t result = 0;
|
||||
if (!uprv_isNaN(d)) {
|
||||
double mant = uprv_maxMantissa();
|
||||
if (d < -mant) {
|
||||
|
|
@ -707,7 +707,7 @@ int64_t util64_fromDouble(double d) {
|
|||
result = -result;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
int64_t util64_pow(int32_t r, uint32_t e) {
|
||||
|
|
@ -716,7 +716,7 @@ int64_t util64_pow(int32_t r, uint32_t e) {
|
|||
} else if (e == 0) {
|
||||
return 1;
|
||||
} else {
|
||||
int64_t n = r;
|
||||
int64_t n = r;
|
||||
while (--e > 0) {
|
||||
n *= r;
|
||||
}
|
||||
|
|
@ -826,8 +826,8 @@ uint32_t util64_toa(int64_t w, char* buf, uint32_t len, uint32_t radix, UBool ra
|
|||
*p++ = kMinus;
|
||||
--len;
|
||||
} else if (len && (w == 0)) {
|
||||
*p++ = (char)raw ? 0 : asciiDigits[0];
|
||||
--len;
|
||||
*p++ = (char)raw ? 0 : asciiDigits[0];
|
||||
--len;
|
||||
}
|
||||
|
||||
while (len && w != 0) {
|
||||
|
|
@ -872,18 +872,18 @@ uint32_t util64_tou(int64_t w, UChar* buf, uint32_t len, uint32_t radix, UBool r
|
|||
*p++ = kUMinus;
|
||||
--len;
|
||||
} else if (len && (w == 0)) {
|
||||
*p++ = (UChar)raw ? 0 : asciiDigits[0];
|
||||
--len;
|
||||
}
|
||||
*p++ = (UChar)raw ? 0 : asciiDigits[0];
|
||||
--len;
|
||||
}
|
||||
|
||||
while (len && (w != 0)) {
|
||||
int64_t n = w / base;
|
||||
int64_t m = n * base;
|
||||
int32_t d = (int32_t)(w-m);
|
||||
*p++ = (UChar)(raw ? d : asciiDigits[d]);
|
||||
w = n;
|
||||
--len;
|
||||
}
|
||||
while (len && (w != 0)) {
|
||||
int64_t n = w / base;
|
||||
int64_t m = n * base;
|
||||
int32_t d = (int32_t)(w-m);
|
||||
*p++ = (UChar)(raw ? d : asciiDigits[d]);
|
||||
w = n;
|
||||
--len;
|
||||
}
|
||||
if (len) {
|
||||
*p = 0; // null terminate if room for caller convenience
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
******************************************************************************
|
||||
* Copyright (C) 1997-2001, International Business Machines
|
||||
* Copyright (C) 1997-2002, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
******************************************************************************
|
||||
* file name: nfsubs.cpp
|
||||
|
|
@ -47,84 +47,84 @@ NFSubstitution::makeSubstitution(int32_t pos,
|
|||
const UnicodeString& description,
|
||||
UErrorCode& status)
|
||||
{
|
||||
// if the description is empty, return a NullSubstitution
|
||||
if (description.length() == 0) {
|
||||
return new NullSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
switch (description.charAt(0)) {
|
||||
// if the description begins with '<'...
|
||||
case gLessThan:
|
||||
// throw an exception if the rule is a negative number
|
||||
// rule
|
||||
if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
|
||||
// throw new IllegalArgumentException("<< not allowed in negative-number rule");
|
||||
status = U_PARSE_ERROR;
|
||||
return NULL;
|
||||
// if the description is empty, return a NullSubstitution
|
||||
if (description.length() == 0) {
|
||||
return new NullSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule is a fraction rule, return an
|
||||
// IntegralPartSubstitution
|
||||
else if (rule->getBaseValue() == NFRule::kImproperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kProperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kMasterRule) {
|
||||
return new IntegralPartSubstitution(pos, ruleSet, formatter, description, status);
|
||||
switch (description.charAt(0)) {
|
||||
// if the description begins with '<'...
|
||||
case gLessThan:
|
||||
// throw an exception if the rule is a negative number
|
||||
// rule
|
||||
if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
|
||||
// throw new IllegalArgumentException("<< not allowed in negative-number rule");
|
||||
status = U_PARSE_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// if the rule is a fraction rule, return an
|
||||
// IntegralPartSubstitution
|
||||
else if (rule->getBaseValue() == NFRule::kImproperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kProperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kMasterRule) {
|
||||
return new IntegralPartSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule set containing the rule is a fraction
|
||||
// rule set, return a NumeratorSubstitution
|
||||
else if (ruleSet->isFractionRuleSet()) {
|
||||
return new NumeratorSubstitution(pos, (double)rule->getBaseValue(),
|
||||
formatter->getDefaultRuleSet(), formatter, description, status);
|
||||
}
|
||||
|
||||
// otherwise, return a MultiplierSubstitution
|
||||
else {
|
||||
return new MultiplierSubstitution(pos, rule->getDivisor(), ruleSet,
|
||||
formatter, description, status);
|
||||
}
|
||||
|
||||
// if the description begins with '>'...
|
||||
case gGreaterThan:
|
||||
// if the rule is a negative-number rule, return
|
||||
// an AbsoluteValueSubstitution
|
||||
if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
|
||||
return new AbsoluteValueSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule is a fraction rule, return a
|
||||
// FractionalPartSubstitution
|
||||
else if (rule->getBaseValue() == NFRule::kImproperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kProperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kMasterRule) {
|
||||
return new FractionalPartSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule set owning the rule is a fraction rule set,
|
||||
// throw an exception
|
||||
else if (ruleSet->isFractionRuleSet()) {
|
||||
// throw new IllegalArgumentException(">> not allowed in fraction rule set");
|
||||
status = U_PARSE_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// otherwise, return a ModulusSubstitution
|
||||
else {
|
||||
return new ModulusSubstitution(pos, rule->getDivisor(), predecessor,
|
||||
ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the description begins with '=', always return a
|
||||
// SameValueSubstitution
|
||||
case gEquals:
|
||||
return new SameValueSubstitution(pos, ruleSet, formatter, description, status);
|
||||
|
||||
// and if it's anything else, throw an exception
|
||||
default:
|
||||
// throw new IllegalArgumentException("Illegal substitution character");
|
||||
status = U_PARSE_ERROR;
|
||||
}
|
||||
|
||||
// if the rule set containing the rule is a fraction
|
||||
// rule set, return a NumeratorSubstitution
|
||||
else if (ruleSet->isFractionRuleSet()) {
|
||||
return new NumeratorSubstitution(pos, (double)rule->getBaseValue(),
|
||||
formatter->getDefaultRuleSet(), formatter, description, status);
|
||||
}
|
||||
|
||||
// otherwise, return a MultiplierSubstitution
|
||||
else {
|
||||
return new MultiplierSubstitution(pos, rule->getDivisor(), ruleSet,
|
||||
formatter, description, status);
|
||||
}
|
||||
|
||||
// if the description begins with '>'...
|
||||
case gGreaterThan:
|
||||
// if the rule is a negative-number rule, return
|
||||
// an AbsoluteValueSubstitution
|
||||
if (rule->getBaseValue() == NFRule::kNegativeNumberRule) {
|
||||
return new AbsoluteValueSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule is a fraction rule, return a
|
||||
// FractionalPartSubstitution
|
||||
else if (rule->getBaseValue() == NFRule::kImproperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kProperFractionRule
|
||||
|| rule->getBaseValue() == NFRule::kMasterRule) {
|
||||
return new FractionalPartSubstitution(pos, ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the rule set owning the rule is a fraction rule set,
|
||||
// throw an exception
|
||||
else if (ruleSet->isFractionRuleSet()) {
|
||||
// throw new IllegalArgumentException(">> not allowed in fraction rule set");
|
||||
status = U_PARSE_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// otherwise, return a ModulusSubstitution
|
||||
else {
|
||||
return new ModulusSubstitution(pos, rule->getDivisor(), predecessor,
|
||||
ruleSet, formatter, description, status);
|
||||
}
|
||||
|
||||
// if the description begins with '=', always return a
|
||||
// SameValueSubstitution
|
||||
case gEquals:
|
||||
return new SameValueSubstitution(pos, ruleSet, formatter, description, status);
|
||||
|
||||
// and if it's anything else, throw an exception
|
||||
default:
|
||||
// throw new IllegalArgumentException("Illegal substitution character");
|
||||
status = U_PARSE_ERROR;
|
||||
}
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
NFSubstitution::NFSubstitution(int32_t _pos,
|
||||
|
|
@ -134,58 +134,59 @@ NFSubstitution::NFSubstitution(int32_t _pos,
|
|||
UErrorCode& status)
|
||||
: pos(_pos), ruleSet(NULL), numberFormat(NULL)
|
||||
{
|
||||
// the description should begin and end with the same character.
|
||||
// If it doesn't that's a syntax error. Otherwise,
|
||||
// makeSubstitution() was the only thing that needed to know
|
||||
// about these characters, so strip them off
|
||||
UnicodeString workingDescription(description);
|
||||
if (description.length() >= 2 && description.charAt(0) == description.charAt(
|
||||
description.length() - 1)) {
|
||||
workingDescription.remove(description.length() - 1, 1);
|
||||
workingDescription.remove(0, 1);
|
||||
}
|
||||
else if (description.length() != 0) {
|
||||
// throw new IllegalArgumentException("Illegal substitution syntax");
|
||||
status = U_PARSE_ERROR;
|
||||
return;
|
||||
}
|
||||
// the description should begin and end with the same character.
|
||||
// If it doesn't that's a syntax error. Otherwise,
|
||||
// makeSubstitution() was the only thing that needed to know
|
||||
// about these characters, so strip them off
|
||||
UnicodeString workingDescription(description);
|
||||
if (description.length() >= 2
|
||||
&& description.charAt(0) == description.charAt(description.length() - 1))
|
||||
{
|
||||
workingDescription.remove(description.length() - 1, 1);
|
||||
workingDescription.remove(0, 1);
|
||||
}
|
||||
else if (description.length() != 0) {
|
||||
// throw new IllegalArgumentException("Illegal substitution syntax");
|
||||
status = U_PARSE_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
// if the description was just two paired token characters
|
||||
// (i.e., "<<" or ">>"), it uses the rule set it belongs to to
|
||||
// format its result
|
||||
if (workingDescription.length() == 0) {
|
||||
this->ruleSet = _ruleSet;
|
||||
}
|
||||
// if the description contains a rule set name, that's the rule
|
||||
// set we use to format the result: get a reference to the
|
||||
// names rule set
|
||||
else if (workingDescription.charAt(0) == gPercent) {
|
||||
this->ruleSet = formatter->findRuleSet(workingDescription, status);
|
||||
}
|
||||
// if the description begins with 0 or #, treat it as a
|
||||
// DecimalFormat pattern, and initialize a DecimalFormat with
|
||||
// that pattern (then set it to use the DecimalFormatSymbols
|
||||
// belonging to our formatter)
|
||||
else if (workingDescription.charAt(0) == gPound || workingDescription.charAt(0) ==gZero) {
|
||||
this->numberFormat = new DecimalFormat(workingDescription, *(formatter->getDecimalFormatSymbols()), status);
|
||||
// this->numberFormat->setDecimalFormatSymbols(formatter->getDecimalFormatSymbols());
|
||||
}
|
||||
// if the description is ">>>", this substitution bypasses the
|
||||
// usual rule-search process and always uses the rule that precedes
|
||||
// it in its own rule set's rule list (this is used for place-value
|
||||
// notations: formats where you want to see a particular part of
|
||||
// a number even when it's 0)
|
||||
else if (workingDescription.charAt(0) == gGreaterThan) {
|
||||
// this causes problems when >>> is used in a frationalPartSubstitution
|
||||
// this->ruleSet = NULL;
|
||||
this->ruleSet = _ruleSet;
|
||||
this->numberFormat = NULL;
|
||||
}
|
||||
// and of the description is none of these things, it's a syntax error
|
||||
else {
|
||||
// throw new IllegalArgumentException("Illegal substitution syntax");
|
||||
status = U_PARSE_ERROR;
|
||||
}
|
||||
// if the description was just two paired token characters
|
||||
// (i.e., "<<" or ">>"), it uses the rule set it belongs to to
|
||||
// format its result
|
||||
if (workingDescription.length() == 0) {
|
||||
this->ruleSet = _ruleSet;
|
||||
}
|
||||
// if the description contains a rule set name, that's the rule
|
||||
// set we use to format the result: get a reference to the
|
||||
// names rule set
|
||||
else if (workingDescription.charAt(0) == gPercent) {
|
||||
this->ruleSet = formatter->findRuleSet(workingDescription, status);
|
||||
}
|
||||
// if the description begins with 0 or #, treat it as a
|
||||
// DecimalFormat pattern, and initialize a DecimalFormat with
|
||||
// that pattern (then set it to use the DecimalFormatSymbols
|
||||
// belonging to our formatter)
|
||||
else if (workingDescription.charAt(0) == gPound || workingDescription.charAt(0) ==gZero) {
|
||||
this->numberFormat = new DecimalFormat(workingDescription, *(formatter->getDecimalFormatSymbols()), status);
|
||||
// this->numberFormat->setDecimalFormatSymbols(formatter->getDecimalFormatSymbols());
|
||||
}
|
||||
// if the description is ">>>", this substitution bypasses the
|
||||
// usual rule-search process and always uses the rule that precedes
|
||||
// it in its own rule set's rule list (this is used for place-value
|
||||
// notations: formats where you want to see a particular part of
|
||||
// a number even when it's 0)
|
||||
else if (workingDescription.charAt(0) == gGreaterThan) {
|
||||
// this causes problems when >>> is used in a frationalPartSubstitution
|
||||
// this->ruleSet = NULL;
|
||||
this->ruleSet = _ruleSet;
|
||||
this->numberFormat = NULL;
|
||||
}
|
||||
// and of the description is none of these things, it's a syntax error
|
||||
else {
|
||||
// throw new IllegalArgumentException("Illegal substitution syntax");
|
||||
status = U_PARSE_ERROR;
|
||||
}
|
||||
}
|
||||
|
||||
NFSubstitution::~NFSubstitution()
|
||||
|
|
@ -207,9 +208,9 @@ NFSubstitution::setDivisor(int32_t /*radix*/, int32_t /*exponent*/) {
|
|||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
// boilerplate
|
||||
//-----------------------------------------------------------------------
|
||||
//-----------------------------------------------------------------------
|
||||
// boilerplate
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
const char NFSubstitution::fgClassID = 0;
|
||||
|
||||
|
|
@ -281,25 +282,25 @@ NFSubstitution::toString(UnicodeString& text) const
|
|||
void
|
||||
NFSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos) const
|
||||
{
|
||||
if (ruleSet != NULL) {
|
||||
// perform a transformation on the number that is dependent
|
||||
// on the type of substitution this is, then just call its
|
||||
// rule set's format() method to format the result
|
||||
ruleSet->format(transformNumber(number), toInsertInto, _pos + this->pos);
|
||||
} else {
|
||||
// or perform the transformation on the number (preserving
|
||||
// the result's fractional part if the formatter it set
|
||||
// to show it), then use that formatter's format() method
|
||||
// to format the result
|
||||
double numberToFormat = transformNumber((double)number);
|
||||
if (numberFormat->getMaximumFractionDigits() == 0) {
|
||||
numberToFormat = uprv_floor(numberToFormat);
|
||||
}
|
||||
if (ruleSet != NULL) {
|
||||
// perform a transformation on the number that is dependent
|
||||
// on the type of substitution this is, then just call its
|
||||
// rule set's format() method to format the result
|
||||
ruleSet->format(transformNumber(number), toInsertInto, _pos + this->pos);
|
||||
} else {
|
||||
// or perform the transformation on the number (preserving
|
||||
// the result's fractional part if the formatter it set
|
||||
// to show it), then use that formatter's format() method
|
||||
// to format the result
|
||||
double numberToFormat = transformNumber((double)number);
|
||||
if (numberFormat->getMaximumFractionDigits() == 0) {
|
||||
numberToFormat = uprv_floor(numberToFormat);
|
||||
}
|
||||
|
||||
UnicodeString temp;
|
||||
numberFormat->format(numberToFormat, temp);
|
||||
toInsertInto.insert(_pos + this->pos, temp);
|
||||
}
|
||||
UnicodeString temp;
|
||||
numberFormat->format(numberToFormat, temp);
|
||||
toInsertInto.insert(_pos + this->pos, temp);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -314,27 +315,27 @@ NFSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int3
|
|||
*/
|
||||
void
|
||||
NFSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos) const {
|
||||
// perform a transformation on the number being formatted that
|
||||
// is dependent on the type of substitution this is
|
||||
double numberToFormat = transformNumber(number);
|
||||
// perform a transformation on the number being formatted that
|
||||
// is dependent on the type of substitution this is
|
||||
double numberToFormat = transformNumber(number);
|
||||
|
||||
// if the result is an integer, from here on out we work in integer
|
||||
// space (saving time and memory and preserving accuracy)
|
||||
if (numberToFormat == uprv_floor(numberToFormat) && ruleSet != NULL) {
|
||||
ruleSet->format(util64_fromDouble(numberToFormat), toInsertInto, _pos + this->pos);
|
||||
// if the result is an integer, from here on out we work in integer
|
||||
// space (saving time and memory and preserving accuracy)
|
||||
if (numberToFormat == uprv_floor(numberToFormat) && ruleSet != NULL) {
|
||||
ruleSet->format(util64_fromDouble(numberToFormat), toInsertInto, _pos + this->pos);
|
||||
|
||||
// if the result isn't an integer, then call either our rule set's
|
||||
// format() method or our DecimalFormat's format() method to
|
||||
// format the result
|
||||
} else {
|
||||
if (ruleSet != NULL) {
|
||||
ruleSet->format(numberToFormat, toInsertInto, _pos + this->pos);
|
||||
// if the result isn't an integer, then call either our rule set's
|
||||
// format() method or our DecimalFormat's format() method to
|
||||
// format the result
|
||||
} else {
|
||||
UnicodeString temp;
|
||||
numberFormat->format(numberToFormat, temp);
|
||||
toInsertInto.insert(_pos + this->pos, temp);
|
||||
if (ruleSet != NULL) {
|
||||
ruleSet->format(numberToFormat, toInsertInto, _pos + this->pos);
|
||||
} else {
|
||||
UnicodeString temp;
|
||||
numberFormat->format(numberToFormat, temp);
|
||||
toInsertInto.insert(_pos + this->pos, temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -384,77 +385,77 @@ NFSubstitution::doParse(const UnicodeString& text,
|
|||
Formattable& result) const
|
||||
{
|
||||
#ifdef RBNF_DEBUG
|
||||
fprintf(stderr, "<nfsubs> %x bv: %g ub: %g\n", this, baseValue, upperBound);
|
||||
fprintf(stderr, "<nfsubs> %x bv: %g ub: %g\n", this, baseValue, upperBound);
|
||||
#endif
|
||||
// figure out the highest base value a rule can have and match
|
||||
// the text being parsed (this varies according to the type of
|
||||
// substitutions: multiplier, modulus, and numerator substitutions
|
||||
// restrict the search to rules with base values lower than their
|
||||
// own; same-value substitutions leave the upper bound wherever
|
||||
// it was, and the others allow any rule to match
|
||||
upperBound = calcUpperBound(upperBound);
|
||||
// figure out the highest base value a rule can have and match
|
||||
// the text being parsed (this varies according to the type of
|
||||
// substitutions: multiplier, modulus, and numerator substitutions
|
||||
// restrict the search to rules with base values lower than their
|
||||
// own; same-value substitutions leave the upper bound wherever
|
||||
// it was, and the others allow any rule to match
|
||||
upperBound = calcUpperBound(upperBound);
|
||||
|
||||
// use our rule set to parse the text. If that fails and
|
||||
// lenient parsing is enabled (this is always false if the
|
||||
// formatter's lenient-parsing mode is off, but it may also
|
||||
// be false even when the formatter's lenient-parse mode is
|
||||
// on), then also try parsing the text using a default-
|
||||
// constructed NumberFormat
|
||||
if (ruleSet != NULL) {
|
||||
ruleSet->parse(text, parsePosition, upperBound, result);
|
||||
if (lenientParse && !ruleSet->isFractionRuleSet() && parsePosition.getIndex() == 0) {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
NumberFormat* fmt = NumberFormat::createInstance(status);
|
||||
if (U_SUCCESS(status)) {
|
||||
fmt->parse(text, result, parsePosition);
|
||||
}
|
||||
delete fmt;
|
||||
// use our rule set to parse the text. If that fails and
|
||||
// lenient parsing is enabled (this is always false if the
|
||||
// formatter's lenient-parsing mode is off, but it may also
|
||||
// be false even when the formatter's lenient-parse mode is
|
||||
// on), then also try parsing the text using a default-
|
||||
// constructed NumberFormat
|
||||
if (ruleSet != NULL) {
|
||||
ruleSet->parse(text, parsePosition, upperBound, result);
|
||||
if (lenientParse && !ruleSet->isFractionRuleSet() && parsePosition.getIndex() == 0) {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
NumberFormat* fmt = NumberFormat::createInstance(status);
|
||||
if (U_SUCCESS(status)) {
|
||||
fmt->parse(text, result, parsePosition);
|
||||
}
|
||||
delete fmt;
|
||||
}
|
||||
|
||||
// ...or use our DecimalFormat to parse the text
|
||||
} else {
|
||||
numberFormat->parse(text, result, parsePosition);
|
||||
}
|
||||
|
||||
// ...or use our DecimalFormat to parse the text
|
||||
} else {
|
||||
numberFormat->parse(text, result, parsePosition);
|
||||
}
|
||||
// if the parse was successful, we've already advanced the caller's
|
||||
// parse position (this is the one function that doesn't have one
|
||||
// of its own). Derive a parse result and return it as a Long,
|
||||
// if possible, or a Double
|
||||
if (parsePosition.getIndex() != 0) {
|
||||
double tempResult = (result.getType() == Formattable::kLong) ?
|
||||
(double)result.getLong() :
|
||||
result.getDouble();
|
||||
|
||||
// if the parse was successful, we've already advanced the caller's
|
||||
// parse position (this is the one function that doesn't have one
|
||||
// of its own). Derive a parse result and return it as a Long,
|
||||
// if possible, or a Double
|
||||
if (parsePosition.getIndex() != 0) {
|
||||
double tempResult = (result.getType() == Formattable::kLong) ?
|
||||
(double)result.getLong() :
|
||||
result.getDouble();
|
||||
|
||||
// composeRuleValue() produces a full parse result from
|
||||
// the partial parse result passed to this function from
|
||||
// the caller (this is either the owning rule's base value
|
||||
// or the partial result obtained from composing the
|
||||
// owning rule's base value with its other substitution's
|
||||
// parse result) and the partial parse result obtained by
|
||||
// matching the substitution (which will be the same value
|
||||
// the caller would get by parsing just this part of the
|
||||
// text with RuleBasedNumberFormat.parse() ). How the two
|
||||
// values are used to derive the full parse result depends
|
||||
// on the types of substitutions: For a regular rule, the
|
||||
// ultimate result is its multiplier substitution's result
|
||||
// times the rule's divisor (or the rule's base value) plus
|
||||
// the modulus substitution's result (which will actually
|
||||
// supersede part of the rule's base value). For a negative-
|
||||
// number rule, the result is the negative of its substitution's
|
||||
// result. For a fraction rule, it's the sum of its two
|
||||
// substitution results. For a rule in a fraction rule set,
|
||||
// it's the numerator substitution's result divided by
|
||||
// the rule's base value. Results from same-value substitutions
|
||||
// propagate back upard, and null substitutions don't affect
|
||||
// the result.
|
||||
tempResult = composeRuleValue(tempResult, baseValue);
|
||||
result.setDouble(tempResult);
|
||||
return TRUE;
|
||||
// if the parse was UNsuccessful, return 0
|
||||
} else {
|
||||
result.setLong(0);
|
||||
return FALSE;
|
||||
}
|
||||
// composeRuleValue() produces a full parse result from
|
||||
// the partial parse result passed to this function from
|
||||
// the caller (this is either the owning rule's base value
|
||||
// or the partial result obtained from composing the
|
||||
// owning rule's base value with its other substitution's
|
||||
// parse result) and the partial parse result obtained by
|
||||
// matching the substitution (which will be the same value
|
||||
// the caller would get by parsing just this part of the
|
||||
// text with RuleBasedNumberFormat.parse() ). How the two
|
||||
// values are used to derive the full parse result depends
|
||||
// on the types of substitutions: For a regular rule, the
|
||||
// ultimate result is its multiplier substitution's result
|
||||
// times the rule's divisor (or the rule's base value) plus
|
||||
// the modulus substitution's result (which will actually
|
||||
// supersede part of the rule's base value). For a negative-
|
||||
// number rule, the result is the negative of its substitution's
|
||||
// result. For a fraction rule, it's the sum of its two
|
||||
// substitution results. For a rule in a fraction rule set,
|
||||
// it's the numerator substitution's result divided by
|
||||
// the rule's base value. Results from same-value substitutions
|
||||
// propagate back upard, and null substitutions don't affect
|
||||
// the result.
|
||||
tempResult = composeRuleValue(tempResult, baseValue);
|
||||
result.setDouble(tempResult);
|
||||
return TRUE;
|
||||
// if the parse was UNsuccessful, return 0
|
||||
} else {
|
||||
result.setLong(0);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
UBool
|
||||
|
|
@ -586,18 +587,18 @@ UBool ModulusSubstitution::operator==(const NFSubstitution& rhs) const
|
|||
void
|
||||
ModulusSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto, int32_t _pos) const
|
||||
{
|
||||
// if this isn't a >>> substitution, just use the inherited version
|
||||
// of this function (which uses either a rule set or a DecimalFormat
|
||||
// to format its substitution value)
|
||||
if (ruleToUse == NULL) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
// if this isn't a >>> substitution, just use the inherited version
|
||||
// of this function (which uses either a rule set or a DecimalFormat
|
||||
// to format its substitution value)
|
||||
if (ruleToUse == NULL) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
|
||||
// a >>> substitution goes straight to a particular rule to
|
||||
// format the substitution value
|
||||
} else {
|
||||
int64_t numberToFormat = transformNumber(number);
|
||||
ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos());
|
||||
}
|
||||
// a >>> substitution goes straight to a particular rule to
|
||||
// format the substitution value
|
||||
} else {
|
||||
int64_t numberToFormat = transformNumber(number);
|
||||
ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -611,19 +612,19 @@ ModulusSubstitution::doSubstitution(int64_t number, UnicodeString& toInsertInto,
|
|||
void
|
||||
ModulusSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos) const
|
||||
{
|
||||
// if this isn't a >>> substitution, just use the inherited version
|
||||
// of this function (which uses either a rule set or a DecimalFormat
|
||||
// to format its substitution value)
|
||||
if (ruleToUse == NULL) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
// if this isn't a >>> substitution, just use the inherited version
|
||||
// of this function (which uses either a rule set or a DecimalFormat
|
||||
// to format its substitution value)
|
||||
if (ruleToUse == NULL) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
|
||||
// a >>> substitution goes straight to a particular rule to
|
||||
// format the substitution value
|
||||
} else {
|
||||
double numberToFormat = transformNumber(number);
|
||||
// a >>> substitution goes straight to a particular rule to
|
||||
// format the substitution value
|
||||
} else {
|
||||
double numberToFormat = transformNumber(number);
|
||||
|
||||
ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos());
|
||||
}
|
||||
ruleToUse->doFormat(numberToFormat, toInsertInto, _pos + getPos());
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
|
@ -647,25 +648,25 @@ ModulusSubstitution::doParse(const UnicodeString& text,
|
|||
UBool lenientParse,
|
||||
Formattable& result) const
|
||||
{
|
||||
// if this isn't a >>> substitution, we can just use the
|
||||
// inherited parse() routine to do the parsing
|
||||
if (ruleToUse == NULL) {
|
||||
return NFSubstitution::doParse(text, parsePosition, baseValue, upperBound, lenientParse, result);
|
||||
// if this isn't a >>> substitution, we can just use the
|
||||
// inherited parse() routine to do the parsing
|
||||
if (ruleToUse == NULL) {
|
||||
return NFSubstitution::doParse(text, parsePosition, baseValue, upperBound, lenientParse, result);
|
||||
|
||||
// but if it IS a >>> substitution, we have to do it here: we
|
||||
// use the specific rule's doParse() method, and then we have to
|
||||
// do some of the other work of NFRuleSet.parse()
|
||||
} else {
|
||||
ruleToUse->doParse(text, parsePosition, FALSE, upperBound, result);
|
||||
// but if it IS a >>> substitution, we have to do it here: we
|
||||
// use the specific rule's doParse() method, and then we have to
|
||||
// do some of the other work of NFRuleSet.parse()
|
||||
} else {
|
||||
ruleToUse->doParse(text, parsePosition, FALSE, upperBound, result);
|
||||
|
||||
if (parsePosition.getIndex() != 0) {
|
||||
double tempResult = result.getDouble();
|
||||
tempResult = composeRuleValue(tempResult, baseValue);
|
||||
result.setDouble(tempResult);
|
||||
if (parsePosition.getIndex() != 0) {
|
||||
double tempResult = result.getDouble();
|
||||
tempResult = composeRuleValue(tempResult, baseValue);
|
||||
result.setDouble(tempResult);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -677,7 +678,7 @@ const char IntegralPartSubstitution::fgClassID = 0;
|
|||
|
||||
UClassID
|
||||
IntegralPartSubstitution::getDynamicClassID() const {
|
||||
return getStaticClassID();
|
||||
return getStaticClassID();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -732,35 +733,35 @@ FractionalPartSubstitution::FractionalPartSubstitution(int32_t _pos,
|
|||
void
|
||||
FractionalPartSubstitution::doSubstitution(double number, UnicodeString& toInsertInto, int32_t _pos) const
|
||||
{
|
||||
// if we're not in "byDigits" mode, just use the inherited
|
||||
// doSubstitution() routine
|
||||
if (!byDigits) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
// if we're not in "byDigits" mode, just use the inherited
|
||||
// doSubstitution() routine
|
||||
if (!byDigits) {
|
||||
NFSubstitution::doSubstitution(number, toInsertInto, _pos);
|
||||
|
||||
// if we're in "byDigits" mode, transform the value into an integer
|
||||
// by moving the decimal point eight places to the right and
|
||||
// pulling digits off the right one at a time, formatting each digit
|
||||
// as an integer using this substitution's owning rule set
|
||||
// (this is slower, but more accurate, than doing it from the
|
||||
// other end)
|
||||
} else {
|
||||
int32_t numberToFormat = (int32_t)uprv_round(transformNumber(number) * uprv_pow(10, kMaxDecimalDigits));
|
||||
// this flag keeps us from formatting trailing zeros. It starts
|
||||
// out false because we're pulling from the right, and switches
|
||||
// to true the first time we encounter a non-zero digit
|
||||
UBool doZeros = FALSE;
|
||||
for (int32_t i = 0; i < kMaxDecimalDigits; i++) {
|
||||
int64_t digit = numberToFormat % 10;
|
||||
if (digit != 0 || doZeros) {
|
||||
if (doZeros && useSpaces) {
|
||||
toInsertInto.insert(_pos + getPos(), gSpace);
|
||||
}
|
||||
doZeros = TRUE;
|
||||
getRuleSet()->format(digit, toInsertInto, _pos + getPos());
|
||||
}
|
||||
numberToFormat /= 10;
|
||||
// if we're in "byDigits" mode, transform the value into an integer
|
||||
// by moving the decimal point eight places to the right and
|
||||
// pulling digits off the right one at a time, formatting each digit
|
||||
// as an integer using this substitution's owning rule set
|
||||
// (this is slower, but more accurate, than doing it from the
|
||||
// other end)
|
||||
} else {
|
||||
int32_t numberToFormat = (int32_t)uprv_round(transformNumber(number) * uprv_pow(10, kMaxDecimalDigits));
|
||||
// this flag keeps us from formatting trailing zeros. It starts
|
||||
// out false because we're pulling from the right, and switches
|
||||
// to true the first time we encounter a non-zero digit
|
||||
UBool doZeros = FALSE;
|
||||
for (int32_t i = 0; i < kMaxDecimalDigits; i++) {
|
||||
int64_t digit = numberToFormat % 10;
|
||||
if (digit != 0 || doZeros) {
|
||||
if (doZeros && useSpaces) {
|
||||
toInsertInto.insert(_pos + getPos(), gSpace);
|
||||
}
|
||||
doZeros = TRUE;
|
||||
getRuleSet()->format(digit, toInsertInto, _pos + getPos());
|
||||
}
|
||||
numberToFormat /= 10;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
|
@ -792,63 +793,63 @@ FractionalPartSubstitution::doParse(const UnicodeString& text,
|
|||
UBool lenientParse,
|
||||
Formattable& resVal) const
|
||||
{
|
||||
// if we're not in byDigits mode, we can just use the inherited
|
||||
// doParse()
|
||||
if (!byDigits) {
|
||||
return NFSubstitution::doParse(text, parsePosition, baseValue, 0, lenientParse, resVal);
|
||||
// if we're not in byDigits mode, we can just use the inherited
|
||||
// doParse()
|
||||
if (!byDigits) {
|
||||
return NFSubstitution::doParse(text, parsePosition, baseValue, 0, lenientParse, resVal);
|
||||
|
||||
// if we ARE in byDigits mode, parse the text one digit at a time
|
||||
// using this substitution's owning rule set (we do this by setting
|
||||
// upperBound to 10 when calling doParse() ) until we reach
|
||||
// nonmatching text
|
||||
} else {
|
||||
UnicodeString workText(text);
|
||||
ParsePosition workPos(1);
|
||||
double result = 0;
|
||||
int32_t digit;
|
||||
double p10 = 0.1;
|
||||
// if we ARE in byDigits mode, parse the text one digit at a time
|
||||
// using this substitution's owning rule set (we do this by setting
|
||||
// upperBound to 10 when calling doParse() ) until we reach
|
||||
// nonmatching text
|
||||
} else {
|
||||
UnicodeString workText(text);
|
||||
ParsePosition workPos(1);
|
||||
double result = 0;
|
||||
int32_t digit;
|
||||
double p10 = 0.1;
|
||||
|
||||
NumberFormat* fmt = NULL;
|
||||
while (workText.length() > 0 && workPos.getIndex() != 0) {
|
||||
workPos.setIndex(0);
|
||||
Formattable temp;
|
||||
getRuleSet()->parse(workText, workPos, 10, temp);
|
||||
digit = temp.getType() == Formattable::kLong ?
|
||||
temp.getLong() :
|
||||
(int32_t)temp.getDouble();
|
||||
NumberFormat* fmt = NULL;
|
||||
while (workText.length() > 0 && workPos.getIndex() != 0) {
|
||||
workPos.setIndex(0);
|
||||
Formattable temp;
|
||||
getRuleSet()->parse(workText, workPos, 10, temp);
|
||||
digit = temp.getType() == Formattable::kLong ?
|
||||
temp.getLong() :
|
||||
(int32_t)temp.getDouble();
|
||||
|
||||
if (lenientParse && workPos.getIndex() == 0) {
|
||||
if (!fmt) {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
fmt = NumberFormat::createInstance(status);
|
||||
if (U_FAILURE(status)) {
|
||||
delete fmt;
|
||||
fmt = NULL;
|
||||
}
|
||||
}
|
||||
if (fmt) {
|
||||
fmt->parse(workText, temp, workPos);
|
||||
digit = temp.getLong();
|
||||
}
|
||||
}
|
||||
if (lenientParse && workPos.getIndex() == 0) {
|
||||
if (!fmt) {
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
fmt = NumberFormat::createInstance(status);
|
||||
if (U_FAILURE(status)) {
|
||||
delete fmt;
|
||||
fmt = NULL;
|
||||
}
|
||||
}
|
||||
if (fmt) {
|
||||
fmt->parse(workText, temp, workPos);
|
||||
digit = temp.getLong();
|
||||
}
|
||||
}
|
||||
|
||||
if (workPos.getIndex() != 0) {
|
||||
result += digit * p10;
|
||||
p10 /= 10;
|
||||
parsePosition.setIndex(parsePosition.getIndex() + workPos.getIndex());
|
||||
workText.removeBetween(0, workPos.getIndex());
|
||||
while (workText.length() > 0 && workText.charAt(0) == gSpace) {
|
||||
workText.removeBetween(0, 1);
|
||||
parsePosition.setIndex(parsePosition.getIndex() + 1);
|
||||
}
|
||||
}
|
||||
if (workPos.getIndex() != 0) {
|
||||
result += digit * p10;
|
||||
p10 /= 10;
|
||||
parsePosition.setIndex(parsePosition.getIndex() + workPos.getIndex());
|
||||
workText.removeBetween(0, workPos.getIndex());
|
||||
while (workText.length() > 0 && workText.charAt(0) == gSpace) {
|
||||
workText.removeBetween(0, 1);
|
||||
parsePosition.setIndex(parsePosition.getIndex() + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
delete fmt;
|
||||
|
||||
result = composeRuleValue(result, baseValue);
|
||||
resVal.setDouble(result);
|
||||
return TRUE;
|
||||
}
|
||||
delete fmt;
|
||||
|
||||
result = composeRuleValue(result, baseValue);
|
||||
resVal.setDouble(result);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
UBool
|
||||
|
|
|
|||
|
|
@ -249,320 +249,320 @@ void NormalizationTransliterator::initStatics() {
|
|||
UErrorCode ec = U_ZERO_ERROR;
|
||||
|
||||
SKIPPABLES[D].applyPattern(UnicodeString(
|
||||
"[^\\u00C0-\\u00C5\\u00C7-\\u00CF\\u00D1-\\u00D6\\u00D9-\\u00DD\\u00E0-"
|
||||
"\\u00E5\\u00E7-\\u00EF\\u00F1-\\u00F6\\u00F9-\\u00FD\\u00FF-\\u010F\\u0112"
|
||||
"-\\u0125\\u0128-\\u0130\\u0134-\\u0137\\u0139-\\u013E\\u0143-\\u0148"
|
||||
"\\u014C-\\u0151\\u0154-\\u0165\\u0168-\\u017E\\u01A0-\\u01A1\\u01AF-"
|
||||
"\\u01B0\\u01CD-\\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F0\\u01F4-\\u01F5\\u01F8"
|
||||
"-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0300-\\u034E\\u0360-\\u0362"
|
||||
"\\u0374\\u037E\\u0385-\\u038A\\u038C\\u038E-\\u0390\\u03AA-\\u03B0\\u03CA-"
|
||||
"\\u03CE\\u03D3-\\u03D4\\u0400-\\u0401\\u0403\\u0407\\u040C-\\u040E\\u0419"
|
||||
"\\u0439\\u0450-\\u0451\\u0453\\u0457\\u045C-\\u045E\\u0476-\\u0477\\u0483-"
|
||||
"\\u0486\\u04C1-\\u04C2\\u04D0-\\u04D3\\u04D6-\\u04D7\\u04DA-\\u04DF\\u04E2"
|
||||
"-\\u04E7\\u04EA-\\u04F5\\u04F8-\\u04F9\\u0591-\\u05A1\\u05A3-\\u05B9"
|
||||
"\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0626\\u064B-\\u0655"
|
||||
"\\u0670\\u06C0\\u06C2\\u06D3\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8"
|
||||
"\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0929\\u0931\\u0934\\u093C\\u094D"
|
||||
"\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09CB-\\u09CD\\u09DC-\\u09DD\\u09DF"
|
||||
"\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC\\u0ACD\\u0B3C"
|
||||
"\\u0B48\\u0B4B-\\u0B4D\\u0B5C-\\u0B5D\\u0B94\\u0BCA-\\u0BCD\\u0C48\\u0C4D"
|
||||
"\\u0C55-\\u0C56\\u0CC0\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB\\u0CCD\\u0D4A-\\u0D4D"
|
||||
"\\u0DCA\\u0DDA\\u0DDC-\\u0DDE\\u0E38-\\u0E3A\\u0E48-\\u0E4B\\u0EB8-\\u0EB9"
|
||||
"\\u0EC8-\\u0ECB\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52"
|
||||
"\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F76\\u0F78\\u0F7A-\\u0F7D\\u0F80-\\u0F84"
|
||||
"\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9\\u0FC6\\u1026"
|
||||
"\\u1037\\u1039\\u17D2\\u18A9\\u1E00-\\u1E99\\u1E9B\\u1EA0-\\u1EF9\\u1F00-"
|
||||
"\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59"
|
||||
"\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC1-"
|
||||
"\\u1FC4\\u1FC6-\\u1FD3\\u1FD6-\\u1FDB\\u1FDD-\\u1FEF\\u1FF2-\\u1FF4\\u1FF6"
|
||||
"-\\u1FFD\\u2000-\\u2001\\u20D0-\\u20DC\\u20E1\\u2126\\u212A-\\u212B\\u219A"
|
||||
"-\\u219B\\u21AE\\u21CD-\\u21CF\\u2204\\u2209\\u220C\\u2224\\u2226\\u2241"
|
||||
"\\u2244\\u2247\\u2249\\u2260\\u2262\\u226D-\\u2271\\u2274-\\u2275\\u2278-"
|
||||
"\\u2279\\u2280-\\u2281\\u2284-\\u2285\\u2288-\\u2289\\u22AC-\\u22AF\\u22E0"
|
||||
"-\\u22E3\\u22EA-\\u22ED\\u2329-\\u232A\\u302A-\\u302F\\u304C\\u304E\\u3050"
|
||||
"\\u3052\\u3054\\u3056\\u3058\\u305A\\u305C\\u305E\\u3060\\u3062\\u3065"
|
||||
"\\u3067\\u3069\\u3070-\\u3071\\u3073-\\u3074\\u3076-\\u3077\\u3079-\\u307A"
|
||||
"\\u307C-\\u307D\\u3094\\u3099-\\u309A\\u309E\\u30AC\\u30AE\\u30B0\\u30B2"
|
||||
"\\u30B4\\u30B6\\u30B8\\u30BA\\u30BC\\u30BE\\u30C0\\u30C2\\u30C5\\u30C7"
|
||||
"\\u30C9\\u30D0-\\u30D1\\u30D3-\\u30D4\\u30D6-\\u30D7\\u30D9-\\u30DA\\u30DC"
|
||||
"-\\u30DD\\u30F4\\u30F7-\\u30FA\\u30FE\\uAC00-\\uD7A3\\uF900-\\uFA0D\\uFA10"
|
||||
"\\uFA12\\uFA15-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB1D-"
|
||||
"\\uFB1F\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44"
|
||||
"\\uFB46-\\uFB4E\\uFE20-\\uFE23\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001"
|
||||
"D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D"
|
||||
"1AD\\U0001D1BB-\\U0001D1C0\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
"[^\\u00C0-\\u00C5\\u00C7-\\u00CF\\u00D1-\\u00D6\\u00D9-\\u00DD\\u00E0-"
|
||||
"\\u00E5\\u00E7-\\u00EF\\u00F1-\\u00F6\\u00F9-\\u00FD\\u00FF-\\u010F\\u0112"
|
||||
"-\\u0125\\u0128-\\u0130\\u0134-\\u0137\\u0139-\\u013E\\u0143-\\u0148"
|
||||
"\\u014C-\\u0151\\u0154-\\u0165\\u0168-\\u017E\\u01A0-\\u01A1\\u01AF-"
|
||||
"\\u01B0\\u01CD-\\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F0\\u01F4-\\u01F5\\u01F8"
|
||||
"-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0300-\\u034E\\u0360-\\u0362"
|
||||
"\\u0374\\u037E\\u0385-\\u038A\\u038C\\u038E-\\u0390\\u03AA-\\u03B0\\u03CA-"
|
||||
"\\u03CE\\u03D3-\\u03D4\\u0400-\\u0401\\u0403\\u0407\\u040C-\\u040E\\u0419"
|
||||
"\\u0439\\u0450-\\u0451\\u0453\\u0457\\u045C-\\u045E\\u0476-\\u0477\\u0483-"
|
||||
"\\u0486\\u04C1-\\u04C2\\u04D0-\\u04D3\\u04D6-\\u04D7\\u04DA-\\u04DF\\u04E2"
|
||||
"-\\u04E7\\u04EA-\\u04F5\\u04F8-\\u04F9\\u0591-\\u05A1\\u05A3-\\u05B9"
|
||||
"\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0626\\u064B-\\u0655"
|
||||
"\\u0670\\u06C0\\u06C2\\u06D3\\u06D6-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8"
|
||||
"\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0929\\u0931\\u0934\\u093C\\u094D"
|
||||
"\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09CB-\\u09CD\\u09DC-\\u09DD\\u09DF"
|
||||
"\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC\\u0ACD\\u0B3C"
|
||||
"\\u0B48\\u0B4B-\\u0B4D\\u0B5C-\\u0B5D\\u0B94\\u0BCA-\\u0BCD\\u0C48\\u0C4D"
|
||||
"\\u0C55-\\u0C56\\u0CC0\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB\\u0CCD\\u0D4A-\\u0D4D"
|
||||
"\\u0DCA\\u0DDA\\u0DDC-\\u0DDE\\u0E38-\\u0E3A\\u0E48-\\u0E4B\\u0EB8-\\u0EB9"
|
||||
"\\u0EC8-\\u0ECB\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52"
|
||||
"\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F76\\u0F78\\u0F7A-\\u0F7D\\u0F80-\\u0F84"
|
||||
"\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9\\u0FC6\\u1026"
|
||||
"\\u1037\\u1039\\u17D2\\u18A9\\u1E00-\\u1E99\\u1E9B\\u1EA0-\\u1EF9\\u1F00-"
|
||||
"\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48-\\u1F4D\\u1F50-\\u1F57\\u1F59"
|
||||
"\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4\\u1FB6-\\u1FBC\\u1FBE\\u1FC1-"
|
||||
"\\u1FC4\\u1FC6-\\u1FD3\\u1FD6-\\u1FDB\\u1FDD-\\u1FEF\\u1FF2-\\u1FF4\\u1FF6"
|
||||
"-\\u1FFD\\u2000-\\u2001\\u20D0-\\u20DC\\u20E1\\u2126\\u212A-\\u212B\\u219A"
|
||||
"-\\u219B\\u21AE\\u21CD-\\u21CF\\u2204\\u2209\\u220C\\u2224\\u2226\\u2241"
|
||||
"\\u2244\\u2247\\u2249\\u2260\\u2262\\u226D-\\u2271\\u2274-\\u2275\\u2278-"
|
||||
"\\u2279\\u2280-\\u2281\\u2284-\\u2285\\u2288-\\u2289\\u22AC-\\u22AF\\u22E0"
|
||||
"-\\u22E3\\u22EA-\\u22ED\\u2329-\\u232A\\u302A-\\u302F\\u304C\\u304E\\u3050"
|
||||
"\\u3052\\u3054\\u3056\\u3058\\u305A\\u305C\\u305E\\u3060\\u3062\\u3065"
|
||||
"\\u3067\\u3069\\u3070-\\u3071\\u3073-\\u3074\\u3076-\\u3077\\u3079-\\u307A"
|
||||
"\\u307C-\\u307D\\u3094\\u3099-\\u309A\\u309E\\u30AC\\u30AE\\u30B0\\u30B2"
|
||||
"\\u30B4\\u30B6\\u30B8\\u30BA\\u30BC\\u30BE\\u30C0\\u30C2\\u30C5\\u30C7"
|
||||
"\\u30C9\\u30D0-\\u30D1\\u30D3-\\u30D4\\u30D6-\\u30D7\\u30D9-\\u30DA\\u30DC"
|
||||
"-\\u30DD\\u30F4\\u30F7-\\u30FA\\u30FE\\uAC00-\\uD7A3\\uF900-\\uFA0D\\uFA10"
|
||||
"\\uFA12\\uFA15-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB1D-"
|
||||
"\\uFB1F\\uFB2A-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44"
|
||||
"\\uFB46-\\uFB4E\\uFE20-\\uFE23\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001"
|
||||
"D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D"
|
||||
"1AD\\U0001D1BB-\\U0001D1C0\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
|
||||
SKIPPABLES[C].applyPattern(UnicodeString(
|
||||
"[^<->A-PR-Za-pr-z\\u00A8\\u00C0-\\u00CF\\u00D1-\\u00D6\\u00D8-\\u00DD"
|
||||
"\\u00E0-\\u00EF\\u00F1-\\u00F6\\u00F8-\\u00FD\\u00FF-\\u0103\\u0106-"
|
||||
"\\u010F\\u0112-\\u0117\\u011A-\\u0121\\u0124-\\u0125\\u0128-\\u012D\\u0130"
|
||||
"\\u0139-\\u013A\\u013D-\\u013E\\u0143-\\u0144\\u0147-\\u0148\\u014C-"
|
||||
"\\u0151\\u0154-\\u0155\\u0158-\\u015D\\u0160-\\u0161\\u0164-\\u0165\\u0168"
|
||||
"-\\u0171\\u0174-\\u017F\\u01A0-\\u01A1\\u01AF-\\u01B0\\u01B7\\u01CD-"
|
||||
"\\u01DC\\u01DE-\\u01E1\\u01E6-\\u01EB\\u01F4-\\u01F5\\u01F8-\\u01FB\\u0200"
|
||||
"-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0292\\u0300-\\u034E\\u0360-"
|
||||
"\\u0362\\u0374\\u037E\\u0387\\u0391\\u0395\\u0397\\u0399\\u039F\\u03A1"
|
||||
"\\u03A5\\u03A9\\u03AC\\u03AE\\u03B1\\u03B5\\u03B7\\u03B9\\u03BF\\u03C1"
|
||||
"\\u03C5\\u03C9-\\u03CB\\u03CE\\u03D2\\u0406\\u0410\\u0413\\u0415-\\u0418"
|
||||
"\\u041A\\u041E\\u0423\\u0427\\u042B\\u042D\\u0430\\u0433\\u0435-\\u0438"
|
||||
"\\u043A\\u043E\\u0443\\u0447\\u044B\\u044D\\u0456\\u0474-\\u0475\\u0483-"
|
||||
"\\u0486\\u04D8-\\u04D9\\u04E8-\\u04E9\\u0591-\\u05A1\\u05A3-\\u05B9\\u05BB"
|
||||
"-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0623\\u0627\\u0648\\u064A-"
|
||||
"\\u0655\\u0670\\u06C1\\u06D2\\u06D5-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8"
|
||||
"\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0928\\u0930\\u0933\\u093C\\u094D"
|
||||
"\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09BE\\u09C7\\u09CD\\u09D7\\u09DC-"
|
||||
"\\u09DD\\u09DF\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC"
|
||||
"\\u0ACD\\u0B3C\\u0B3E\\u0B47\\u0B4D\\u0B56-\\u0B57\\u0B5C-\\u0B5D\\u0B92"
|
||||
"\\u0BBE\\u0BC6-\\u0BC7\\u0BCD\\u0BD7\\u0C46\\u0C4D\\u0C55-\\u0C56\\u0CBF"
|
||||
"\\u0CC2\\u0CC6\\u0CCA\\u0CCD\\u0CD5-\\u0CD6\\u0D3E\\u0D46-\\u0D47\\u0D4D"
|
||||
"\\u0D57\\u0DCA\\u0DCF\\u0DD9\\u0DDC\\u0DDF\\u0E38-\\u0E3A\\u0E48-\\u0E4B"
|
||||
"\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43"
|
||||
"\\u0F4D\\u0F52\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F76\\u0F78\\u0F7A-\\u0F7D"
|
||||
"\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9"
|
||||
"\\u0FC6\\u1025\\u102E\\u1037\\u1039\\u1100-\\u1112\\u1161-\\u1175\\u11A8-"
|
||||
"\\u11C2\\u17D2\\u18A9\\u1E00-\\u1E03\\u1E0A-\\u1E0F\\u1E12-\\u1E1B\\u1E20-"
|
||||
"\\u1E27\\u1E2A-\\u1E41\\u1E44-\\u1E53\\u1E58-\\u1E7D\\u1E80-\\u1E87\\u1E8E"
|
||||
"-\\u1E91\\u1E96-\\u1E99\\u1EA0-\\u1EF3\\u1EF6-\\u1EF9\\u1F00-\\u1F11"
|
||||
"\\u1F18-\\u1F19\\u1F20-\\u1F31\\u1F38-\\u1F39\\u1F40-\\u1F41\\u1F48-"
|
||||
"\\u1F49\\u1F50-\\u1F51\\u1F59\\u1F60-\\u1F71\\u1F73-\\u1F75\\u1F77\\u1F79"
|
||||
"\\u1F7B-\\u1F7D\\u1F80-\\u1F81\\u1F88-\\u1F89\\u1F90-\\u1F91\\u1F98-"
|
||||
"\\u1F99\\u1FA0-\\u1FA1\\u1FA8-\\u1FA9\\u1FB3\\u1FB6\\u1FBB-\\u1FBC\\u1FBE-"
|
||||
"\\u1FBF\\u1FC3\\u1FC6\\u1FC9\\u1FCB-\\u1FCC\\u1FD3\\u1FDB\\u1FE3\\u1FEB"
|
||||
"\\u1FEE-\\u1FEF\\u1FF3\\u1FF6\\u1FF9\\u1FFB-\\u1FFE\\u2000-\\u2001\\u20D0-"
|
||||
"\\u20DC\\u20E1\\u2126\\u212A-\\u212B\\u2190\\u2192\\u2194\\u21D0\\u21D2"
|
||||
"\\u21D4\\u2203\\u2208\\u220B\\u2223\\u2225\\u223C\\u2243\\u2245\\u2248"
|
||||
"\\u224D\\u2261\\u2264-\\u2265\\u2272-\\u2273\\u2276-\\u2277\\u227A-\\u227D"
|
||||
"\\u2282-\\u2283\\u2286-\\u2287\\u2291-\\u2292\\u22A2\\u22A8-\\u22A9\\u22AB"
|
||||
"\\u22B2-\\u22B5\\u2329-\\u232A\\u302A-\\u302F\\u3046\\u304B\\u304D\\u304F"
|
||||
"\\u3051\\u3053\\u3055\\u3057\\u3059\\u305B\\u305D\\u305F\\u3061\\u3064"
|
||||
"\\u3066\\u3068\\u306F\\u3072\\u3075\\u3078\\u307B\\u3099-\\u309A\\u309D"
|
||||
"\\u30A6\\u30AB\\u30AD\\u30AF\\u30B1\\u30B3\\u30B5\\u30B7\\u30B9\\u30BB"
|
||||
"\\u30BD\\u30BF\\u30C1\\u30C4\\u30C6\\u30C8\\u30CF\\u30D2\\u30D5\\u30D8"
|
||||
"\\u30DB\\u30EF-\\u30F2\\u30FD\\uAC00\\uAC1C\\uAC38\\uAC54\\uAC70\\uAC8C"
|
||||
"\\uACA8\\uACC4\\uACE0\\uACFC\\uAD18\\uAD34\\uAD50\\uAD6C\\uAD88\\uADA4"
|
||||
"\\uADC0\\uADDC\\uADF8\\uAE14\\uAE30\\uAE4C\\uAE68\\uAE84\\uAEA0\\uAEBC"
|
||||
"\\uAED8\\uAEF4\\uAF10\\uAF2C\\uAF48\\uAF64\\uAF80\\uAF9C\\uAFB8\\uAFD4"
|
||||
"\\uAFF0\\uB00C\\uB028\\uB044\\uB060\\uB07C\\uB098\\uB0B4\\uB0D0\\uB0EC"
|
||||
"\\uB108\\uB124\\uB140\\uB15C\\uB178\\uB194\\uB1B0\\uB1CC\\uB1E8\\uB204"
|
||||
"\\uB220\\uB23C\\uB258\\uB274\\uB290\\uB2AC\\uB2C8\\uB2E4\\uB300\\uB31C"
|
||||
"\\uB338\\uB354\\uB370\\uB38C\\uB3A8\\uB3C4\\uB3E0\\uB3FC\\uB418\\uB434"
|
||||
"\\uB450\\uB46C\\uB488\\uB4A4\\uB4C0\\uB4DC\\uB4F8\\uB514\\uB530\\uB54C"
|
||||
"\\uB568\\uB584\\uB5A0\\uB5BC\\uB5D8\\uB5F4\\uB610\\uB62C\\uB648\\uB664"
|
||||
"\\uB680\\uB69C\\uB6B8\\uB6D4\\uB6F0\\uB70C\\uB728\\uB744\\uB760\\uB77C"
|
||||
"\\uB798\\uB7B4\\uB7D0\\uB7EC\\uB808\\uB824\\uB840\\uB85C\\uB878\\uB894"
|
||||
"\\uB8B0\\uB8CC\\uB8E8\\uB904\\uB920\\uB93C\\uB958\\uB974\\uB990\\uB9AC"
|
||||
"\\uB9C8\\uB9E4\\uBA00\\uBA1C\\uBA38\\uBA54\\uBA70\\uBA8C\\uBAA8\\uBAC4"
|
||||
"\\uBAE0\\uBAFC\\uBB18\\uBB34\\uBB50\\uBB6C\\uBB88\\uBBA4\\uBBC0\\uBBDC"
|
||||
"\\uBBF8\\uBC14\\uBC30\\uBC4C\\uBC68\\uBC84\\uBCA0\\uBCBC\\uBCD8\\uBCF4"
|
||||
"\\uBD10\\uBD2C\\uBD48\\uBD64\\uBD80\\uBD9C\\uBDB8\\uBDD4\\uBDF0\\uBE0C"
|
||||
"\\uBE28\\uBE44\\uBE60\\uBE7C\\uBE98\\uBEB4\\uBED0\\uBEEC\\uBF08\\uBF24"
|
||||
"\\uBF40\\uBF5C\\uBF78\\uBF94\\uBFB0\\uBFCC\\uBFE8\\uC004\\uC020\\uC03C"
|
||||
"\\uC058\\uC074\\uC090\\uC0AC\\uC0C8\\uC0E4\\uC100\\uC11C\\uC138\\uC154"
|
||||
"\\uC170\\uC18C\\uC1A8\\uC1C4\\uC1E0\\uC1FC\\uC218\\uC234\\uC250\\uC26C"
|
||||
"\\uC288\\uC2A4\\uC2C0\\uC2DC\\uC2F8\\uC314\\uC330\\uC34C\\uC368\\uC384"
|
||||
"\\uC3A0\\uC3BC\\uC3D8\\uC3F4\\uC410\\uC42C\\uC448\\uC464\\uC480\\uC49C"
|
||||
"\\uC4B8\\uC4D4\\uC4F0\\uC50C\\uC528\\uC544\\uC560\\uC57C\\uC598\\uC5B4"
|
||||
"\\uC5D0\\uC5EC\\uC608\\uC624\\uC640\\uC65C\\uC678\\uC694\\uC6B0\\uC6CC"
|
||||
"\\uC6E8\\uC704\\uC720\\uC73C\\uC758\\uC774\\uC790\\uC7AC\\uC7C8\\uC7E4"
|
||||
"\\uC800\\uC81C\\uC838\\uC854\\uC870\\uC88C\\uC8A8\\uC8C4\\uC8E0\\uC8FC"
|
||||
"\\uC918\\uC934\\uC950\\uC96C\\uC988\\uC9A4\\uC9C0\\uC9DC\\uC9F8\\uCA14"
|
||||
"\\uCA30\\uCA4C\\uCA68\\uCA84\\uCAA0\\uCABC\\uCAD8\\uCAF4\\uCB10\\uCB2C"
|
||||
"\\uCB48\\uCB64\\uCB80\\uCB9C\\uCBB8\\uCBD4\\uCBF0\\uCC0C\\uCC28\\uCC44"
|
||||
"\\uCC60\\uCC7C\\uCC98\\uCCB4\\uCCD0\\uCCEC\\uCD08\\uCD24\\uCD40\\uCD5C"
|
||||
"\\uCD78\\uCD94\\uCDB0\\uCDCC\\uCDE8\\uCE04\\uCE20\\uCE3C\\uCE58\\uCE74"
|
||||
"\\uCE90\\uCEAC\\uCEC8\\uCEE4\\uCF00\\uCF1C\\uCF38\\uCF54\\uCF70\\uCF8C"
|
||||
"\\uCFA8\\uCFC4\\uCFE0\\uCFFC\\uD018\\uD034\\uD050\\uD06C\\uD088\\uD0A4"
|
||||
"\\uD0C0\\uD0DC\\uD0F8\\uD114\\uD130\\uD14C\\uD168\\uD184\\uD1A0\\uD1BC"
|
||||
"\\uD1D8\\uD1F4\\uD210\\uD22C\\uD248\\uD264\\uD280\\uD29C\\uD2B8\\uD2D4"
|
||||
"\\uD2F0\\uD30C\\uD328\\uD344\\uD360\\uD37C\\uD398\\uD3B4\\uD3D0\\uD3EC"
|
||||
"\\uD408\\uD424\\uD440\\uD45C\\uD478\\uD494\\uD4B0\\uD4CC\\uD4E8\\uD504"
|
||||
"\\uD520\\uD53C\\uD558\\uD574\\uD590\\uD5AC\\uD5C8\\uD5E4\\uD600\\uD61C"
|
||||
"\\uD638\\uD654\\uD670\\uD68C\\uD6A8\\uD6C4\\uD6E0\\uD6FC\\uD718\\uD734"
|
||||
"\\uD750\\uD76C\\uD788\\uF900-\\uFA0D\\uFA10\\uFA12\\uFA15-\\uFA1E\\uFA20"
|
||||
"\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB1D-\\uFB1F\\uFB2A-\\uFB36\\uFB38"
|
||||
"-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44\\uFB46-\\uFB4E\\uFE20-"
|
||||
"\\uFE23\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001D172\\U0001D17B-"
|
||||
"\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D1AD\\U0001D1BB-"
|
||||
"\\U0001D1C0\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
"[^<->A-PR-Za-pr-z\\u00A8\\u00C0-\\u00CF\\u00D1-\\u00D6\\u00D8-\\u00DD"
|
||||
"\\u00E0-\\u00EF\\u00F1-\\u00F6\\u00F8-\\u00FD\\u00FF-\\u0103\\u0106-"
|
||||
"\\u010F\\u0112-\\u0117\\u011A-\\u0121\\u0124-\\u0125\\u0128-\\u012D\\u0130"
|
||||
"\\u0139-\\u013A\\u013D-\\u013E\\u0143-\\u0144\\u0147-\\u0148\\u014C-"
|
||||
"\\u0151\\u0154-\\u0155\\u0158-\\u015D\\u0160-\\u0161\\u0164-\\u0165\\u0168"
|
||||
"-\\u0171\\u0174-\\u017F\\u01A0-\\u01A1\\u01AF-\\u01B0\\u01B7\\u01CD-"
|
||||
"\\u01DC\\u01DE-\\u01E1\\u01E6-\\u01EB\\u01F4-\\u01F5\\u01F8-\\u01FB\\u0200"
|
||||
"-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0292\\u0300-\\u034E\\u0360-"
|
||||
"\\u0362\\u0374\\u037E\\u0387\\u0391\\u0395\\u0397\\u0399\\u039F\\u03A1"
|
||||
"\\u03A5\\u03A9\\u03AC\\u03AE\\u03B1\\u03B5\\u03B7\\u03B9\\u03BF\\u03C1"
|
||||
"\\u03C5\\u03C9-\\u03CB\\u03CE\\u03D2\\u0406\\u0410\\u0413\\u0415-\\u0418"
|
||||
"\\u041A\\u041E\\u0423\\u0427\\u042B\\u042D\\u0430\\u0433\\u0435-\\u0438"
|
||||
"\\u043A\\u043E\\u0443\\u0447\\u044B\\u044D\\u0456\\u0474-\\u0475\\u0483-"
|
||||
"\\u0486\\u04D8-\\u04D9\\u04E8-\\u04E9\\u0591-\\u05A1\\u05A3-\\u05B9\\u05BB"
|
||||
"-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0623\\u0627\\u0648\\u064A-"
|
||||
"\\u0655\\u0670\\u06C1\\u06D2\\u06D5-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8"
|
||||
"\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0928\\u0930\\u0933\\u093C\\u094D"
|
||||
"\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09BE\\u09C7\\u09CD\\u09D7\\u09DC-"
|
||||
"\\u09DD\\u09DF\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC"
|
||||
"\\u0ACD\\u0B3C\\u0B3E\\u0B47\\u0B4D\\u0B56-\\u0B57\\u0B5C-\\u0B5D\\u0B92"
|
||||
"\\u0BBE\\u0BC6-\\u0BC7\\u0BCD\\u0BD7\\u0C46\\u0C4D\\u0C55-\\u0C56\\u0CBF"
|
||||
"\\u0CC2\\u0CC6\\u0CCA\\u0CCD\\u0CD5-\\u0CD6\\u0D3E\\u0D46-\\u0D47\\u0D4D"
|
||||
"\\u0D57\\u0DCA\\u0DCF\\u0DD9\\u0DDC\\u0DDF\\u0E38-\\u0E3A\\u0E48-\\u0E4B"
|
||||
"\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43"
|
||||
"\\u0F4D\\u0F52\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F76\\u0F78\\u0F7A-\\u0F7D"
|
||||
"\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9"
|
||||
"\\u0FC6\\u1025\\u102E\\u1037\\u1039\\u1100-\\u1112\\u1161-\\u1175\\u11A8-"
|
||||
"\\u11C2\\u17D2\\u18A9\\u1E00-\\u1E03\\u1E0A-\\u1E0F\\u1E12-\\u1E1B\\u1E20-"
|
||||
"\\u1E27\\u1E2A-\\u1E41\\u1E44-\\u1E53\\u1E58-\\u1E7D\\u1E80-\\u1E87\\u1E8E"
|
||||
"-\\u1E91\\u1E96-\\u1E99\\u1EA0-\\u1EF3\\u1EF6-\\u1EF9\\u1F00-\\u1F11"
|
||||
"\\u1F18-\\u1F19\\u1F20-\\u1F31\\u1F38-\\u1F39\\u1F40-\\u1F41\\u1F48-"
|
||||
"\\u1F49\\u1F50-\\u1F51\\u1F59\\u1F60-\\u1F71\\u1F73-\\u1F75\\u1F77\\u1F79"
|
||||
"\\u1F7B-\\u1F7D\\u1F80-\\u1F81\\u1F88-\\u1F89\\u1F90-\\u1F91\\u1F98-"
|
||||
"\\u1F99\\u1FA0-\\u1FA1\\u1FA8-\\u1FA9\\u1FB3\\u1FB6\\u1FBB-\\u1FBC\\u1FBE-"
|
||||
"\\u1FBF\\u1FC3\\u1FC6\\u1FC9\\u1FCB-\\u1FCC\\u1FD3\\u1FDB\\u1FE3\\u1FEB"
|
||||
"\\u1FEE-\\u1FEF\\u1FF3\\u1FF6\\u1FF9\\u1FFB-\\u1FFE\\u2000-\\u2001\\u20D0-"
|
||||
"\\u20DC\\u20E1\\u2126\\u212A-\\u212B\\u2190\\u2192\\u2194\\u21D0\\u21D2"
|
||||
"\\u21D4\\u2203\\u2208\\u220B\\u2223\\u2225\\u223C\\u2243\\u2245\\u2248"
|
||||
"\\u224D\\u2261\\u2264-\\u2265\\u2272-\\u2273\\u2276-\\u2277\\u227A-\\u227D"
|
||||
"\\u2282-\\u2283\\u2286-\\u2287\\u2291-\\u2292\\u22A2\\u22A8-\\u22A9\\u22AB"
|
||||
"\\u22B2-\\u22B5\\u2329-\\u232A\\u302A-\\u302F\\u3046\\u304B\\u304D\\u304F"
|
||||
"\\u3051\\u3053\\u3055\\u3057\\u3059\\u305B\\u305D\\u305F\\u3061\\u3064"
|
||||
"\\u3066\\u3068\\u306F\\u3072\\u3075\\u3078\\u307B\\u3099-\\u309A\\u309D"
|
||||
"\\u30A6\\u30AB\\u30AD\\u30AF\\u30B1\\u30B3\\u30B5\\u30B7\\u30B9\\u30BB"
|
||||
"\\u30BD\\u30BF\\u30C1\\u30C4\\u30C6\\u30C8\\u30CF\\u30D2\\u30D5\\u30D8"
|
||||
"\\u30DB\\u30EF-\\u30F2\\u30FD\\uAC00\\uAC1C\\uAC38\\uAC54\\uAC70\\uAC8C"
|
||||
"\\uACA8\\uACC4\\uACE0\\uACFC\\uAD18\\uAD34\\uAD50\\uAD6C\\uAD88\\uADA4"
|
||||
"\\uADC0\\uADDC\\uADF8\\uAE14\\uAE30\\uAE4C\\uAE68\\uAE84\\uAEA0\\uAEBC"
|
||||
"\\uAED8\\uAEF4\\uAF10\\uAF2C\\uAF48\\uAF64\\uAF80\\uAF9C\\uAFB8\\uAFD4"
|
||||
"\\uAFF0\\uB00C\\uB028\\uB044\\uB060\\uB07C\\uB098\\uB0B4\\uB0D0\\uB0EC"
|
||||
"\\uB108\\uB124\\uB140\\uB15C\\uB178\\uB194\\uB1B0\\uB1CC\\uB1E8\\uB204"
|
||||
"\\uB220\\uB23C\\uB258\\uB274\\uB290\\uB2AC\\uB2C8\\uB2E4\\uB300\\uB31C"
|
||||
"\\uB338\\uB354\\uB370\\uB38C\\uB3A8\\uB3C4\\uB3E0\\uB3FC\\uB418\\uB434"
|
||||
"\\uB450\\uB46C\\uB488\\uB4A4\\uB4C0\\uB4DC\\uB4F8\\uB514\\uB530\\uB54C"
|
||||
"\\uB568\\uB584\\uB5A0\\uB5BC\\uB5D8\\uB5F4\\uB610\\uB62C\\uB648\\uB664"
|
||||
"\\uB680\\uB69C\\uB6B8\\uB6D4\\uB6F0\\uB70C\\uB728\\uB744\\uB760\\uB77C"
|
||||
"\\uB798\\uB7B4\\uB7D0\\uB7EC\\uB808\\uB824\\uB840\\uB85C\\uB878\\uB894"
|
||||
"\\uB8B0\\uB8CC\\uB8E8\\uB904\\uB920\\uB93C\\uB958\\uB974\\uB990\\uB9AC"
|
||||
"\\uB9C8\\uB9E4\\uBA00\\uBA1C\\uBA38\\uBA54\\uBA70\\uBA8C\\uBAA8\\uBAC4"
|
||||
"\\uBAE0\\uBAFC\\uBB18\\uBB34\\uBB50\\uBB6C\\uBB88\\uBBA4\\uBBC0\\uBBDC"
|
||||
"\\uBBF8\\uBC14\\uBC30\\uBC4C\\uBC68\\uBC84\\uBCA0\\uBCBC\\uBCD8\\uBCF4"
|
||||
"\\uBD10\\uBD2C\\uBD48\\uBD64\\uBD80\\uBD9C\\uBDB8\\uBDD4\\uBDF0\\uBE0C"
|
||||
"\\uBE28\\uBE44\\uBE60\\uBE7C\\uBE98\\uBEB4\\uBED0\\uBEEC\\uBF08\\uBF24"
|
||||
"\\uBF40\\uBF5C\\uBF78\\uBF94\\uBFB0\\uBFCC\\uBFE8\\uC004\\uC020\\uC03C"
|
||||
"\\uC058\\uC074\\uC090\\uC0AC\\uC0C8\\uC0E4\\uC100\\uC11C\\uC138\\uC154"
|
||||
"\\uC170\\uC18C\\uC1A8\\uC1C4\\uC1E0\\uC1FC\\uC218\\uC234\\uC250\\uC26C"
|
||||
"\\uC288\\uC2A4\\uC2C0\\uC2DC\\uC2F8\\uC314\\uC330\\uC34C\\uC368\\uC384"
|
||||
"\\uC3A0\\uC3BC\\uC3D8\\uC3F4\\uC410\\uC42C\\uC448\\uC464\\uC480\\uC49C"
|
||||
"\\uC4B8\\uC4D4\\uC4F0\\uC50C\\uC528\\uC544\\uC560\\uC57C\\uC598\\uC5B4"
|
||||
"\\uC5D0\\uC5EC\\uC608\\uC624\\uC640\\uC65C\\uC678\\uC694\\uC6B0\\uC6CC"
|
||||
"\\uC6E8\\uC704\\uC720\\uC73C\\uC758\\uC774\\uC790\\uC7AC\\uC7C8\\uC7E4"
|
||||
"\\uC800\\uC81C\\uC838\\uC854\\uC870\\uC88C\\uC8A8\\uC8C4\\uC8E0\\uC8FC"
|
||||
"\\uC918\\uC934\\uC950\\uC96C\\uC988\\uC9A4\\uC9C0\\uC9DC\\uC9F8\\uCA14"
|
||||
"\\uCA30\\uCA4C\\uCA68\\uCA84\\uCAA0\\uCABC\\uCAD8\\uCAF4\\uCB10\\uCB2C"
|
||||
"\\uCB48\\uCB64\\uCB80\\uCB9C\\uCBB8\\uCBD4\\uCBF0\\uCC0C\\uCC28\\uCC44"
|
||||
"\\uCC60\\uCC7C\\uCC98\\uCCB4\\uCCD0\\uCCEC\\uCD08\\uCD24\\uCD40\\uCD5C"
|
||||
"\\uCD78\\uCD94\\uCDB0\\uCDCC\\uCDE8\\uCE04\\uCE20\\uCE3C\\uCE58\\uCE74"
|
||||
"\\uCE90\\uCEAC\\uCEC8\\uCEE4\\uCF00\\uCF1C\\uCF38\\uCF54\\uCF70\\uCF8C"
|
||||
"\\uCFA8\\uCFC4\\uCFE0\\uCFFC\\uD018\\uD034\\uD050\\uD06C\\uD088\\uD0A4"
|
||||
"\\uD0C0\\uD0DC\\uD0F8\\uD114\\uD130\\uD14C\\uD168\\uD184\\uD1A0\\uD1BC"
|
||||
"\\uD1D8\\uD1F4\\uD210\\uD22C\\uD248\\uD264\\uD280\\uD29C\\uD2B8\\uD2D4"
|
||||
"\\uD2F0\\uD30C\\uD328\\uD344\\uD360\\uD37C\\uD398\\uD3B4\\uD3D0\\uD3EC"
|
||||
"\\uD408\\uD424\\uD440\\uD45C\\uD478\\uD494\\uD4B0\\uD4CC\\uD4E8\\uD504"
|
||||
"\\uD520\\uD53C\\uD558\\uD574\\uD590\\uD5AC\\uD5C8\\uD5E4\\uD600\\uD61C"
|
||||
"\\uD638\\uD654\\uD670\\uD68C\\uD6A8\\uD6C4\\uD6E0\\uD6FC\\uD718\\uD734"
|
||||
"\\uD750\\uD76C\\uD788\\uF900-\\uFA0D\\uFA10\\uFA12\\uFA15-\\uFA1E\\uFA20"
|
||||
"\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB1D-\\uFB1F\\uFB2A-\\uFB36\\uFB38"
|
||||
"-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-\\uFB44\\uFB46-\\uFB4E\\uFE20-"
|
||||
"\\uFE23\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001D172\\U0001D17B-"
|
||||
"\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D1AD\\U0001D1BB-"
|
||||
"\\U0001D1C0\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
|
||||
SKIPPABLES[KD].applyPattern(UnicodeString(
|
||||
"[^\\u00A0\\u00A8\\u00AA\\u00AF\\u00B2-\\u00B5\\u00B8-\\u00BA\\u00BC-"
|
||||
"\\u00BE\\u00C0-\\u00C5\\u00C7-\\u00CF\\u00D1-\\u00D6\\u00D9-\\u00DD\\u00E0"
|
||||
"-\\u00E5\\u00E7-\\u00EF\\u00F1-\\u00F6\\u00F9-\\u00FD\\u00FF-\\u010F"
|
||||
"\\u0112-\\u0125\\u0128-\\u0130\\u0132-\\u0137\\u0139-\\u0140\\u0143-"
|
||||
"\\u0149\\u014C-\\u0151\\u0154-\\u0165\\u0168-\\u017F\\u01A0-\\u01A1\\u01AF"
|
||||
"-\\u01B0\\u01C4-\\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F5\\u01F8-\\u021B"
|
||||
"\\u021E-\\u021F\\u0226-\\u0233\\u02B0-\\u02B8\\u02D8-\\u02DD\\u02E0-"
|
||||
"\\u02E4\\u0300-\\u034E\\u0360-\\u0362\\u0374\\u037A\\u037E\\u0384-\\u038A"
|
||||
"\\u038C\\u038E-\\u0390\\u03AA-\\u03B0\\u03CA-\\u03CE\\u03D0-\\u03D6\\u03F0"
|
||||
"-\\u03F2\\u03F4-\\u03F5\\u0400-\\u0401\\u0403\\u0407\\u040C-\\u040E\\u0419"
|
||||
"\\u0439\\u0450-\\u0451\\u0453\\u0457\\u045C-\\u045E\\u0476-\\u0477\\u0483-"
|
||||
"\\u0486\\u04C1-\\u04C2\\u04D0-\\u04D3\\u04D6-\\u04D7\\u04DA-\\u04DF\\u04E2"
|
||||
"-\\u04E7\\u04EA-\\u04F5\\u04F8-\\u04F9\\u0587\\u0591-\\u05A1\\u05A3-"
|
||||
"\\u05B9\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0626\\u064B-"
|
||||
"\\u0655\\u0670\\u0675-\\u0678\\u06C0\\u06C2\\u06D3\\u06D6-\\u06DC\\u06DF-"
|
||||
"\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0929\\u0931"
|
||||
"\\u0934\\u093C\\u094D\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09CB-\\u09CD"
|
||||
"\\u09DC-\\u09DD\\u09DF\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E"
|
||||
"\\u0ABC\\u0ACD\\u0B3C\\u0B48\\u0B4B-\\u0B4D\\u0B5C-\\u0B5D\\u0B94\\u0BCA-"
|
||||
"\\u0BCD\\u0C48\\u0C4D\\u0C55-\\u0C56\\u0CC0\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB"
|
||||
"\\u0CCD\\u0D4A-\\u0D4D\\u0DCA\\u0DDA\\u0DDC-\\u0DDE\\u0E33\\u0E38-\\u0E3A"
|
||||
"\\u0E48-\\u0E4B\\u0EB3\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0EDC-\\u0EDD\\u0F0C"
|
||||
"\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52\\u0F57\\u0F5C"
|
||||
"\\u0F69\\u0F71-\\u0F7D\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2"
|
||||
"\\u0FA7\\u0FAC\\u0FB9\\u0FC6\\u1026\\u1037\\u1039\\u17D2\\u18A9\\u1E00-"
|
||||
"\\u1E9B\\u1EA0-\\u1EF9\\u1F00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48"
|
||||
"-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4"
|
||||
"\\u1FB6-\\u1FC4\\u1FC6-\\u1FD3\\u1FD6-\\u1FDB\\u1FDD-\\u1FEF\\u1FF2-"
|
||||
"\\u1FF4\\u1FF6-\\u1FFE\\u2000-\\u200A\\u2011\\u2017\\u2024-\\u2026\\u202F"
|
||||
"\\u2033-\\u2034\\u2036-\\u2037\\u203C\\u203E\\u2048-\\u2049\\u2070\\u2074-"
|
||||
"\\u208E\\u20A8\\u20D0-\\u20DC\\u20E1\\u2100-\\u2103\\u2105-\\u2107\\u2109-"
|
||||
"\\u2113\\u2115-\\u2116\\u2119-\\u211D\\u2120-\\u2122\\u2124\\u2126\\u2128"
|
||||
"\\u212A-\\u212D\\u212F-\\u2131\\u2133-\\u2139\\u2153-\\u217F\\u219A-"
|
||||
"\\u219B\\u21AE\\u21CD-\\u21CF\\u2204\\u2209\\u220C\\u2224\\u2226\\u222C-"
|
||||
"\\u222D\\u222F-\\u2230\\u2241\\u2244\\u2247\\u2249\\u2260\\u2262\\u226D-"
|
||||
"\\u2271\\u2274-\\u2275\\u2278-\\u2279\\u2280-\\u2281\\u2284-\\u2285\\u2288"
|
||||
"-\\u2289\\u22AC-\\u22AF\\u22E0-\\u22E3\\u22EA-\\u22ED\\u2329-\\u232A"
|
||||
"\\u2460-\\u24EA\\u2E9F\\u2EF3\\u2F00-\\u2FD5\\u3000\\u302A-\\u302F\\u3036"
|
||||
"\\u3038-\\u303A\\u304C\\u304E\\u3050\\u3052\\u3054\\u3056\\u3058\\u305A"
|
||||
"\\u305C\\u305E\\u3060\\u3062\\u3065\\u3067\\u3069\\u3070-\\u3071\\u3073-"
|
||||
"\\u3074\\u3076-\\u3077\\u3079-\\u307A\\u307C-\\u307D\\u3094\\u3099-\\u309C"
|
||||
"\\u309E\\u30AC\\u30AE\\u30B0\\u30B2\\u30B4\\u30B6\\u30B8\\u30BA\\u30BC"
|
||||
"\\u30BE\\u30C0\\u30C2\\u30C5\\u30C7\\u30C9\\u30D0-\\u30D1\\u30D3-\\u30D4"
|
||||
"\\u30D6-\\u30D7\\u30D9-\\u30DA\\u30DC-\\u30DD\\u30F4\\u30F7-\\u30FA\\u30FE"
|
||||
"\\u3131-\\u318E\\u3192-\\u319F\\u3200-\\u321C\\u3220-\\u3243\\u3260-"
|
||||
"\\u327B\\u3280-\\u32B0\\u32C0-\\u32CB\\u32D0-\\u32FE\\u3300-\\u3376\\u337B"
|
||||
"-\\u33DD\\u33E0-\\u33FE\\uAC00-\\uD7A3\\uF900-\\uFA0D\\uFA10\\uFA12\\uFA15"
|
||||
"-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB00-\\uFB06\\uFB13"
|
||||
"-\\uFB17\\uFB1D-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-"
|
||||
"\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0"
|
||||
"-\\uFDFB\\uFE20-\\uFE23\\uFE30-\\uFE44\\uFE49-\\uFE52\\uFE54-\\uFE66"
|
||||
"\\uFE68-\\uFE6B\\uFE70-\\uFE72\\uFE74\\uFE76-\\uFEFC\\uFF01-\\uFF5E\\uFF61"
|
||||
"-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC"
|
||||
"\\uFFE0-\\uFFE6\\uFFE8-\\uFFEE\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001"
|
||||
"D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D"
|
||||
"1AD\\U0001D1BB-\\U0001D1C0\\U0001D400-\\U0001D454\\U0001D456-\\U0001D4"
|
||||
"9C\\U0001D49E-\\U0001D49F\\U0001D4A2\\U0001D4A5-\\U0001D4A6\\U0001D4A9"
|
||||
"-\\U0001D4AC\\U0001D4AE-\\U0001D4B9\\U0001D4BB\\U0001D4BD-\\U0001D4C0"
|
||||
"\\U0001D4C2-\\U0001D4C3\\U0001D4C5-\\U0001D505\\U0001D507-\\U0001D50A"
|
||||
"\\U0001D50D-\\U0001D514\\U0001D516-\\U0001D51C\\U0001D51E-\\U0001D539"
|
||||
"\\U0001D53B-\\U0001D53E\\U0001D540-\\U0001D544\\U0001D546\\U0001D54A-"
|
||||
"\\U0001D550\\U0001D552-\\U0001D6A3\\U0001D6A8-\\U0001D7C9\\U0001D7CE-"
|
||||
"\\U0001D7FF\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
"[^\\u00A0\\u00A8\\u00AA\\u00AF\\u00B2-\\u00B5\\u00B8-\\u00BA\\u00BC-"
|
||||
"\\u00BE\\u00C0-\\u00C5\\u00C7-\\u00CF\\u00D1-\\u00D6\\u00D9-\\u00DD\\u00E0"
|
||||
"-\\u00E5\\u00E7-\\u00EF\\u00F1-\\u00F6\\u00F9-\\u00FD\\u00FF-\\u010F"
|
||||
"\\u0112-\\u0125\\u0128-\\u0130\\u0132-\\u0137\\u0139-\\u0140\\u0143-"
|
||||
"\\u0149\\u014C-\\u0151\\u0154-\\u0165\\u0168-\\u017F\\u01A0-\\u01A1\\u01AF"
|
||||
"-\\u01B0\\u01C4-\\u01DC\\u01DE-\\u01E3\\u01E6-\\u01F5\\u01F8-\\u021B"
|
||||
"\\u021E-\\u021F\\u0226-\\u0233\\u02B0-\\u02B8\\u02D8-\\u02DD\\u02E0-"
|
||||
"\\u02E4\\u0300-\\u034E\\u0360-\\u0362\\u0374\\u037A\\u037E\\u0384-\\u038A"
|
||||
"\\u038C\\u038E-\\u0390\\u03AA-\\u03B0\\u03CA-\\u03CE\\u03D0-\\u03D6\\u03F0"
|
||||
"-\\u03F2\\u03F4-\\u03F5\\u0400-\\u0401\\u0403\\u0407\\u040C-\\u040E\\u0419"
|
||||
"\\u0439\\u0450-\\u0451\\u0453\\u0457\\u045C-\\u045E\\u0476-\\u0477\\u0483-"
|
||||
"\\u0486\\u04C1-\\u04C2\\u04D0-\\u04D3\\u04D6-\\u04D7\\u04DA-\\u04DF\\u04E2"
|
||||
"-\\u04E7\\u04EA-\\u04F5\\u04F8-\\u04F9\\u0587\\u0591-\\u05A1\\u05A3-"
|
||||
"\\u05B9\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2\\u05C4\\u0622-\\u0626\\u064B-"
|
||||
"\\u0655\\u0670\\u0675-\\u0678\\u06C0\\u06C2\\u06D3\\u06D6-\\u06DC\\u06DF-"
|
||||
"\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED\\u0711\\u0730-\\u074A\\u0929\\u0931"
|
||||
"\\u0934\\u093C\\u094D\\u0951-\\u0954\\u0958-\\u095F\\u09BC\\u09CB-\\u09CD"
|
||||
"\\u09DC-\\u09DD\\u09DF\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E"
|
||||
"\\u0ABC\\u0ACD\\u0B3C\\u0B48\\u0B4B-\\u0B4D\\u0B5C-\\u0B5D\\u0B94\\u0BCA-"
|
||||
"\\u0BCD\\u0C48\\u0C4D\\u0C55-\\u0C56\\u0CC0\\u0CC7-\\u0CC8\\u0CCA-\\u0CCB"
|
||||
"\\u0CCD\\u0D4A-\\u0D4D\\u0DCA\\u0DDA\\u0DDC-\\u0DDE\\u0E33\\u0E38-\\u0E3A"
|
||||
"\\u0E48-\\u0E4B\\u0EB3\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0EDC-\\u0EDD\\u0F0C"
|
||||
"\\u0F18-\\u0F19\\u0F35\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52\\u0F57\\u0F5C"
|
||||
"\\u0F69\\u0F71-\\u0F7D\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2"
|
||||
"\\u0FA7\\u0FAC\\u0FB9\\u0FC6\\u1026\\u1037\\u1039\\u17D2\\u18A9\\u1E00-"
|
||||
"\\u1E9B\\u1EA0-\\u1EF9\\u1F00-\\u1F15\\u1F18-\\u1F1D\\u1F20-\\u1F45\\u1F48"
|
||||
"-\\u1F4D\\u1F50-\\u1F57\\u1F59\\u1F5B\\u1F5D\\u1F5F-\\u1F7D\\u1F80-\\u1FB4"
|
||||
"\\u1FB6-\\u1FC4\\u1FC6-\\u1FD3\\u1FD6-\\u1FDB\\u1FDD-\\u1FEF\\u1FF2-"
|
||||
"\\u1FF4\\u1FF6-\\u1FFE\\u2000-\\u200A\\u2011\\u2017\\u2024-\\u2026\\u202F"
|
||||
"\\u2033-\\u2034\\u2036-\\u2037\\u203C\\u203E\\u2048-\\u2049\\u2070\\u2074-"
|
||||
"\\u208E\\u20A8\\u20D0-\\u20DC\\u20E1\\u2100-\\u2103\\u2105-\\u2107\\u2109-"
|
||||
"\\u2113\\u2115-\\u2116\\u2119-\\u211D\\u2120-\\u2122\\u2124\\u2126\\u2128"
|
||||
"\\u212A-\\u212D\\u212F-\\u2131\\u2133-\\u2139\\u2153-\\u217F\\u219A-"
|
||||
"\\u219B\\u21AE\\u21CD-\\u21CF\\u2204\\u2209\\u220C\\u2224\\u2226\\u222C-"
|
||||
"\\u222D\\u222F-\\u2230\\u2241\\u2244\\u2247\\u2249\\u2260\\u2262\\u226D-"
|
||||
"\\u2271\\u2274-\\u2275\\u2278-\\u2279\\u2280-\\u2281\\u2284-\\u2285\\u2288"
|
||||
"-\\u2289\\u22AC-\\u22AF\\u22E0-\\u22E3\\u22EA-\\u22ED\\u2329-\\u232A"
|
||||
"\\u2460-\\u24EA\\u2E9F\\u2EF3\\u2F00-\\u2FD5\\u3000\\u302A-\\u302F\\u3036"
|
||||
"\\u3038-\\u303A\\u304C\\u304E\\u3050\\u3052\\u3054\\u3056\\u3058\\u305A"
|
||||
"\\u305C\\u305E\\u3060\\u3062\\u3065\\u3067\\u3069\\u3070-\\u3071\\u3073-"
|
||||
"\\u3074\\u3076-\\u3077\\u3079-\\u307A\\u307C-\\u307D\\u3094\\u3099-\\u309C"
|
||||
"\\u309E\\u30AC\\u30AE\\u30B0\\u30B2\\u30B4\\u30B6\\u30B8\\u30BA\\u30BC"
|
||||
"\\u30BE\\u30C0\\u30C2\\u30C5\\u30C7\\u30C9\\u30D0-\\u30D1\\u30D3-\\u30D4"
|
||||
"\\u30D6-\\u30D7\\u30D9-\\u30DA\\u30DC-\\u30DD\\u30F4\\u30F7-\\u30FA\\u30FE"
|
||||
"\\u3131-\\u318E\\u3192-\\u319F\\u3200-\\u321C\\u3220-\\u3243\\u3260-"
|
||||
"\\u327B\\u3280-\\u32B0\\u32C0-\\u32CB\\u32D0-\\u32FE\\u3300-\\u3376\\u337B"
|
||||
"-\\u33DD\\u33E0-\\u33FE\\uAC00-\\uD7A3\\uF900-\\uFA0D\\uFA10\\uFA12\\uFA15"
|
||||
"-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB00-\\uFB06\\uFB13"
|
||||
"-\\uFB17\\uFB1D-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43-"
|
||||
"\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7\\uFDF0"
|
||||
"-\\uFDFB\\uFE20-\\uFE23\\uFE30-\\uFE44\\uFE49-\\uFE52\\uFE54-\\uFE66"
|
||||
"\\uFE68-\\uFE6B\\uFE70-\\uFE72\\uFE74\\uFE76-\\uFEFC\\uFF01-\\uFF5E\\uFF61"
|
||||
"-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-\\uFFDC"
|
||||
"\\uFFE0-\\uFFE6\\uFFE8-\\uFFEE\\U0001D15E-\\U0001D169\\U0001D16D-\\U0001"
|
||||
"D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-\\U0001D"
|
||||
"1AD\\U0001D1BB-\\U0001D1C0\\U0001D400-\\U0001D454\\U0001D456-\\U0001D4"
|
||||
"9C\\U0001D49E-\\U0001D49F\\U0001D4A2\\U0001D4A5-\\U0001D4A6\\U0001D4A9"
|
||||
"-\\U0001D4AC\\U0001D4AE-\\U0001D4B9\\U0001D4BB\\U0001D4BD-\\U0001D4C0"
|
||||
"\\U0001D4C2-\\U0001D4C3\\U0001D4C5-\\U0001D505\\U0001D507-\\U0001D50A"
|
||||
"\\U0001D50D-\\U0001D514\\U0001D516-\\U0001D51C\\U0001D51E-\\U0001D539"
|
||||
"\\U0001D53B-\\U0001D53E\\U0001D540-\\U0001D544\\U0001D546\\U0001D54A-"
|
||||
"\\U0001D550\\U0001D552-\\U0001D6A3\\U0001D6A8-\\U0001D7C9\\U0001D7CE-"
|
||||
"\\U0001D7FF\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
|
||||
SKIPPABLES[KC].applyPattern(UnicodeString(
|
||||
"[^<->A-PR-Za-pr-z\\u00A0\\u00A8\\u00AA\\u00AF\\u00B2-\\u00B5\\u00B8-"
|
||||
"\\u00BA\\u00BC-\\u00BE\\u00C0-\\u00CF\\u00D1-\\u00D6\\u00D8-\\u00DD\\u00E0"
|
||||
"-\\u00EF\\u00F1-\\u00F6\\u00F8-\\u00FD\\u00FF-\\u0103\\u0106-\\u010F"
|
||||
"\\u0112-\\u0117\\u011A-\\u0121\\u0124-\\u0125\\u0128-\\u012D\\u0130\\u0132"
|
||||
"-\\u0133\\u0139-\\u013A\\u013D-\\u0140\\u0143-\\u0144\\u0147-\\u0149"
|
||||
"\\u014C-\\u0151\\u0154-\\u0155\\u0158-\\u015D\\u0160-\\u0161\\u0164-"
|
||||
"\\u0165\\u0168-\\u0171\\u0174-\\u017F\\u01A0-\\u01A1\\u01AF-\\u01B0\\u01B7"
|
||||
"\\u01C4-\\u01DC\\u01DE-\\u01E1\\u01E6-\\u01EB\\u01F1-\\u01F5\\u01F8-"
|
||||
"\\u01FB\\u0200-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0292\\u02B0-\\u02B8"
|
||||
"\\u02D8-\\u02DD\\u02E0-\\u02E4\\u0300-\\u034E\\u0360-\\u0362\\u0374\\u037A"
|
||||
"\\u037E\\u0384-\\u0385\\u0387\\u0391\\u0395\\u0397\\u0399\\u039F\\u03A1"
|
||||
"\\u03A5\\u03A9\\u03AC\\u03AE\\u03B1\\u03B5\\u03B7\\u03B9\\u03BF\\u03C1"
|
||||
"\\u03C5\\u03C9-\\u03CB\\u03CE\\u03D0-\\u03D6\\u03F0-\\u03F2\\u03F4-\\u03F5"
|
||||
"\\u0406\\u0410\\u0413\\u0415-\\u0418\\u041A\\u041E\\u0423\\u0427\\u042B"
|
||||
"\\u042D\\u0430\\u0433\\u0435-\\u0438\\u043A\\u043E\\u0443\\u0447\\u044B"
|
||||
"\\u044D\\u0456\\u0474-\\u0475\\u0483-\\u0486\\u04D8-\\u04D9\\u04E8-\\u04E9"
|
||||
"\\u0587\\u0591-\\u05A1\\u05A3-\\u05B9\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2"
|
||||
"\\u05C4\\u0622-\\u0623\\u0627\\u0648\\u064A-\\u0655\\u0670\\u0675-\\u0678"
|
||||
"\\u06C1\\u06D2\\u06D5-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED"
|
||||
"\\u0711\\u0730-\\u074A\\u0928\\u0930\\u0933\\u093C\\u094D\\u0951-\\u0954"
|
||||
"\\u0958-\\u095F\\u09BC\\u09BE\\u09C7\\u09CD\\u09D7\\u09DC-\\u09DD\\u09DF"
|
||||
"\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC\\u0ACD\\u0B3C"
|
||||
"\\u0B3E\\u0B47\\u0B4D\\u0B56-\\u0B57\\u0B5C-\\u0B5D\\u0B92\\u0BBE\\u0BC6-"
|
||||
"\\u0BC7\\u0BCD\\u0BD7\\u0C46\\u0C4D\\u0C55-\\u0C56\\u0CBF\\u0CC2\\u0CC6"
|
||||
"\\u0CCA\\u0CCD\\u0CD5-\\u0CD6\\u0D3E\\u0D46-\\u0D47\\u0D4D\\u0D57\\u0DCA"
|
||||
"\\u0DCF\\u0DD9\\u0DDC\\u0DDF\\u0E33\\u0E38-\\u0E3A\\u0E48-\\u0E4B\\u0EB3"
|
||||
"\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0EDC-\\u0EDD\\u0F0C\\u0F18-\\u0F19\\u0F35"
|
||||
"\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F7D"
|
||||
"\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9"
|
||||
"\\u0FC6\\u1025\\u102E\\u1037\\u1039\\u1100-\\u1112\\u1161-\\u1175\\u11A8-"
|
||||
"\\u11C2\\u17D2\\u18A9\\u1E00-\\u1E03\\u1E0A-\\u1E0F\\u1E12-\\u1E1B\\u1E20-"
|
||||
"\\u1E27\\u1E2A-\\u1E41\\u1E44-\\u1E53\\u1E58-\\u1E7D\\u1E80-\\u1E87\\u1E8E"
|
||||
"-\\u1E91\\u1E96-\\u1E9B\\u1EA0-\\u1EF3\\u1EF6-\\u1EF9\\u1F00-\\u1F11"
|
||||
"\\u1F18-\\u1F19\\u1F20-\\u1F31\\u1F38-\\u1F39\\u1F40-\\u1F41\\u1F48-"
|
||||
"\\u1F49\\u1F50-\\u1F51\\u1F59\\u1F60-\\u1F71\\u1F73-\\u1F75\\u1F77\\u1F79"
|
||||
"\\u1F7B-\\u1F7D\\u1F80-\\u1F81\\u1F88-\\u1F89\\u1F90-\\u1F91\\u1F98-"
|
||||
"\\u1F99\\u1FA0-\\u1FA1\\u1FA8-\\u1FA9\\u1FB3\\u1FB6\\u1FBB-\\u1FC1\\u1FC3"
|
||||
"\\u1FC6\\u1FC9\\u1FCB-\\u1FCF\\u1FD3\\u1FDB\\u1FDD-\\u1FDF\\u1FE3\\u1FEB"
|
||||
"\\u1FED-\\u1FEF\\u1FF3\\u1FF6\\u1FF9\\u1FFB-\\u1FFE\\u2000-\\u200A\\u2011"
|
||||
"\\u2017\\u2024-\\u2026\\u202F\\u2033-\\u2034\\u2036-\\u2037\\u203C\\u203E"
|
||||
"\\u2048-\\u2049\\u2070\\u2074-\\u208E\\u20A8\\u20D0-\\u20DC\\u20E1\\u2100-"
|
||||
"\\u2103\\u2105-\\u2107\\u2109-\\u2113\\u2115-\\u2116\\u2119-\\u211D\\u2120"
|
||||
"-\\u2122\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2131\\u2133-\\u2139"
|
||||
"\\u2153-\\u217F\\u2190\\u2192\\u2194\\u21D0\\u21D2\\u21D4\\u2203\\u2208"
|
||||
"\\u220B\\u2223\\u2225\\u222C-\\u222D\\u222F-\\u2230\\u223C\\u2243\\u2245"
|
||||
"\\u2248\\u224D\\u2261\\u2264-\\u2265\\u2272-\\u2273\\u2276-\\u2277\\u227A-"
|
||||
"\\u227D\\u2282-\\u2283\\u2286-\\u2287\\u2291-\\u2292\\u22A2\\u22A8-\\u22A9"
|
||||
"\\u22AB\\u22B2-\\u22B5\\u2329-\\u232A\\u2460-\\u24EA\\u2E9F\\u2EF3\\u2F00-"
|
||||
"\\u2FD5\\u3000\\u302A-\\u302F\\u3036\\u3038-\\u303A\\u3046\\u304B\\u304D"
|
||||
"\\u304F\\u3051\\u3053\\u3055\\u3057\\u3059\\u305B\\u305D\\u305F\\u3061"
|
||||
"\\u3064\\u3066\\u3068\\u306F\\u3072\\u3075\\u3078\\u307B\\u3099-\\u309D"
|
||||
"\\u30A6\\u30AB\\u30AD\\u30AF\\u30B1\\u30B3\\u30B5\\u30B7\\u30B9\\u30BB"
|
||||
"\\u30BD\\u30BF\\u30C1\\u30C4\\u30C6\\u30C8\\u30CF\\u30D2\\u30D5\\u30D8"
|
||||
"\\u30DB\\u30EF-\\u30F2\\u30FD\\u3131-\\u318E\\u3192-\\u319F\\u3200-\\u321C"
|
||||
"\\u3220-\\u3243\\u3260-\\u327B\\u3280-\\u32B0\\u32C0-\\u32CB\\u32D0-"
|
||||
"\\u32FE\\u3300-\\u3376\\u337B-\\u33DD\\u33E0-\\u33FE\\uAC00\\uAC1C\\uAC38"
|
||||
"\\uAC54\\uAC70\\uAC8C\\uACA8\\uACC4\\uACE0\\uACFC\\uAD18\\uAD34\\uAD50"
|
||||
"\\uAD6C\\uAD88\\uADA4\\uADC0\\uADDC\\uADF8\\uAE14\\uAE30\\uAE4C\\uAE68"
|
||||
"\\uAE84\\uAEA0\\uAEBC\\uAED8\\uAEF4\\uAF10\\uAF2C\\uAF48\\uAF64\\uAF80"
|
||||
"\\uAF9C\\uAFB8\\uAFD4\\uAFF0\\uB00C\\uB028\\uB044\\uB060\\uB07C\\uB098"
|
||||
"\\uB0B4\\uB0D0\\uB0EC\\uB108\\uB124\\uB140\\uB15C\\uB178\\uB194\\uB1B0"
|
||||
"\\uB1CC\\uB1E8\\uB204\\uB220\\uB23C\\uB258\\uB274\\uB290\\uB2AC\\uB2C8"
|
||||
"\\uB2E4\\uB300\\uB31C\\uB338\\uB354\\uB370\\uB38C\\uB3A8\\uB3C4\\uB3E0"
|
||||
"\\uB3FC\\uB418\\uB434\\uB450\\uB46C\\uB488\\uB4A4\\uB4C0\\uB4DC\\uB4F8"
|
||||
"\\uB514\\uB530\\uB54C\\uB568\\uB584\\uB5A0\\uB5BC\\uB5D8\\uB5F4\\uB610"
|
||||
"\\uB62C\\uB648\\uB664\\uB680\\uB69C\\uB6B8\\uB6D4\\uB6F0\\uB70C\\uB728"
|
||||
"\\uB744\\uB760\\uB77C\\uB798\\uB7B4\\uB7D0\\uB7EC\\uB808\\uB824\\uB840"
|
||||
"\\uB85C\\uB878\\uB894\\uB8B0\\uB8CC\\uB8E8\\uB904\\uB920\\uB93C\\uB958"
|
||||
"\\uB974\\uB990\\uB9AC\\uB9C8\\uB9E4\\uBA00\\uBA1C\\uBA38\\uBA54\\uBA70"
|
||||
"\\uBA8C\\uBAA8\\uBAC4\\uBAE0\\uBAFC\\uBB18\\uBB34\\uBB50\\uBB6C\\uBB88"
|
||||
"\\uBBA4\\uBBC0\\uBBDC\\uBBF8\\uBC14\\uBC30\\uBC4C\\uBC68\\uBC84\\uBCA0"
|
||||
"\\uBCBC\\uBCD8\\uBCF4\\uBD10\\uBD2C\\uBD48\\uBD64\\uBD80\\uBD9C\\uBDB8"
|
||||
"\\uBDD4\\uBDF0\\uBE0C\\uBE28\\uBE44\\uBE60\\uBE7C\\uBE98\\uBEB4\\uBED0"
|
||||
"\\uBEEC\\uBF08\\uBF24\\uBF40\\uBF5C\\uBF78\\uBF94\\uBFB0\\uBFCC\\uBFE8"
|
||||
"\\uC004\\uC020\\uC03C\\uC058\\uC074\\uC090\\uC0AC\\uC0C8\\uC0E4\\uC100"
|
||||
"\\uC11C\\uC138\\uC154\\uC170\\uC18C\\uC1A8\\uC1C4\\uC1E0\\uC1FC\\uC218"
|
||||
"\\uC234\\uC250\\uC26C\\uC288\\uC2A4\\uC2C0\\uC2DC\\uC2F8\\uC314\\uC330"
|
||||
"\\uC34C\\uC368\\uC384\\uC3A0\\uC3BC\\uC3D8\\uC3F4\\uC410\\uC42C\\uC448"
|
||||
"\\uC464\\uC480\\uC49C\\uC4B8\\uC4D4\\uC4F0\\uC50C\\uC528\\uC544\\uC560"
|
||||
"\\uC57C\\uC598\\uC5B4\\uC5D0\\uC5EC\\uC608\\uC624\\uC640\\uC65C\\uC678"
|
||||
"\\uC694\\uC6B0\\uC6CC\\uC6E8\\uC704\\uC720\\uC73C\\uC758\\uC774\\uC790"
|
||||
"\\uC7AC\\uC7C8\\uC7E4\\uC800\\uC81C\\uC838\\uC854\\uC870\\uC88C\\uC8A8"
|
||||
"\\uC8C4\\uC8E0\\uC8FC\\uC918\\uC934\\uC950\\uC96C\\uC988\\uC9A4\\uC9C0"
|
||||
"\\uC9DC\\uC9F8\\uCA14\\uCA30\\uCA4C\\uCA68\\uCA84\\uCAA0\\uCABC\\uCAD8"
|
||||
"\\uCAF4\\uCB10\\uCB2C\\uCB48\\uCB64\\uCB80\\uCB9C\\uCBB8\\uCBD4\\uCBF0"
|
||||
"\\uCC0C\\uCC28\\uCC44\\uCC60\\uCC7C\\uCC98\\uCCB4\\uCCD0\\uCCEC\\uCD08"
|
||||
"\\uCD24\\uCD40\\uCD5C\\uCD78\\uCD94\\uCDB0\\uCDCC\\uCDE8\\uCE04\\uCE20"
|
||||
"\\uCE3C\\uCE58\\uCE74\\uCE90\\uCEAC\\uCEC8\\uCEE4\\uCF00\\uCF1C\\uCF38"
|
||||
"\\uCF54\\uCF70\\uCF8C\\uCFA8\\uCFC4\\uCFE0\\uCFFC\\uD018\\uD034\\uD050"
|
||||
"\\uD06C\\uD088\\uD0A4\\uD0C0\\uD0DC\\uD0F8\\uD114\\uD130\\uD14C\\uD168"
|
||||
"\\uD184\\uD1A0\\uD1BC\\uD1D8\\uD1F4\\uD210\\uD22C\\uD248\\uD264\\uD280"
|
||||
"\\uD29C\\uD2B8\\uD2D4\\uD2F0\\uD30C\\uD328\\uD344\\uD360\\uD37C\\uD398"
|
||||
"\\uD3B4\\uD3D0\\uD3EC\\uD408\\uD424\\uD440\\uD45C\\uD478\\uD494\\uD4B0"
|
||||
"\\uD4CC\\uD4E8\\uD504\\uD520\\uD53C\\uD558\\uD574\\uD590\\uD5AC\\uD5C8"
|
||||
"\\uD5E4\\uD600\\uD61C\\uD638\\uD654\\uD670\\uD68C\\uD6A8\\uD6C4\\uD6E0"
|
||||
"\\uD6FC\\uD718\\uD734\\uD750\\uD76C\\uD788\\uF900-\\uFA0D\\uFA10\\uFA12"
|
||||
"\\uFA15-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB00-\\uFB06"
|
||||
"\\uFB13-\\uFB17\\uFB1D-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43"
|
||||
"-\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7"
|
||||
"\\uFDF0-\\uFDFB\\uFE20-\\uFE23\\uFE30-\\uFE44\\uFE49-\\uFE52\\uFE54-"
|
||||
"\\uFE66\\uFE68-\\uFE6B\\uFE70-\\uFE72\\uFE74\\uFE76-\\uFEFC\\uFF01-\\uFF5E"
|
||||
"\\uFF61-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-"
|
||||
"\\uFFDC\\uFFE0-\\uFFE6\\uFFE8-\\uFFEE\\U0001D15E-\\U0001D169\\U0001D16D-"
|
||||
"\\U0001D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-"
|
||||
"\\U0001D1AD\\U0001D1BB-\\U0001D1C0\\U0001D400-\\U0001D454\\U0001D456-"
|
||||
"\\U0001D49C\\U0001D49E-\\U0001D49F\\U0001D4A2\\U0001D4A5-\\U0001D4A6"
|
||||
"\\U0001D4A9-\\U0001D4AC\\U0001D4AE-\\U0001D4B9\\U0001D4BB\\U0001D4BD-"
|
||||
"\\U0001D4C0\\U0001D4C2-\\U0001D4C3\\U0001D4C5-\\U0001D505\\U0001D507-"
|
||||
"\\U0001D50A\\U0001D50D-\\U0001D514\\U0001D516-\\U0001D51C\\U0001D51E-"
|
||||
"\\U0001D539\\U0001D53B-\\U0001D53E\\U0001D540-\\U0001D544\\U0001D546"
|
||||
"\\U0001D54A-\\U0001D550\\U0001D552-\\U0001D6A3\\U0001D6A8-\\U0001D7C9"
|
||||
"\\U0001D7CE-\\U0001D7FF\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
"[^<->A-PR-Za-pr-z\\u00A0\\u00A8\\u00AA\\u00AF\\u00B2-\\u00B5\\u00B8-"
|
||||
"\\u00BA\\u00BC-\\u00BE\\u00C0-\\u00CF\\u00D1-\\u00D6\\u00D8-\\u00DD\\u00E0"
|
||||
"-\\u00EF\\u00F1-\\u00F6\\u00F8-\\u00FD\\u00FF-\\u0103\\u0106-\\u010F"
|
||||
"\\u0112-\\u0117\\u011A-\\u0121\\u0124-\\u0125\\u0128-\\u012D\\u0130\\u0132"
|
||||
"-\\u0133\\u0139-\\u013A\\u013D-\\u0140\\u0143-\\u0144\\u0147-\\u0149"
|
||||
"\\u014C-\\u0151\\u0154-\\u0155\\u0158-\\u015D\\u0160-\\u0161\\u0164-"
|
||||
"\\u0165\\u0168-\\u0171\\u0174-\\u017F\\u01A0-\\u01A1\\u01AF-\\u01B0\\u01B7"
|
||||
"\\u01C4-\\u01DC\\u01DE-\\u01E1\\u01E6-\\u01EB\\u01F1-\\u01F5\\u01F8-"
|
||||
"\\u01FB\\u0200-\\u021B\\u021E-\\u021F\\u0226-\\u0233\\u0292\\u02B0-\\u02B8"
|
||||
"\\u02D8-\\u02DD\\u02E0-\\u02E4\\u0300-\\u034E\\u0360-\\u0362\\u0374\\u037A"
|
||||
"\\u037E\\u0384-\\u0385\\u0387\\u0391\\u0395\\u0397\\u0399\\u039F\\u03A1"
|
||||
"\\u03A5\\u03A9\\u03AC\\u03AE\\u03B1\\u03B5\\u03B7\\u03B9\\u03BF\\u03C1"
|
||||
"\\u03C5\\u03C9-\\u03CB\\u03CE\\u03D0-\\u03D6\\u03F0-\\u03F2\\u03F4-\\u03F5"
|
||||
"\\u0406\\u0410\\u0413\\u0415-\\u0418\\u041A\\u041E\\u0423\\u0427\\u042B"
|
||||
"\\u042D\\u0430\\u0433\\u0435-\\u0438\\u043A\\u043E\\u0443\\u0447\\u044B"
|
||||
"\\u044D\\u0456\\u0474-\\u0475\\u0483-\\u0486\\u04D8-\\u04D9\\u04E8-\\u04E9"
|
||||
"\\u0587\\u0591-\\u05A1\\u05A3-\\u05B9\\u05BB-\\u05BD\\u05BF\\u05C1-\\u05C2"
|
||||
"\\u05C4\\u0622-\\u0623\\u0627\\u0648\\u064A-\\u0655\\u0670\\u0675-\\u0678"
|
||||
"\\u06C1\\u06D2\\u06D5-\\u06DC\\u06DF-\\u06E4\\u06E7-\\u06E8\\u06EA-\\u06ED"
|
||||
"\\u0711\\u0730-\\u074A\\u0928\\u0930\\u0933\\u093C\\u094D\\u0951-\\u0954"
|
||||
"\\u0958-\\u095F\\u09BC\\u09BE\\u09C7\\u09CD\\u09D7\\u09DC-\\u09DD\\u09DF"
|
||||
"\\u0A33\\u0A36\\u0A3C\\u0A4D\\u0A59-\\u0A5B\\u0A5E\\u0ABC\\u0ACD\\u0B3C"
|
||||
"\\u0B3E\\u0B47\\u0B4D\\u0B56-\\u0B57\\u0B5C-\\u0B5D\\u0B92\\u0BBE\\u0BC6-"
|
||||
"\\u0BC7\\u0BCD\\u0BD7\\u0C46\\u0C4D\\u0C55-\\u0C56\\u0CBF\\u0CC2\\u0CC6"
|
||||
"\\u0CCA\\u0CCD\\u0CD5-\\u0CD6\\u0D3E\\u0D46-\\u0D47\\u0D4D\\u0D57\\u0DCA"
|
||||
"\\u0DCF\\u0DD9\\u0DDC\\u0DDF\\u0E33\\u0E38-\\u0E3A\\u0E48-\\u0E4B\\u0EB3"
|
||||
"\\u0EB8-\\u0EB9\\u0EC8-\\u0ECB\\u0EDC-\\u0EDD\\u0F0C\\u0F18-\\u0F19\\u0F35"
|
||||
"\\u0F37\\u0F39\\u0F43\\u0F4D\\u0F52\\u0F57\\u0F5C\\u0F69\\u0F71-\\u0F7D"
|
||||
"\\u0F80-\\u0F84\\u0F86-\\u0F87\\u0F93\\u0F9D\\u0FA2\\u0FA7\\u0FAC\\u0FB9"
|
||||
"\\u0FC6\\u1025\\u102E\\u1037\\u1039\\u1100-\\u1112\\u1161-\\u1175\\u11A8-"
|
||||
"\\u11C2\\u17D2\\u18A9\\u1E00-\\u1E03\\u1E0A-\\u1E0F\\u1E12-\\u1E1B\\u1E20-"
|
||||
"\\u1E27\\u1E2A-\\u1E41\\u1E44-\\u1E53\\u1E58-\\u1E7D\\u1E80-\\u1E87\\u1E8E"
|
||||
"-\\u1E91\\u1E96-\\u1E9B\\u1EA0-\\u1EF3\\u1EF6-\\u1EF9\\u1F00-\\u1F11"
|
||||
"\\u1F18-\\u1F19\\u1F20-\\u1F31\\u1F38-\\u1F39\\u1F40-\\u1F41\\u1F48-"
|
||||
"\\u1F49\\u1F50-\\u1F51\\u1F59\\u1F60-\\u1F71\\u1F73-\\u1F75\\u1F77\\u1F79"
|
||||
"\\u1F7B-\\u1F7D\\u1F80-\\u1F81\\u1F88-\\u1F89\\u1F90-\\u1F91\\u1F98-"
|
||||
"\\u1F99\\u1FA0-\\u1FA1\\u1FA8-\\u1FA9\\u1FB3\\u1FB6\\u1FBB-\\u1FC1\\u1FC3"
|
||||
"\\u1FC6\\u1FC9\\u1FCB-\\u1FCF\\u1FD3\\u1FDB\\u1FDD-\\u1FDF\\u1FE3\\u1FEB"
|
||||
"\\u1FED-\\u1FEF\\u1FF3\\u1FF6\\u1FF9\\u1FFB-\\u1FFE\\u2000-\\u200A\\u2011"
|
||||
"\\u2017\\u2024-\\u2026\\u202F\\u2033-\\u2034\\u2036-\\u2037\\u203C\\u203E"
|
||||
"\\u2048-\\u2049\\u2070\\u2074-\\u208E\\u20A8\\u20D0-\\u20DC\\u20E1\\u2100-"
|
||||
"\\u2103\\u2105-\\u2107\\u2109-\\u2113\\u2115-\\u2116\\u2119-\\u211D\\u2120"
|
||||
"-\\u2122\\u2124\\u2126\\u2128\\u212A-\\u212D\\u212F-\\u2131\\u2133-\\u2139"
|
||||
"\\u2153-\\u217F\\u2190\\u2192\\u2194\\u21D0\\u21D2\\u21D4\\u2203\\u2208"
|
||||
"\\u220B\\u2223\\u2225\\u222C-\\u222D\\u222F-\\u2230\\u223C\\u2243\\u2245"
|
||||
"\\u2248\\u224D\\u2261\\u2264-\\u2265\\u2272-\\u2273\\u2276-\\u2277\\u227A-"
|
||||
"\\u227D\\u2282-\\u2283\\u2286-\\u2287\\u2291-\\u2292\\u22A2\\u22A8-\\u22A9"
|
||||
"\\u22AB\\u22B2-\\u22B5\\u2329-\\u232A\\u2460-\\u24EA\\u2E9F\\u2EF3\\u2F00-"
|
||||
"\\u2FD5\\u3000\\u302A-\\u302F\\u3036\\u3038-\\u303A\\u3046\\u304B\\u304D"
|
||||
"\\u304F\\u3051\\u3053\\u3055\\u3057\\u3059\\u305B\\u305D\\u305F\\u3061"
|
||||
"\\u3064\\u3066\\u3068\\u306F\\u3072\\u3075\\u3078\\u307B\\u3099-\\u309D"
|
||||
"\\u30A6\\u30AB\\u30AD\\u30AF\\u30B1\\u30B3\\u30B5\\u30B7\\u30B9\\u30BB"
|
||||
"\\u30BD\\u30BF\\u30C1\\u30C4\\u30C6\\u30C8\\u30CF\\u30D2\\u30D5\\u30D8"
|
||||
"\\u30DB\\u30EF-\\u30F2\\u30FD\\u3131-\\u318E\\u3192-\\u319F\\u3200-\\u321C"
|
||||
"\\u3220-\\u3243\\u3260-\\u327B\\u3280-\\u32B0\\u32C0-\\u32CB\\u32D0-"
|
||||
"\\u32FE\\u3300-\\u3376\\u337B-\\u33DD\\u33E0-\\u33FE\\uAC00\\uAC1C\\uAC38"
|
||||
"\\uAC54\\uAC70\\uAC8C\\uACA8\\uACC4\\uACE0\\uACFC\\uAD18\\uAD34\\uAD50"
|
||||
"\\uAD6C\\uAD88\\uADA4\\uADC0\\uADDC\\uADF8\\uAE14\\uAE30\\uAE4C\\uAE68"
|
||||
"\\uAE84\\uAEA0\\uAEBC\\uAED8\\uAEF4\\uAF10\\uAF2C\\uAF48\\uAF64\\uAF80"
|
||||
"\\uAF9C\\uAFB8\\uAFD4\\uAFF0\\uB00C\\uB028\\uB044\\uB060\\uB07C\\uB098"
|
||||
"\\uB0B4\\uB0D0\\uB0EC\\uB108\\uB124\\uB140\\uB15C\\uB178\\uB194\\uB1B0"
|
||||
"\\uB1CC\\uB1E8\\uB204\\uB220\\uB23C\\uB258\\uB274\\uB290\\uB2AC\\uB2C8"
|
||||
"\\uB2E4\\uB300\\uB31C\\uB338\\uB354\\uB370\\uB38C\\uB3A8\\uB3C4\\uB3E0"
|
||||
"\\uB3FC\\uB418\\uB434\\uB450\\uB46C\\uB488\\uB4A4\\uB4C0\\uB4DC\\uB4F8"
|
||||
"\\uB514\\uB530\\uB54C\\uB568\\uB584\\uB5A0\\uB5BC\\uB5D8\\uB5F4\\uB610"
|
||||
"\\uB62C\\uB648\\uB664\\uB680\\uB69C\\uB6B8\\uB6D4\\uB6F0\\uB70C\\uB728"
|
||||
"\\uB744\\uB760\\uB77C\\uB798\\uB7B4\\uB7D0\\uB7EC\\uB808\\uB824\\uB840"
|
||||
"\\uB85C\\uB878\\uB894\\uB8B0\\uB8CC\\uB8E8\\uB904\\uB920\\uB93C\\uB958"
|
||||
"\\uB974\\uB990\\uB9AC\\uB9C8\\uB9E4\\uBA00\\uBA1C\\uBA38\\uBA54\\uBA70"
|
||||
"\\uBA8C\\uBAA8\\uBAC4\\uBAE0\\uBAFC\\uBB18\\uBB34\\uBB50\\uBB6C\\uBB88"
|
||||
"\\uBBA4\\uBBC0\\uBBDC\\uBBF8\\uBC14\\uBC30\\uBC4C\\uBC68\\uBC84\\uBCA0"
|
||||
"\\uBCBC\\uBCD8\\uBCF4\\uBD10\\uBD2C\\uBD48\\uBD64\\uBD80\\uBD9C\\uBDB8"
|
||||
"\\uBDD4\\uBDF0\\uBE0C\\uBE28\\uBE44\\uBE60\\uBE7C\\uBE98\\uBEB4\\uBED0"
|
||||
"\\uBEEC\\uBF08\\uBF24\\uBF40\\uBF5C\\uBF78\\uBF94\\uBFB0\\uBFCC\\uBFE8"
|
||||
"\\uC004\\uC020\\uC03C\\uC058\\uC074\\uC090\\uC0AC\\uC0C8\\uC0E4\\uC100"
|
||||
"\\uC11C\\uC138\\uC154\\uC170\\uC18C\\uC1A8\\uC1C4\\uC1E0\\uC1FC\\uC218"
|
||||
"\\uC234\\uC250\\uC26C\\uC288\\uC2A4\\uC2C0\\uC2DC\\uC2F8\\uC314\\uC330"
|
||||
"\\uC34C\\uC368\\uC384\\uC3A0\\uC3BC\\uC3D8\\uC3F4\\uC410\\uC42C\\uC448"
|
||||
"\\uC464\\uC480\\uC49C\\uC4B8\\uC4D4\\uC4F0\\uC50C\\uC528\\uC544\\uC560"
|
||||
"\\uC57C\\uC598\\uC5B4\\uC5D0\\uC5EC\\uC608\\uC624\\uC640\\uC65C\\uC678"
|
||||
"\\uC694\\uC6B0\\uC6CC\\uC6E8\\uC704\\uC720\\uC73C\\uC758\\uC774\\uC790"
|
||||
"\\uC7AC\\uC7C8\\uC7E4\\uC800\\uC81C\\uC838\\uC854\\uC870\\uC88C\\uC8A8"
|
||||
"\\uC8C4\\uC8E0\\uC8FC\\uC918\\uC934\\uC950\\uC96C\\uC988\\uC9A4\\uC9C0"
|
||||
"\\uC9DC\\uC9F8\\uCA14\\uCA30\\uCA4C\\uCA68\\uCA84\\uCAA0\\uCABC\\uCAD8"
|
||||
"\\uCAF4\\uCB10\\uCB2C\\uCB48\\uCB64\\uCB80\\uCB9C\\uCBB8\\uCBD4\\uCBF0"
|
||||
"\\uCC0C\\uCC28\\uCC44\\uCC60\\uCC7C\\uCC98\\uCCB4\\uCCD0\\uCCEC\\uCD08"
|
||||
"\\uCD24\\uCD40\\uCD5C\\uCD78\\uCD94\\uCDB0\\uCDCC\\uCDE8\\uCE04\\uCE20"
|
||||
"\\uCE3C\\uCE58\\uCE74\\uCE90\\uCEAC\\uCEC8\\uCEE4\\uCF00\\uCF1C\\uCF38"
|
||||
"\\uCF54\\uCF70\\uCF8C\\uCFA8\\uCFC4\\uCFE0\\uCFFC\\uD018\\uD034\\uD050"
|
||||
"\\uD06C\\uD088\\uD0A4\\uD0C0\\uD0DC\\uD0F8\\uD114\\uD130\\uD14C\\uD168"
|
||||
"\\uD184\\uD1A0\\uD1BC\\uD1D8\\uD1F4\\uD210\\uD22C\\uD248\\uD264\\uD280"
|
||||
"\\uD29C\\uD2B8\\uD2D4\\uD2F0\\uD30C\\uD328\\uD344\\uD360\\uD37C\\uD398"
|
||||
"\\uD3B4\\uD3D0\\uD3EC\\uD408\\uD424\\uD440\\uD45C\\uD478\\uD494\\uD4B0"
|
||||
"\\uD4CC\\uD4E8\\uD504\\uD520\\uD53C\\uD558\\uD574\\uD590\\uD5AC\\uD5C8"
|
||||
"\\uD5E4\\uD600\\uD61C\\uD638\\uD654\\uD670\\uD68C\\uD6A8\\uD6C4\\uD6E0"
|
||||
"\\uD6FC\\uD718\\uD734\\uD750\\uD76C\\uD788\\uF900-\\uFA0D\\uFA10\\uFA12"
|
||||
"\\uFA15-\\uFA1E\\uFA20\\uFA22\\uFA25-\\uFA26\\uFA2A-\\uFA2D\\uFB00-\\uFB06"
|
||||
"\\uFB13-\\uFB17\\uFB1D-\\uFB36\\uFB38-\\uFB3C\\uFB3E\\uFB40-\\uFB41\\uFB43"
|
||||
"-\\uFB44\\uFB46-\\uFBB1\\uFBD3-\\uFD3D\\uFD50-\\uFD8F\\uFD92-\\uFDC7"
|
||||
"\\uFDF0-\\uFDFB\\uFE20-\\uFE23\\uFE30-\\uFE44\\uFE49-\\uFE52\\uFE54-"
|
||||
"\\uFE66\\uFE68-\\uFE6B\\uFE70-\\uFE72\\uFE74\\uFE76-\\uFEFC\\uFF01-\\uFF5E"
|
||||
"\\uFF61-\\uFFBE\\uFFC2-\\uFFC7\\uFFCA-\\uFFCF\\uFFD2-\\uFFD7\\uFFDA-"
|
||||
"\\uFFDC\\uFFE0-\\uFFE6\\uFFE8-\\uFFEE\\U0001D15E-\\U0001D169\\U0001D16D-"
|
||||
"\\U0001D172\\U0001D17B-\\U0001D182\\U0001D185-\\U0001D18B\\U0001D1AA-"
|
||||
"\\U0001D1AD\\U0001D1BB-\\U0001D1C0\\U0001D400-\\U0001D454\\U0001D456-"
|
||||
"\\U0001D49C\\U0001D49E-\\U0001D49F\\U0001D4A2\\U0001D4A5-\\U0001D4A6"
|
||||
"\\U0001D4A9-\\U0001D4AC\\U0001D4AE-\\U0001D4B9\\U0001D4BB\\U0001D4BD-"
|
||||
"\\U0001D4C0\\U0001D4C2-\\U0001D4C3\\U0001D4C5-\\U0001D505\\U0001D507-"
|
||||
"\\U0001D50A\\U0001D50D-\\U0001D514\\U0001D516-\\U0001D51C\\U0001D51E-"
|
||||
"\\U0001D539\\U0001D53B-\\U0001D53E\\U0001D540-\\U0001D544\\U0001D546"
|
||||
"\\U0001D54A-\\U0001D550\\U0001D552-\\U0001D6A3\\U0001D6A8-\\U0001D7C9"
|
||||
"\\U0001D7CE-\\U0001D7FF\\U0002F800-\\U0002FA1D]", ""), ec);
|
||||
|
||||
ucln_i18n_registerCleanup();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ UBool ParseData::isMatcher(UChar32 ch) {
|
|||
int32_t i = ch - data->variablesBase;
|
||||
if (i >= 0 && i < variablesVector->size()) {
|
||||
UnicodeFunctor *f = (UnicodeFunctor*) variablesVector->elementAt(i);
|
||||
return f != NULL && f->toMatcher() != NULL;
|
||||
return f != NULL && f->toMatcher() != NULL;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -198,7 +198,7 @@ UBool ParseData::isReplacer(UChar32 ch) {
|
|||
int i = ch - data->variablesBase;
|
||||
if (i >= 0 && i < variablesVector->size()) {
|
||||
UnicodeFunctor *f = (UnicodeFunctor*) variablesVector->elementAt(i);
|
||||
return f != NULL && f->toReplacer() != NULL;
|
||||
return f != NULL && f->toReplacer() != NULL;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1029,7 +1029,7 @@ uprv_uca_addAnElement(tempUCATable *t, UCAElements *element, UErrorCode *status)
|
|||
uprv_uca_finalizeAddition(t, element, status);
|
||||
}
|
||||
#else
|
||||
CE = element->mapCE;
|
||||
CE = element->mapCE;
|
||||
#endif
|
||||
} else {
|
||||
CE = uprv_uca_finalizeAddition(t, element, status);
|
||||
|
|
|
|||
|
|
@ -21,81 +21,12 @@
|
|||
|
||||
U_NAMESPACE_USE
|
||||
|
||||
/*
|
||||
U_CAPI UDateFormat*
|
||||
udat_open( UDateFormatStyle timeStyle,
|
||||
UDateFormatStyle dateStyle,
|
||||
const char* locale,
|
||||
const UChar *tzID,
|
||||
int32_t tzIDLength,
|
||||
UErrorCode* status)
|
||||
{
|
||||
if(U_FAILURE(*status)) return 0;
|
||||
|
||||
DateFormat *fmt;
|
||||
if(locale == 0)
|
||||
fmt = DateFormat::createDateTimeInstance((DateFormat::EStyle)dateStyle,
|
||||
(DateFormat::EStyle)timeStyle);
|
||||
else
|
||||
fmt = DateFormat::createDateTimeInstance((DateFormat::EStyle)dateStyle,
|
||||
(DateFormat::EStyle)timeStyle,
|
||||
Locale(locale));
|
||||
|
||||
if(fmt == 0) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(tzID != 0) {
|
||||
TimeZone *zone = 0;
|
||||
int32_t length = (tzIDLength == -1 ? u_strlen(tzID) : tzIDLength);
|
||||
zone = TimeZone::createTimeZone(UnicodeString((UChar*)tzID,
|
||||
length, length));
|
||||
if(zone == 0) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
delete fmt;
|
||||
return 0;
|
||||
}
|
||||
fmt->adoptTimeZone(zone);
|
||||
}
|
||||
|
||||
return (UDateFormat*)fmt;
|
||||
}
|
||||
|
||||
U_CAPI UDateFormat*
|
||||
udat_openPattern( const UChar *pattern,
|
||||
int32_t patternLength,
|
||||
const char *locale,
|
||||
UErrorCode *status)
|
||||
{
|
||||
if(U_FAILURE(*status)) return 0;
|
||||
|
||||
int32_t len = (patternLength == -1 ? u_strlen(pattern) : patternLength);
|
||||
UDateFormat *retVal = 0;
|
||||
|
||||
if(locale == 0)
|
||||
retVal = (UDateFormat*)new SimpleDateFormat(UnicodeString((UChar*)pattern,
|
||||
len, len),
|
||||
*status);
|
||||
else
|
||||
retVal = (UDateFormat*)new SimpleDateFormat(UnicodeString((UChar*)pattern,
|
||||
len, len),
|
||||
Locale(locale),
|
||||
*status);
|
||||
|
||||
if(retVal == 0) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
return 0;
|
||||
}
|
||||
return retVal;
|
||||
}
|
||||
*/
|
||||
U_CAPI UDateFormat* U_EXPORT2
|
||||
udat_open(UDateFormatStyle timeStyle,
|
||||
UDateFormatStyle dateStyle,
|
||||
const char *locale,
|
||||
const UChar *tzID,
|
||||
int32_t tzIDLength,
|
||||
const UChar *tzID,
|
||||
int32_t tzIDLength,
|
||||
const UChar *pattern,
|
||||
int32_t patternLength,
|
||||
UErrorCode *status)
|
||||
|
|
|
|||
|
|
@ -622,7 +622,7 @@ public:
|
|||
* strcmp().
|
||||
* @param source string to be processed.
|
||||
* @param sourceLength length of string to be processed.
|
||||
* If -1, the string is 0 terminated and length will be decided by the
|
||||
* If -1, the string is 0 terminated and length will be decided by the
|
||||
* function.
|
||||
* @param result buffer to store result in. If NULL, number of bytes needed
|
||||
* will be returned.
|
||||
|
|
|
|||
|
|
@ -613,8 +613,8 @@ ucol_getAttribute(const UCollator *coll, UColAttribute attr, UErrorCode *status)
|
|||
*/
|
||||
U_CAPI uint32_t U_EXPORT2
|
||||
ucol_setVariableTop(UCollator *coll,
|
||||
const UChar *varTop, int32_t len,
|
||||
UErrorCode *status);
|
||||
const UChar *varTop, int32_t len,
|
||||
UErrorCode *status);
|
||||
|
||||
/**
|
||||
* Gets the variable top value of a Collator.
|
||||
|
|
@ -647,14 +647,14 @@ ucol_restoreVariableTop(UCollator *coll, const uint32_t varTop, UErrorCode *stat
|
|||
* @param coll collator to be cloned
|
||||
* @param stackBuffer user allocated space for the new clone.
|
||||
* If NULL new memory will be allocated.
|
||||
* If buffer is not large enough, new memory will be allocated.
|
||||
* Clients can use the U_COL_SAFECLONE_BUFFERSIZE.
|
||||
* This will probably be enough to avoid memory allocations.
|
||||
* If buffer is not large enough, new memory will be allocated.
|
||||
* Clients can use the U_COL_SAFECLONE_BUFFERSIZE.
|
||||
* This will probably be enough to avoid memory allocations.
|
||||
* @param pBufferSize pointer to size of allocated space.
|
||||
* If *pBufferSize == 0, a sufficient size for use in cloning will
|
||||
* be returned ('pre-flighting')
|
||||
* If *pBufferSize is not enough for a stack-based safe clone,
|
||||
* new memory will be allocated.
|
||||
* If *pBufferSize == 0, a sufficient size for use in cloning will
|
||||
* be returned ('pre-flighting')
|
||||
* If *pBufferSize is not enough for a stack-based safe clone,
|
||||
* new memory will be allocated.
|
||||
* @param status to indicate whether the operation went on smoothly or there were errors
|
||||
* An informational status value, U_SAFECLONE_ALLOCATED_ERROR, is used if any
|
||||
* allocations were necessary.
|
||||
|
|
@ -666,9 +666,9 @@ ucol_restoreVariableTop(UCollator *coll, const uint32_t varTop, UErrorCode *stat
|
|||
*/
|
||||
U_CAPI UCollator* U_EXPORT2
|
||||
ucol_safeClone(const UCollator *coll,
|
||||
void *stackBuffer,
|
||||
int32_t *pBufferSize,
|
||||
UErrorCode *status);
|
||||
void *stackBuffer,
|
||||
int32_t *pBufferSize,
|
||||
UErrorCode *status);
|
||||
|
||||
/** default memory size for the new clone */
|
||||
#define U_COL_SAFECLONE_BUFFERSIZE 384
|
||||
|
|
@ -678,7 +678,7 @@ ucol_safeClone(const UCollator *coll,
|
|||
* Returns number of UChars needed to store rules. If buffer is NULL or bufferLen is not enough
|
||||
* to store rules, will store up to available space.
|
||||
* @param coll collator to get the rules from
|
||||
* @param delta one of UCOL_TAILORING_ONLY, UCOL_FULL_RULES.
|
||||
* @param delta one of UCOL_TAILORING_ONLY, UCOL_FULL_RULES.
|
||||
* @param buffer buffer to store the result in. If NULL, you'll get no rules.
|
||||
* @param bufferLen lenght of buffer to store rules in. If less then needed you'll get only the part that fits in.
|
||||
* @draft ICU 1.8
|
||||
|
|
|
|||
|
|
@ -177,8 +177,8 @@ U_CAPI UDateFormat* U_EXPORT2
|
|||
udat_open(UDateFormatStyle timeStyle,
|
||||
UDateFormatStyle dateStyle,
|
||||
const char *locale,
|
||||
const UChar *tzID,
|
||||
int32_t tzIDLength,
|
||||
const UChar *tzID,
|
||||
int32_t tzIDLength,
|
||||
const UChar *pattern,
|
||||
int32_t patternLength,
|
||||
UErrorCode *status);
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@ public:
|
|||
*
|
||||
* @param c set to be checked for containment in this set.
|
||||
* @return <tt>true</tt> if this set contains all of the elements of the
|
||||
* specified set.
|
||||
* specified set.
|
||||
* @stable
|
||||
*/
|
||||
virtual UBool containsAll(const UnicodeSet& c) const;
|
||||
|
|
@ -798,7 +798,7 @@ private:
|
|||
};
|
||||
|
||||
inline UBool UnicodeSet::operator!=(const UnicodeSet& o) const {
|
||||
return !operator==(o);
|
||||
return !operator==(o);
|
||||
}
|
||||
|
||||
U_NAMESPACE_END
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ unum_open( UNumberFormatStyle style,
|
|||
#if U_HAVE_RBNF
|
||||
return (UNumberFormat*)new RuleBasedNumberFormat(URBNF_SPELLOUT, Locale(locale), *status);
|
||||
#else
|
||||
// fall through
|
||||
// fall through
|
||||
#endif
|
||||
default:
|
||||
*status = U_UNSUPPORTED_ERROR;
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@ indent(int32_t count,
|
|||
|
||||
if(count <= 0)
|
||||
{
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
if(count < BUF_SIZE) {
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
*
|
||||
* Modification History:
|
||||
*
|
||||
* Date Name Description
|
||||
* 06/14/99 stephen Creation.
|
||||
* Date Name Description
|
||||
* 06/14/99 stephen Creation.
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
/* Print a ustring to the specified FILE* in the default codepage */
|
||||
void
|
||||
uprint(const UChar *s,
|
||||
FILE *f,
|
||||
UErrorCode *status)
|
||||
FILE *f,
|
||||
UErrorCode *status)
|
||||
{
|
||||
/* converter */
|
||||
UConverter *converter;
|
||||
|
|
@ -38,9 +38,9 @@ uprint(const UChar *s,
|
|||
|
||||
/* set up the conversion parameters */
|
||||
sourceLen = u_strlen(s);
|
||||
mySource = s;
|
||||
mySource = s;
|
||||
mySourceEnd = mySource + sourceLen;
|
||||
myTarget = buf;
|
||||
myTarget = buf;
|
||||
arraySize = BUF_SIZE;
|
||||
|
||||
/* open a default converter */
|
||||
|
|
@ -51,20 +51,20 @@ uprint(const UChar *s,
|
|||
|
||||
/* perform the conversion */
|
||||
do {
|
||||
/* reset the error code */
|
||||
*status = U_ZERO_ERROR;
|
||||
/* reset the error code */
|
||||
*status = U_ZERO_ERROR;
|
||||
|
||||
/* perform the conversion */
|
||||
ucnv_fromUnicode(converter, &myTarget, myTarget + arraySize,
|
||||
&mySource, mySourceEnd, NULL,
|
||||
TRUE, status);
|
||||
/* perform the conversion */
|
||||
ucnv_fromUnicode(converter, &myTarget, myTarget + arraySize,
|
||||
&mySource, mySourceEnd, NULL,
|
||||
TRUE, status);
|
||||
|
||||
/* Write the converted data to the FILE* */
|
||||
fwrite(buf, sizeof(char), myTarget - buf, f);
|
||||
/* Write the converted data to the FILE* */
|
||||
fwrite(buf, sizeof(char), myTarget - buf, f);
|
||||
|
||||
/* update the conversion parameters*/
|
||||
myTarget = buf;
|
||||
arraySize = BUF_SIZE;
|
||||
/* update the conversion parameters*/
|
||||
myTarget = buf;
|
||||
arraySize = BUF_SIZE;
|
||||
}
|
||||
while(*status == U_BUFFER_OVERFLOW_ERROR);
|
||||
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ static UOption options[]={
|
|||
UOPTION_HELP_H,
|
||||
UOPTION_HELP_QUESTION_MARK,
|
||||
{ "locale", NULL, NULL, NULL, 'l', UOPT_REQUIRES_ARG, 0 },
|
||||
UOPTION_ENCODING,
|
||||
{ "path", NULL, NULL, NULL, 'p', UOPT_OPTIONAL_ARG, 0 },
|
||||
{ "truncate", NULL, NULL, NULL, 't', UOPT_OPTIONAL_ARG, 0 },
|
||||
UOPTION_ENCODING,
|
||||
{ "path", NULL, NULL, NULL, 'p', UOPT_OPTIONAL_ARG, 0 },
|
||||
{ "truncate", NULL, NULL, NULL, 't', UOPT_OPTIONAL_ARG, 0 },
|
||||
UOPTION_VERBOSE
|
||||
};
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ extern int
|
|||
main(int argc, char* argv[]) {
|
||||
|
||||
UResourceBundle *bundle = NULL;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UFILE *out = NULL;
|
||||
int32_t i = 0;
|
||||
const char* arg;
|
||||
|
|
@ -104,43 +104,43 @@ main(int argc, char* argv[]) {
|
|||
locale = 0;
|
||||
}
|
||||
|
||||
if(options[3].doesOccur) {
|
||||
encoding = options[3].value;
|
||||
} else {
|
||||
encoding = NULL;
|
||||
}
|
||||
if(options[3].doesOccur) {
|
||||
encoding = options[3].value;
|
||||
} else {
|
||||
encoding = NULL;
|
||||
}
|
||||
|
||||
if(options[4].doesOccur) {
|
||||
if(options[4].value != NULL) {
|
||||
resPath = options[4].value; /* we'll use users resources */
|
||||
} else {
|
||||
resPath = NULL; /* we'll use ICU system resources for dumping */
|
||||
}
|
||||
} else {
|
||||
resPath = currdir; /* we'll just dump uresb samples resources */
|
||||
}
|
||||
if(options[4].doesOccur) {
|
||||
if(options[4].value != NULL) {
|
||||
resPath = options[4].value; /* we'll use users resources */
|
||||
} else {
|
||||
resPath = NULL; /* we'll use ICU system resources for dumping */
|
||||
}
|
||||
} else {
|
||||
resPath = currdir; /* we'll just dump uresb samples resources */
|
||||
}
|
||||
|
||||
if(options[5].doesOccur) {
|
||||
trunc = TRUE;
|
||||
if(options[5].value != NULL) {
|
||||
truncsize = atoi(options[5].value); /* user defined printable size */
|
||||
} else {
|
||||
truncsize = URESB_DEFAULTTRUNC; /* we'll use default omitting size */
|
||||
}
|
||||
} else {
|
||||
trunc = FALSE;
|
||||
}
|
||||
if(options[5].doesOccur) {
|
||||
trunc = TRUE;
|
||||
if(options[5].value != NULL) {
|
||||
truncsize = atoi(options[5].value); /* user defined printable size */
|
||||
} else {
|
||||
truncsize = URESB_DEFAULTTRUNC; /* we'll use default omitting size */
|
||||
}
|
||||
} else {
|
||||
trunc = FALSE;
|
||||
}
|
||||
|
||||
if(options[6].doesOccur) {
|
||||
VERBOSE = TRUE;
|
||||
}
|
||||
|
||||
outerr = u_finit(stderr, locale, encoding);
|
||||
out = u_finit(stdout, locale, encoding);
|
||||
out = u_finit(stdout, locale, encoding);
|
||||
|
||||
/*
|
||||
for(i = 0; i<20; i++) {
|
||||
reportError(&i);
|
||||
reportError(&i);
|
||||
}
|
||||
*/
|
||||
|
||||
|
|
@ -149,15 +149,15 @@ main(int argc, char* argv[]) {
|
|||
arg = getLongPathname(argv[i]);
|
||||
|
||||
printf("uresb: processing file \"%s\"\n", arg);
|
||||
bundle = ures_open(resPath, arg, &status);
|
||||
if(U_SUCCESS(status)) {
|
||||
u_fprintf(out, "%s\n", arg);
|
||||
printOutBundle(out, bundle, 0, &status);
|
||||
} else {
|
||||
reportError(&status);
|
||||
}
|
||||
bundle = ures_open(resPath, arg, &status);
|
||||
if(U_SUCCESS(status)) {
|
||||
u_fprintf(out, "%s\n", arg);
|
||||
printOutBundle(out, bundle, 0, &status);
|
||||
} else {
|
||||
reportError(&status);
|
||||
}
|
||||
|
||||
ures_close(bundle);
|
||||
ures_close(bundle);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -168,13 +168,13 @@ main(int argc, char* argv[]) {
|
|||
}
|
||||
|
||||
void printIndent(UFILE *out, int32_t indent) {
|
||||
char inchar[256];
|
||||
int32_t i = 0;
|
||||
for(i = 0; i<indent; i++) {
|
||||
inchar[i] = ' ';
|
||||
}
|
||||
inchar[indent] = '\0';
|
||||
u_fprintf(out, "%s", inchar);
|
||||
char inchar[256];
|
||||
int32_t i = 0;
|
||||
for(i = 0; i<indent; i++) {
|
||||
inchar[i] = ' ';
|
||||
}
|
||||
inchar[indent] = '\0';
|
||||
u_fprintf(out, "%s", inchar);
|
||||
}
|
||||
|
||||
void printHex(UFILE *out, const uint8_t *what) {
|
||||
|
|
@ -218,143 +218,143 @@ static UChar *quotedString(const UChar *string) {
|
|||
}
|
||||
|
||||
void printOutBundle(UFILE *out, UResourceBundle *resource, int32_t indent, UErrorCode *status) {
|
||||
int32_t noOfElements = ures_getSize(resource);
|
||||
int32_t i = 0;
|
||||
const char *key = ures_getKey(resource);
|
||||
int32_t noOfElements = ures_getSize(resource);
|
||||
int32_t i = 0;
|
||||
const char *key = ures_getKey(resource);
|
||||
|
||||
switch(ures_getType(resource)) {
|
||||
case RES_STRING :
|
||||
{
|
||||
int32_t len=0;
|
||||
const UChar*thestr = ures_getString(resource, &len, status);
|
||||
UChar *string = quotedString(thestr);
|
||||
|
||||
/* TODO: String truncation */
|
||||
/*
|
||||
if(trunc && len > truncsize) {
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "// WARNING: this string, size %d is truncated to %d\n", len, truncsize/2);
|
||||
len = truncsize/2;
|
||||
}
|
||||
*/
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s { \"%U\" } ", key, string);
|
||||
} else {
|
||||
u_fprintf(out, "\"%U\",", string);
|
||||
}
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // STRING");
|
||||
switch(ures_getType(resource)) {
|
||||
case RES_STRING :
|
||||
{
|
||||
int32_t len=0;
|
||||
const UChar*thestr = ures_getString(resource, &len, status);
|
||||
UChar *string = quotedString(thestr);
|
||||
|
||||
/* TODO: String truncation */
|
||||
/*
|
||||
if(trunc && len > truncsize) {
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "// WARNING: this string, size %d is truncated to %d\n", len, truncsize/2);
|
||||
len = truncsize/2;
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
free(string);
|
||||
}
|
||||
break;
|
||||
case RES_INT :
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
*/
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s { \"%U\" } ", key, string);
|
||||
} else {
|
||||
u_fprintf(out, "\"%U\",", string);
|
||||
}
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // STRING");
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
free(string);
|
||||
}
|
||||
break;
|
||||
case RES_INT :
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
}
|
||||
u_fprintf(out, ":int { %li } ", ures_getInt(resource, status));
|
||||
|
||||
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // INT");
|
||||
u_fprintf(out, " // INT");
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
break;
|
||||
case RES_BINARY :
|
||||
{
|
||||
int32_t len = 0;
|
||||
const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
|
||||
if(trunc && len > truncsize) {
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "// WARNING: this resource, size %li is truncated to %li\n", len, truncsize/2);
|
||||
len = truncsize/2;
|
||||
}
|
||||
if(U_SUCCESS(*status)) {
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
}
|
||||
u_fprintf(out, ":binary { ");
|
||||
for(i = 0; i<len; i++) {
|
||||
printHex(out, data++);
|
||||
}
|
||||
u_fprintf(out, " }");
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // BINARY");
|
||||
u_fprintf(out, "\n");
|
||||
break;
|
||||
case RES_BINARY :
|
||||
{
|
||||
int32_t len = 0;
|
||||
const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
|
||||
if(trunc && len > truncsize) {
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "// WARNING: this resource, size %li is truncated to %li\n", len, truncsize/2);
|
||||
len = truncsize/2;
|
||||
}
|
||||
if(U_SUCCESS(*status)) {
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
|
||||
} else {
|
||||
reportError(status);
|
||||
}
|
||||
}
|
||||
break;
|
||||
u_fprintf(out, ":binary { ");
|
||||
for(i = 0; i<len; i++) {
|
||||
printHex(out, data++);
|
||||
}
|
||||
u_fprintf(out, " }");
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // BINARY");
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
|
||||
} else {
|
||||
reportError(status);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case RES_INT_VECTOR :
|
||||
{
|
||||
int32_t len = 0;
|
||||
const int32_t *data = ures_getIntVector(resource, &len, status);
|
||||
if(U_SUCCESS(*status)) {
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
}
|
||||
u_fprintf(out, ":intvector { ");
|
||||
for(i = 0; i<len-1; i++) {
|
||||
u_fprintf(out, "%d, ", data[i]);
|
||||
}
|
||||
if(len > 0) {
|
||||
u_fprintf(out, "%d ", data[len-1]);
|
||||
}
|
||||
u_fprintf(out, "}");
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // INTVECTOR");
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
|
||||
} else {
|
||||
reportError(status);
|
||||
}
|
||||
int32_t len = 0;
|
||||
const int32_t *data = ures_getIntVector(resource, &len, status);
|
||||
if(U_SUCCESS(*status)) {
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s", key);
|
||||
}
|
||||
u_fprintf(out, ":intvector { ");
|
||||
for(i = 0; i<len-1; i++) {
|
||||
u_fprintf(out, "%d, ", data[i]);
|
||||
}
|
||||
if(len > 0) {
|
||||
u_fprintf(out, "%d ", data[len-1]);
|
||||
}
|
||||
u_fprintf(out, "}");
|
||||
if(VERBOSE) {
|
||||
u_fprintf(out, " // INTVECTOR");
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
|
||||
} else {
|
||||
reportError(status);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case RES_TABLE :
|
||||
case RES_ARRAY :
|
||||
{
|
||||
UResourceBundle *t = NULL;
|
||||
ures_resetIterator(resource);
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s ", key);
|
||||
}
|
||||
u_fprintf(out, "{");
|
||||
if(VERBOSE) {
|
||||
if(ures_getType(resource) == RES_TABLE) {
|
||||
u_fprintf(out, " // TABLE");
|
||||
} else {
|
||||
u_fprintf(out, " // ARRAY");
|
||||
}
|
||||
case RES_TABLE :
|
||||
case RES_ARRAY :
|
||||
{
|
||||
UResourceBundle *t = NULL;
|
||||
ures_resetIterator(resource);
|
||||
printIndent(out, indent);
|
||||
if(key != NULL) {
|
||||
u_fprintf(out, "%s ", key);
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
u_fprintf(out, "{");
|
||||
if(VERBOSE) {
|
||||
if(ures_getType(resource) == RES_TABLE) {
|
||||
u_fprintf(out, " // TABLE");
|
||||
} else {
|
||||
u_fprintf(out, " // ARRAY");
|
||||
}
|
||||
}
|
||||
u_fprintf(out, "\n");
|
||||
|
||||
while(ures_hasNext(resource)) {
|
||||
t = ures_getNextResource(resource, t, status);
|
||||
printOutBundle(out, t, indent+indentsize, status);
|
||||
}
|
||||
while(ures_hasNext(resource)) {
|
||||
t = ures_getNextResource(resource, t, status);
|
||||
printOutBundle(out, t, indent+indentsize, status);
|
||||
}
|
||||
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "}\n");
|
||||
ures_close(t);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
printIndent(out, indent);
|
||||
u_fprintf(out, "}\n");
|
||||
ures_close(t);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void reportError(UErrorCode *status) {
|
||||
u_fprintf(outerr, "Error %d : %U happened!\n", *status, getErrorName(*status));
|
||||
u_fprintf(outerr, "Error %d : %U happened!\n", *status, getErrorName(*status));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("da_DK", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
for (i = 0; i < 5 ; i++)
|
||||
|
|
@ -228,7 +228,7 @@ static void TestPrimary()
|
|||
myCollation = ucol_open("da_DK", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: %s: in creation of rule based collator: %s\n", __FILE__, myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
for (i = 5; i < 8 ; i++)
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("de_DE", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing German Collation with Tertiary strength\n");
|
||||
ucol_setNormalization(myCollation, UNORM_NFC);
|
||||
|
|
@ -121,7 +121,7 @@ static void TestPrimary()
|
|||
myCollation = ucol_open("de_DE", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: %s: in creation of rule based collator: %s\n", __FILE__, myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing German Collation with primary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("es_ES", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: %s: in creation of rule based collator: %s\n", __FILE__, myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing Spanish Collation with Tertiary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
|
|
@ -105,7 +105,7 @@ static void TestPrimary()
|
|||
myCollation = ucol_open("es_ES", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: %s: in creation of rule based collator: %s\n", __FILE__, myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing Spanish Collation with Primary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
|
|
|
|||
|
|
@ -146,13 +146,13 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("fr_FR", &status);
|
||||
if(U_FAILURE(status) || !myCollation){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_setAttribute(myCollation, UCOL_ALTERNATE_HANDLING, UCOL_SHIFTED, &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing French Collation with Tertiary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_QUATERNARY);
|
||||
|
|
@ -171,12 +171,12 @@ static void TestSecondary()
|
|||
myCollation = ucol_open("fr_FR", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
ucol_setAttribute(myCollation, UCOL_STRENGTH, UCOL_SECONDARY, &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing French Collation with Secondary strength\n");
|
||||
/*test acute and grave ordering (compare to french collation)*/
|
||||
|
|
@ -201,7 +201,7 @@ static void TestExtra()
|
|||
myCollation = ucol_open("fr_FR", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing French Collation extra with secondary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
|
|
|
|||
|
|
@ -212,13 +212,13 @@ void ctest_setICU_DATA() {
|
|||
}
|
||||
|
||||
/* U_TOPBUILDDIR is set by the makefiles on UNIXes when building cintltst and intltst
|
||||
// to point to the top of the build hierarchy, which may or
|
||||
// may not be the same as the source directory, depending on
|
||||
// the configure options used. At any rate,
|
||||
// set the data path to the built data from this directory.
|
||||
// The value is complete with quotes, so it can be used
|
||||
// as-is as a string constant.
|
||||
*/
|
||||
// to point to the top of the build hierarchy, which may or
|
||||
// may not be the same as the source directory, depending on
|
||||
// the configure options used. At any rate,
|
||||
// set the data path to the built data from this directory.
|
||||
// The value is complete with quotes, so it can be used
|
||||
// as-is as a string constant.
|
||||
*/
|
||||
#if defined (U_TOPBUILDDIR)
|
||||
{
|
||||
static char env_string[] = U_TOPBUILDDIR U_FILE_SEP_STRING "data"U_FILE_SEP_STRING"out"U_FILE_SEP_STRING;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2001, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* File CJAPTST.C
|
||||
*
|
||||
* Modification History:
|
||||
* Name Description
|
||||
* Name Description
|
||||
* Madhu Katragadda Ported for C API
|
||||
* synwee Added TestBase, TestPlainDakutenHandakuten,
|
||||
* TestSmallLarge, TestKatakanaHiragana,
|
||||
|
|
@ -101,24 +101,22 @@ const static UChar testChooonKigooCases[][MAX_TOKEN_LEN] = {
|
|||
|
||||
void addKannaCollTest(TestNode** root)
|
||||
{
|
||||
addTest(root, &TestTertiary, "tscoll/cjacoll/TestTertiary");
|
||||
addTest(root, &TestBase, "tscoll/cjacoll/TestBase");
|
||||
addTest(root, &TestPlainDakutenHandakuten,
|
||||
"tscoll/cjacoll/TestPlainDakutenHandakuten");
|
||||
addTest(root, &TestSmallLarge, "tscoll/cjacoll/TestSmallLarge");
|
||||
addTest(root, &TestKatakanaHiragana, "tscoll/cjacoll/TestKatakanaHiragana");
|
||||
addTest(root, &TestChooonKigoo, "tscoll/cjacoll/TestChooonKigoo");
|
||||
addTest(root, &TestTertiary, "tscoll/cjacoll/TestTertiary");
|
||||
addTest(root, &TestBase, "tscoll/cjacoll/TestBase");
|
||||
addTest(root, &TestPlainDakutenHandakuten, "tscoll/cjacoll/TestPlainDakutenHandakuten");
|
||||
addTest(root, &TestSmallLarge, "tscoll/cjacoll/TestSmallLarge");
|
||||
addTest(root, &TestKatakanaHiragana, "tscoll/cjacoll/TestKatakanaHiragana");
|
||||
addTest(root, &TestChooonKigoo, "tscoll/cjacoll/TestChooonKigoo");
|
||||
}
|
||||
|
||||
static void TestTertiary( )
|
||||
{
|
||||
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing Kanna(Japan) Collation with Tertiary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
|
|
@ -133,69 +131,69 @@ static void TestTertiary( )
|
|||
/* Testing base letters */
|
||||
static void TestBase()
|
||||
{
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
myErrorName(status));
|
||||
return;
|
||||
}
|
||||
|
||||
log_verbose("Testing Japanese Base Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testBaseCases[i], testBaseCases[i + 1], UCOL_LESS);
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
log_verbose("Testing Japanese Base Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testBaseCases[i], testBaseCases[i + 1], UCOL_LESS);
|
||||
|
||||
ucol_close(myCollation);
|
||||
}
|
||||
|
||||
/* Testing plain, Daku-ten, Handaku-ten letters */
|
||||
static void TestPlainDakutenHandakuten(void)
|
||||
{
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
myErrorName(status));
|
||||
return;
|
||||
}
|
||||
|
||||
log_verbose("Testing plain, Daku-ten, Handaku-ten letters Japanese Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_SECONDARY);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testPlainDakutenHandakutenCases[i],
|
||||
testPlainDakutenHandakutenCases[i + 1], UCOL_LESS);
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
log_verbose("Testing plain, Daku-ten, Handaku-ten letters Japanese Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_SECONDARY);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testPlainDakutenHandakutenCases[i],
|
||||
testPlainDakutenHandakutenCases[i + 1], UCOL_LESS);
|
||||
|
||||
ucol_close(myCollation);
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
* Test Small, Large letters
|
||||
*/
|
||||
static void TestSmallLarge(void)
|
||||
{
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
myErrorName(status));
|
||||
return;
|
||||
}
|
||||
|
||||
log_verbose("Testing Japanese Small and Large Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testSmallLargeCases[i], testSmallLargeCases[i + 1],
|
||||
UCOL_LESS);
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
log_verbose("Testing Japanese Small and Large Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 3 ; i++)
|
||||
doTest(myCollation, testSmallLargeCases[i], testSmallLargeCases[i + 1],
|
||||
UCOL_LESS);
|
||||
|
||||
ucol_close(myCollation);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -203,25 +201,25 @@ static void TestSmallLarge(void)
|
|||
*/
|
||||
static void TestKatakanaHiragana(void)
|
||||
{
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
myErrorName(status));
|
||||
return;
|
||||
}
|
||||
|
||||
log_verbose("Testing Japanese Katakana, Hiragana Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_QUATERNARY);
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 3 ; i++) {
|
||||
doTest(myCollation, testKatakanaHiraganaCases[i],
|
||||
testKatakanaHiraganaCases[i + 1], UCOL_LESS);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
log_verbose("Testing Japanese Katakana, Hiragana Characters Collation\n");
|
||||
ucol_setStrength(myCollation, UCOL_QUATERNARY);
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 3 ; i++) {
|
||||
doTest(myCollation, testKatakanaHiraganaCases[i],
|
||||
testKatakanaHiraganaCases[i + 1], UCOL_LESS);
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -229,22 +227,22 @@ static void TestKatakanaHiragana(void)
|
|||
*/
|
||||
static void TestChooonKigoo(void)
|
||||
{
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
myCollation = ucol_open("ja_JP", &status);
|
||||
if (U_FAILURE(status))
|
||||
{
|
||||
log_err("ERROR: in creation of rule based collator: %s\n",
|
||||
myErrorName(status));
|
||||
return;
|
||||
}
|
||||
|
||||
log_verbose("Testing Japanese Choo-on Kigoo Characters Collation\n");
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 7 ; i++) {
|
||||
doTest(myCollation, testChooonKigooCases[i], testChooonKigooCases[i + 1],
|
||||
UCOL_LESS);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
log_verbose("Testing Japanese Choo-on Kigoo Characters Collation\n");
|
||||
ucol_setAttribute(myCollation, UCOL_CASE_LEVEL, UCOL_ON, &status);
|
||||
for (i = 0; i < 7 ; i++) {
|
||||
doTest(myCollation, testChooonKigooCases[i], testChooonKigooCases[i + 1],
|
||||
UCOL_LESS);
|
||||
}
|
||||
|
||||
ucol_close(myCollation);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/********************************************************************
|
||||
* COPYRIGHT:
|
||||
* COPYRIGHT:
|
||||
* Copyright (c) 1997-2001, International Business Machines Corporation and
|
||||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
* File CLOCTST.C
|
||||
*
|
||||
* Modification History:
|
||||
* Name Description
|
||||
* Name Description
|
||||
* Madhu Katragadda Ported for C API
|
||||
*********************************************************************************
|
||||
*/
|
||||
|
|
@ -171,7 +171,7 @@ static void TestBasicGetters() {
|
|||
log_err("ERROR: in uloc_getLanguage %s\n", myErrorName(status));
|
||||
}
|
||||
if (0 !=strcmp(temp,rawData2[LANG][i])) {
|
||||
log_err(" Language code mismatch: %s versus %s\n", temp, rawData2[LANG][i]);
|
||||
log_err(" Language code mismatch: %s versus %s\n", temp, rawData2[LANG][i]);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -186,7 +186,7 @@ static void TestBasicGetters() {
|
|||
}
|
||||
if (0 != strcmp(temp, rawData2[CTRY][i])) {
|
||||
log_err(" Country code mismatch: %s versus %s\n", temp, rawData2[CTRY][i]);
|
||||
|
||||
|
||||
}
|
||||
|
||||
cap=uloc_getVariant(testLocale, temp, cap, &status);
|
||||
|
|
@ -234,8 +234,8 @@ static void TestPrefixes() {
|
|||
int row = 0;
|
||||
int n;
|
||||
const char *loc;
|
||||
|
||||
const char *testData[][5] =
|
||||
|
||||
const char *testData[][5] =
|
||||
{
|
||||
{"sv", "FI", "AL", "sv-fi-al", "sv_FI_AL" },
|
||||
{"en", "GB", "", "en-gb", "en_GB" },
|
||||
|
|
@ -267,7 +267,7 @@ static void TestPrefixes() {
|
|||
for(row=0;testData[row][0][0] != 0;row++) {
|
||||
loc = testData[row][NAME];
|
||||
log_verbose("Test #%d: %s\n", row, loc);
|
||||
|
||||
|
||||
err = U_ZERO_ERROR;
|
||||
len=0;
|
||||
buf[0]=0;
|
||||
|
|
@ -295,12 +295,12 @@ static void TestPrefixes() {
|
|||
case NAME+1:
|
||||
len = uloc_getName(loc, buf, PREFIXBUFSIZ, &err);
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
strcpy(buf, "**??");
|
||||
len=4;
|
||||
}
|
||||
|
||||
|
||||
if(U_FAILURE(err)) {
|
||||
log_err("#%d: %s on %s: err %s\n",
|
||||
row, testTitles[n], loc, u_errorName(err));
|
||||
|
|
@ -313,7 +313,7 @@ static void TestPrefixes() {
|
|||
row, testTitles[n], loc, buf, len, strlen(buf)+1);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* see if they smashed something */
|
||||
if(buf[len+1] != '%') {
|
||||
log_err("#%d: %s on %s: -> [%s] - wrote [%X] out ofbounds!\n",
|
||||
|
|
@ -378,10 +378,10 @@ setUpDataTable();
|
|||
cleanUpDataTable();
|
||||
}
|
||||
|
||||
static void TestDisplayNames()
|
||||
static void TestDisplayNames()
|
||||
{
|
||||
/* sfb 990721
|
||||
Can't just save a pointer to the default locale.
|
||||
Can't just save a pointer to the default locale.
|
||||
Although the pointer won't change, the contents will, so the
|
||||
restore at the end doesn't actually restore the original.
|
||||
*/
|
||||
|
|
@ -463,7 +463,7 @@ static void TestGetAvailableLocales()
|
|||
log_err("countAvailable() returned an empty list!\n");
|
||||
|
||||
/* use something sensible w/o hardcoding the count */
|
||||
else if(locCount < 0){
|
||||
else if(locCount < 0){
|
||||
log_err("countAvailable() returned a wrong value!= %d\n", locCount);
|
||||
}
|
||||
else{
|
||||
|
|
@ -487,10 +487,10 @@ static void TestDataDirectory()
|
|||
log_verbose("Testing getDataDirectory()\n");
|
||||
temp = u_getDataDirectory();
|
||||
strcpy(oldDirectory, temp);
|
||||
|
||||
|
||||
testValue1=uloc_getISO3Language("en_US");
|
||||
log_verbose("first fetch of language retrieved %s\n", testValue1);
|
||||
|
||||
|
||||
if (0 != strcmp(testValue1,"eng")){
|
||||
log_err("Initial check of ISO3 language failed: expected \"eng\", got %s \n", testValue1);
|
||||
}
|
||||
|
|
@ -555,7 +555,7 @@ setUpDataTable();
|
|||
if (defaultIsFrench && 0 != strcmp(temp, "fr")) {
|
||||
log_err("Default locale should be French, but it's really %s\n", temp);
|
||||
}
|
||||
else if (!defaultIsFrench && 0 != strcmp(temp, "en")){
|
||||
else if (!defaultIsFrench && 0 != strcmp(temp, "en")){
|
||||
log_err("Default locale should be English, but it's really %s\n", temp);
|
||||
}
|
||||
|
||||
|
|
@ -631,9 +631,9 @@ setUpDataTable();
|
|||
}
|
||||
if(U_FAILURE(status)){
|
||||
log_err("Error in getDisplayName() %s\n", myErrorName(status));
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
else {
|
||||
maxresultsize=0;
|
||||
|
|
@ -667,7 +667,7 @@ setUpDataTable();
|
|||
if(U_FAILURE(status)){
|
||||
log_err("Error in getDisplayCountry() %s\n", myErrorName(status));
|
||||
}
|
||||
|
||||
|
||||
maxresultsize=0;
|
||||
maxresultsize=uloc_getDisplayVariant(testLocale, inLocale, NULL, maxresultsize, &status);
|
||||
if(status==U_BUFFER_OVERFLOW_ERROR)
|
||||
|
|
@ -683,7 +683,7 @@ setUpDataTable();
|
|||
if(U_FAILURE(status)){
|
||||
log_err("Error in getDisplayVariant() %s\n", myErrorName(status));
|
||||
}
|
||||
|
||||
|
||||
maxresultsize=0;
|
||||
maxresultsize=uloc_getDisplayName(testLocale, inLocale, NULL, maxresultsize, &status);
|
||||
if(status==U_BUFFER_OVERFLOW_ERROR)
|
||||
|
|
@ -741,7 +741,7 @@ setUpDataTable();
|
|||
log_err(" Display Variant mismatch: %s versus %s inLocale=%s\n", austrdup(testVar), austrdup(expectedVar), inLocale);
|
||||
}
|
||||
|
||||
if(0 != u_strcmp(testName, expectedName)) {
|
||||
if(0 != u_strcmp(testName, expectedName)) {
|
||||
log_err(" Display Name mismatch: %s versus %s inLocale=%s\n", austrdup(testName), austrdup(expectedName), inLocale);
|
||||
}
|
||||
|
||||
|
|
@ -782,15 +782,20 @@ static void TestISOFunctions()
|
|||
{
|
||||
done = TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
test = *(str+count-1);
|
||||
if(!strcmp(test,"in")) log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"iw")) log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"ji")) log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"jw")) log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"sh")) log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
}
|
||||
else
|
||||
{
|
||||
test = *(str+count-1);
|
||||
if(!strcmp(test,"in"))
|
||||
log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"iw"))
|
||||
log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"ji"))
|
||||
log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"jw"))
|
||||
log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
if(!strcmp(test,"sh"))
|
||||
log_err("FAIL getISOLanguages() has obsolete language code %s\n", test);
|
||||
}
|
||||
}
|
||||
count--;
|
||||
expect = 437;
|
||||
|
|
@ -808,12 +813,14 @@ static void TestISOFunctions()
|
|||
{
|
||||
done=TRUE;
|
||||
}
|
||||
else
|
||||
{
|
||||
test = *(str1+count-1);
|
||||
if(!strcmp(test,"FX")) log_err("FAIL getISOCountries() has obsolete country code %s\n", test);
|
||||
if(!strcmp(test,"ZR")) log_err("FAIL getISOCountries() has obsolete country code %s\n", test);
|
||||
}
|
||||
else
|
||||
{
|
||||
test = *(str1+count-1);
|
||||
if(!strcmp(test,"FX"))
|
||||
log_err("FAIL getISOCountries() has obsolete country code %s\n", test);
|
||||
if(!strcmp(test,"ZR"))
|
||||
log_err("FAIL getISOCountries() has obsolete country code %s\n", test);
|
||||
}
|
||||
}
|
||||
count--;
|
||||
expect=239;
|
||||
|
|
@ -854,7 +861,7 @@ static void cleanUpDataTable()
|
|||
/**
|
||||
* @bug 4011756 4011380
|
||||
*/
|
||||
static void TestISO3Fallback()
|
||||
static void TestISO3Fallback()
|
||||
{
|
||||
const char* test="xx_YY";
|
||||
|
||||
|
|
@ -876,7 +883,7 @@ static void TestISO3Fallback()
|
|||
/**
|
||||
* @bug 4118587
|
||||
*/
|
||||
static void TestSimpleDisplayNames()
|
||||
static void TestSimpleDisplayNames()
|
||||
{
|
||||
/*
|
||||
This test is different from TestDisplayNames because TestDisplayNames checks
|
||||
|
|
@ -888,7 +895,7 @@ static void TestSimpleDisplayNames()
|
|||
const char* languageNames [] = { "Hebrew", "Indonesian", "Inukitut", "Uighur", "Yiddish",
|
||||
"Zhuang" };
|
||||
UErrorCode status=U_ZERO_ERROR;
|
||||
|
||||
|
||||
int32_t i;
|
||||
for (i = 0; i < 6; i++) {
|
||||
UChar *testLang=0;
|
||||
|
|
@ -903,28 +910,28 @@ static void TestSimpleDisplayNames()
|
|||
expectedLang=(UChar*)malloc(sizeof(UChar) * (strlen(languageNames[i])+1));
|
||||
u_uastrcpy(expectedLang, languageNames[i]);
|
||||
if (u_strcmp(testLang, expectedLang) != 0)
|
||||
log_err("Got wrong display name for %s : Expected \"%s\", got \"%s\".\n",
|
||||
log_err("Got wrong display name for %s : Expected \"%s\", got \"%s\".\n",
|
||||
languageCodes[i], languageNames[i], austrdup(testLang));
|
||||
free(testLang);
|
||||
free(expectedLang);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @bug 4118595
|
||||
*/
|
||||
static void TestUninstalledISO3Names()
|
||||
static void TestUninstalledISO3Names()
|
||||
{
|
||||
/* This test checks to make sure getISO3Language and getISO3Country work right
|
||||
even for locales that are not installed. */
|
||||
const char iso2Languages [][4] = { "am", "ba", "fy", "mr", "rn",
|
||||
const char iso2Languages [][4] = { "am", "ba", "fy", "mr", "rn",
|
||||
"ss", "tw", "zu" };
|
||||
const char iso3Languages [][5] = { "amh", "bak", "fry", "mar", "run",
|
||||
const char iso3Languages [][5] = { "amh", "bak", "fry", "mar", "run",
|
||||
"ssw", "twi", "zul" };
|
||||
char iso2Countries [][6] = { "am_AF", "ba_BW", "fy_KZ", "mr_MO", "rn_MN",
|
||||
char iso2Countries [][6] = { "am_AF", "ba_BW", "fy_KZ", "mr_MO", "rn_MN",
|
||||
"ss_SB", "tw_TC", "zu_ZW" };
|
||||
char iso3Countries [][4] = { "AFG", "BWA", "KAZ", "MAC", "MNG",
|
||||
char iso3Countries [][4] = { "AFG", "BWA", "KAZ", "MAC", "MNG",
|
||||
"SLB", "TCA", "ZWE" };
|
||||
int32_t i;
|
||||
|
||||
|
|
@ -933,7 +940,7 @@ static void TestUninstalledISO3Names()
|
|||
const char *test;
|
||||
test = uloc_getISO3Language(iso2Languages[i]);
|
||||
if(strcmp(test, iso3Languages[i]) !=0 || U_FAILURE(err))
|
||||
log_err("Got wrong ISO3 code for %s : Expected \"%s\", got \"%s\". %s\n",
|
||||
log_err("Got wrong ISO3 code for %s : Expected \"%s\", got \"%s\". %s\n",
|
||||
iso2Languages[i], iso3Languages[i], test, myErrorName(err));
|
||||
}
|
||||
for (i = 0; i < 8; i++) {
|
||||
|
|
@ -941,7 +948,7 @@ static void TestUninstalledISO3Names()
|
|||
const char *test;
|
||||
test = uloc_getISO3Country(iso2Countries[i]);
|
||||
if(strcmp(test, iso3Countries[i]) !=0 || U_FAILURE(err))
|
||||
log_err("Got wrong ISO3 code for %s : Expected \"%s\", got \"%s\". %s\n",
|
||||
log_err("Got wrong ISO3 code for %s : Expected \"%s\", got \"%s\". %s\n",
|
||||
iso2Countries[i], iso3Countries[i], test, myErrorName(err));
|
||||
}
|
||||
}
|
||||
|
|
@ -1047,7 +1054,7 @@ static void TestVariantParsing()
|
|||
if(strcmp(austrdup(got),"_FOO_")!=0) {
|
||||
log_err("FAIL: getDisplayVariant() Wanted: _FOO_ Got: %s\n", austrdup(got));
|
||||
}
|
||||
free(got);
|
||||
free(got);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1056,7 +1063,7 @@ static void TestObsoleteNames(void)
|
|||
int32_t i;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
char buff[256];
|
||||
|
||||
|
||||
struct
|
||||
{
|
||||
char locale[9];
|
||||
|
|
@ -1064,7 +1071,7 @@ static void TestObsoleteNames(void)
|
|||
char lang[6];
|
||||
char ctry3[6];
|
||||
char ctry[6];
|
||||
} tests[] =
|
||||
} tests[] =
|
||||
{
|
||||
{ "eng_USA", "eng", "en", "USA", "US" },
|
||||
{ "kok", "kok", "kok", "", "" },
|
||||
|
|
@ -1085,14 +1092,14 @@ static void TestObsoleteNames(void)
|
|||
{ "sh", "srp", "sh", "", "" },
|
||||
{ "", "", "", "", "" }
|
||||
};
|
||||
|
||||
|
||||
for(i=0;tests[i].locale[0];i++)
|
||||
{
|
||||
const char *locale;
|
||||
|
||||
|
||||
locale = tests[i].locale;
|
||||
log_verbose("** %s:\n", locale);
|
||||
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
if(strcmp(tests[i].lang3,uloc_getISO3Language(locale)))
|
||||
{
|
||||
|
|
@ -1104,7 +1111,7 @@ static void TestObsoleteNames(void)
|
|||
log_verbose(" uloc_getISO3Language()==\t\"%s\"\n",
|
||||
uloc_getISO3Language(locale) );
|
||||
}
|
||||
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
uloc_getLanguage(locale, buff, 256, &status);
|
||||
if(U_FAILURE(status))
|
||||
|
|
@ -1133,7 +1140,7 @@ static void TestObsoleteNames(void)
|
|||
log_verbose(" uloc_getISO3Language()==\t\"%s\"\n",
|
||||
uloc_getISO3Language(locale) );
|
||||
}
|
||||
|
||||
|
||||
if(strcmp(tests[i].ctry3,uloc_getISO3Country(locale)))
|
||||
{
|
||||
log_err("FAIL: uloc_getISO3Country(%s)==\t\"%s\",\t expected \"%s\"\n",
|
||||
|
|
@ -1144,7 +1151,7 @@ static void TestObsoleteNames(void)
|
|||
log_verbose(" uloc_getISO3Country()==\t\"%s\"\n",
|
||||
uloc_getISO3Country(locale) );
|
||||
}
|
||||
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
uloc_getCountry(locale, buff, 256, &status);
|
||||
if(U_FAILURE(status))
|
||||
|
|
@ -1167,60 +1174,60 @@ static void TestObsoleteNames(void)
|
|||
|
||||
#if 0
|
||||
|
||||
i = uloc_getLanguage("kok",NULL,0,&icu_err);
|
||||
if(U_FAILURE(icu_err))
|
||||
{
|
||||
log_err("FAIL: Got %s trying to do uloc_getLanguage(kok)\n", u_errorName(icu_err));
|
||||
}
|
||||
i = uloc_getLanguage("kok",NULL,0,&icu_err);
|
||||
if(U_FAILURE(icu_err))
|
||||
{
|
||||
log_err("FAIL: Got %s trying to do uloc_getLanguage(kok)\n", u_errorName(icu_err));
|
||||
}
|
||||
|
||||
icu_err = U_ZERO_ERROR;
|
||||
uloc_getLanguage("kok",r1_buff,12,&icu_err);
|
||||
if(U_FAILURE(icu_err))
|
||||
{
|
||||
log_err("FAIL: Got %s trying to do uloc_getLanguage(kok, buff)\n", u_errorName(icu_err));
|
||||
}
|
||||
icu_err = U_ZERO_ERROR;
|
||||
uloc_getLanguage("kok",r1_buff,12,&icu_err);
|
||||
if(U_FAILURE(icu_err))
|
||||
{
|
||||
log_err("FAIL: Got %s trying to do uloc_getLanguage(kok, buff)\n", u_errorName(icu_err));
|
||||
}
|
||||
|
||||
r1_addr = (char *)uloc_getISO3Language("kok");
|
||||
r1_addr = (char *)uloc_getISO3Language("kok");
|
||||
|
||||
icu_err = U_ZERO_ERROR;
|
||||
if (strcmp(r1_buff,"kok") != 0)
|
||||
{
|
||||
log_err("FAIL: uloc_getLanguage(kok)==%s not kok\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Language("in");
|
||||
i = uloc_getLanguage(r1_addr,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"id") != 0)
|
||||
{
|
||||
printf("uloc_getLanguage error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Language("sh");
|
||||
i = uloc_getLanguage(r1_addr,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"sr") != 0)
|
||||
{
|
||||
printf("uloc_getLanguage error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
icu_err = U_ZERO_ERROR;
|
||||
if (strcmp(r1_buff,"kok") != 0)
|
||||
{
|
||||
log_err("FAIL: uloc_getLanguage(kok)==%s not kok\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Language("in");
|
||||
i = uloc_getLanguage(r1_addr,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"id") != 0)
|
||||
{
|
||||
printf("uloc_getLanguage error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Language("sh");
|
||||
i = uloc_getLanguage(r1_addr,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"sr") != 0)
|
||||
{
|
||||
printf("uloc_getLanguage error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
|
||||
r1_addr = (char *)uloc_getISO3Country("zz_ZR");
|
||||
strcpy(p1_buff,"zz_");
|
||||
strcat(p1_buff,r1_addr);
|
||||
i = uloc_getCountry(p1_buff,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"ZR") != 0)
|
||||
{
|
||||
printf("uloc_getCountry error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Country("zz_FX");
|
||||
strcpy(p1_buff,"zz_");
|
||||
strcat(p1_buff,r1_addr);
|
||||
i = uloc_getCountry(p1_buff,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"FX") != 0)
|
||||
{
|
||||
printf("uloc_getCountry error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Country("zz_ZR");
|
||||
strcpy(p1_buff,"zz_");
|
||||
strcat(p1_buff,r1_addr);
|
||||
i = uloc_getCountry(p1_buff,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"ZR") != 0)
|
||||
{
|
||||
printf("uloc_getCountry error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
r1_addr = (char *)uloc_getISO3Country("zz_FX");
|
||||
strcpy(p1_buff,"zz_");
|
||||
strcat(p1_buff,r1_addr);
|
||||
i = uloc_getCountry(p1_buff,r1_buff,12,&icu_err);
|
||||
if (strcmp(r1_buff,"FX") != 0)
|
||||
{
|
||||
printf("uloc_getCountry error (%s)\n",r1_buff);
|
||||
line--;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -1493,7 +1500,7 @@ TestKeyInRootRecursive(UResourceBundle *root, UResourceBundle *currentBundle, co
|
|||
/* The ures_* API does not do fallback of sub-resource bundles,
|
||||
So we can't do this now. */
|
||||
else if (strcmp(locale, "root") != 0 && errorCode == U_ZERO_ERROR) {
|
||||
|
||||
|
||||
const UChar *rootString = ures_getString(subRootBundle, &len, &errorCode);
|
||||
if (U_FAILURE(errorCode) || rootString == NULL) {
|
||||
log_err("Can't open a string with key \"%s\" in \"%s\" in root\n",
|
||||
|
|
@ -1809,7 +1816,7 @@ TestConsistentCountryInfo(void) {
|
|||
|
||||
int32_t fromCountryLen, toCountryLen;
|
||||
char fromCountry[ULOC_FULLNAME_CAPACITY], toCountry[ULOC_FULLNAME_CAPACITY];
|
||||
|
||||
|
||||
int32_t fromVariantLen, toVariantLen;
|
||||
char fromVariant[ULOC_FULLNAME_CAPACITY], toVariant[ULOC_FULLNAME_CAPACITY];
|
||||
|
||||
|
|
@ -1834,7 +1841,7 @@ TestConsistentCountryInfo(void) {
|
|||
*/
|
||||
for (toLocIndex = fromLocIndex + 1; toLocIndex < locCount; toLocIndex++) {
|
||||
const char *toLocale = uloc_getAvailable(toLocIndex);
|
||||
|
||||
|
||||
toCountryLen = uloc_getCountry(toLocale, toCountry, ULOC_FULLNAME_CAPACITY, &errorCode);
|
||||
if(U_FAILURE(errorCode)) {
|
||||
log_err("Unknown failure fromLocale=%s toLocale=%s errorCode=%s\n",
|
||||
|
|
|
|||
|
|
@ -39,34 +39,34 @@ void addNumForTest(TestNode** root)
|
|||
|
||||
/** copy src to dst with unicode-escapes for values < 0x20 and > 0x7e, null terminate if possible */
|
||||
static int32_t ustrToAstr(const UChar* src, int32_t srcLength, char* dst, int32_t dstLength) {
|
||||
static const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
|
||||
static const char hex[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
|
||||
|
||||
char *p = dst;
|
||||
const char *e = p + dstLength;
|
||||
if (srcLength < 0) {
|
||||
const UChar* s = src;
|
||||
while (*s) ++s;
|
||||
srcLength = s - src;
|
||||
}
|
||||
while (p < e && --srcLength >= 0) {
|
||||
UChar c = *src++;
|
||||
if (c == 0xd || c == 0xa || c == 0x9 || (c>= 0x20 && c <= 0x7e)) {
|
||||
*p++ = (char) c & 0x7f;
|
||||
} else if (e - p >= 6) {
|
||||
*p++ = '\\';
|
||||
*p++ = 'u';
|
||||
*p++ = hex[(c >> 12) & 0xf];
|
||||
*p++ = hex[(c >> 8) & 0xf];
|
||||
*p++ = hex[(c >> 4) & 0xf];
|
||||
*p++ = hex[c & 0xf];
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (p < e) {
|
||||
*p = 0;
|
||||
}
|
||||
return p - dst;
|
||||
char *p = dst;
|
||||
const char *e = p + dstLength;
|
||||
if (srcLength < 0) {
|
||||
const UChar* s = src;
|
||||
while (*s) ++s;
|
||||
srcLength = s - src;
|
||||
}
|
||||
while (p < e && --srcLength >= 0) {
|
||||
UChar c = *src++;
|
||||
if (c == 0xd || c == 0xa || c == 0x9 || (c>= 0x20 && c <= 0x7e)) {
|
||||
*p++ = (char) c & 0x7f;
|
||||
} else if (e - p >= 6) {
|
||||
*p++ = '\\';
|
||||
*p++ = 'u';
|
||||
*p++ = hex[(c >> 12) & 0xf];
|
||||
*p++ = hex[(c >> 8) & 0xf];
|
||||
*p++ = hex[(c >> 4) & 0xf];
|
||||
*p++ = hex[c & 0xf];
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (p < e) {
|
||||
*p = 0;
|
||||
}
|
||||
return p - dst;
|
||||
}
|
||||
|
||||
/* test Number Format API */
|
||||
|
|
@ -623,34 +623,34 @@ uprv_free(result);
|
|||
log_verbose("Pass: attributes set and retrieved successfully\n");
|
||||
}
|
||||
|
||||
/*testing spellout format to make sure we can use it successfully.*/
|
||||
log_verbose("\nTesting spellout format\n");
|
||||
{
|
||||
int32_t values[] = { 0, -5, 105, 1005, 105050 };
|
||||
for (i = 0; i < LENGTH(values); ++i) {
|
||||
UChar buffer[128];
|
||||
int32_t len;
|
||||
int32_t value = values[i];
|
||||
status = U_ZERO_ERROR;
|
||||
len = unum_format(spellout_def, value, buffer, LENGTH(buffer), NULL, &status);
|
||||
if(U_FAILURE(status)) {
|
||||
log_err("Error in formatting using unum_format(spellout_fmt, ...): %s\n", myErrorName(status));
|
||||
} else {
|
||||
int32_t pp = 0;
|
||||
int32_t parseResult;
|
||||
char logbuf[256];
|
||||
ustrToAstr(buffer, len, logbuf, LENGTH(logbuf));
|
||||
log_verbose("formatted %d as '%s', length: %d\n", value, logbuf, len);
|
||||
/*testing spellout format to make sure we can use it successfully.*/
|
||||
log_verbose("\nTesting spellout format\n");
|
||||
{
|
||||
static const int32_t values[] = { 0, -5, 105, 1005, 105050 };
|
||||
for (i = 0; i < LENGTH(values); ++i) {
|
||||
UChar buffer[128];
|
||||
int32_t len;
|
||||
int32_t value = values[i];
|
||||
status = U_ZERO_ERROR;
|
||||
len = unum_format(spellout_def, value, buffer, LENGTH(buffer), NULL, &status);
|
||||
if(U_FAILURE(status)) {
|
||||
log_err("Error in formatting using unum_format(spellout_fmt, ...): %s\n", myErrorName(status));
|
||||
} else {
|
||||
int32_t pp = 0;
|
||||
int32_t parseResult;
|
||||
char logbuf[256];
|
||||
ustrToAstr(buffer, len, logbuf, LENGTH(logbuf));
|
||||
log_verbose("formatted %d as '%s', length: %d\n", value, logbuf, len);
|
||||
|
||||
parseResult = unum_parse(spellout_def, buffer, len, &pp, &status);
|
||||
if (U_FAILURE(status)) {
|
||||
log_err("Error in parsing using unum_format(spellout_fmt, ...): %s\n", myErrorName(status));
|
||||
} else if (parseResult != value) {
|
||||
log_err("unum_format result %d != value %d\n", parseResult, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
parseResult = unum_parse(spellout_def, buffer, len, &pp, &status);
|
||||
if (U_FAILURE(status)) {
|
||||
log_err("Error in parsing using unum_format(spellout_fmt, ...): %s\n", myErrorName(status));
|
||||
} else if (parseResult != value) {
|
||||
log_err("unum_format result %d != value %d\n", parseResult, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*closing the NumberFormat() using unum_close(UNumberFormat*)")*/
|
||||
unum_close(def);
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("tr", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing Turkish Collation with Tertiary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_TERTIARY);
|
||||
|
|
@ -113,7 +113,7 @@ static void TestPrimary()
|
|||
myCollation = ucol_open("tr", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing Turkish Collation with Primary strength\n");
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
|
|
|
|||
|
|
@ -1941,18 +1941,18 @@ static void TestUScriptCodeAPI(){
|
|||
log_err("uscript_getScript failed.\n");
|
||||
}
|
||||
}
|
||||
{
|
||||
{
|
||||
UScriptCode code= USCRIPT_INVALID_CODE;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
code = uscript_getScript(0x001D169,&status);
|
||||
if(code != USCRIPT_INHERITED){
|
||||
log_err("\\U001D169 is not contained in USCRIPT_INHERITED");
|
||||
}
|
||||
if(code != USCRIPT_INHERITED){
|
||||
log_err("\\U001D169 is not contained in USCRIPT_INHERITED");
|
||||
}
|
||||
}
|
||||
{
|
||||
uint32_t i = 0;
|
||||
UScriptCode code= USCRIPT_INVALID_CODE;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
int32_t err = 0;
|
||||
for(;i<=0x10ffff;i++){
|
||||
code = uscript_getScript(i,&status);
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ static void TestTertiary( )
|
|||
myCollation = ucol_open("en_US", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
log_verbose("Testing English Collation with Tertiary strength\n");
|
||||
|
||||
|
|
@ -306,7 +306,7 @@ static void TestPrimary()
|
|||
myCollation = ucol_open("en_US", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
ucol_setStrength(myCollation, UCOL_PRIMARY);
|
||||
log_verbose("Testing English Collation with Primary strength\n");
|
||||
|
|
@ -325,7 +325,7 @@ static void TestSecondary()
|
|||
myCollation = ucol_open("en_US", &status);
|
||||
if(U_FAILURE(status)){
|
||||
log_err("ERROR: in creation of rule based collator: %s\n", myErrorName(status));
|
||||
return;
|
||||
return;
|
||||
}
|
||||
ucol_setStrength(myCollation, UCOL_SECONDARY);
|
||||
log_verbose("Testing English Collation with Secondary strength\n");
|
||||
|
|
|
|||
|
|
@ -4705,7 +4705,7 @@ static void TestJitterbug981(){
|
|||
ucnv_reset(utf8cnv);
|
||||
status = U_ZERO_ERROR;
|
||||
bytes_needed = ucnv_fromUChars(utf8cnv, buff, target_cap,
|
||||
rules, rules_length, &status);
|
||||
rules, rules_length, &status);
|
||||
target_cap = (bytes_needed > target_cap) ? bytes_needed : target_cap +1;
|
||||
if(numNeeded!=0 && numNeeded!= bytes_needed){
|
||||
log_err("ucnv_fromUChars returns different values for required capacity in pre-flight and conversion modes");
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static void TestUDataOpen(){
|
|||
};
|
||||
const char* name = "test";
|
||||
const char* type = "dat";
|
||||
const char dirSepString[] = {U_FILE_SEP_CHAR, 0};
|
||||
const char dirSepString[] = {U_FILE_SEP_CHAR, 0};
|
||||
|
||||
char* path=(char*)malloc(sizeof(char) * (strlen(u_getDataDirectory())
|
||||
+ strlen(U_ICUDATA_NAME)
|
||||
|
|
@ -142,15 +142,15 @@ static void TestUDataOpen(){
|
|||
icuDataFilePath = (char *)malloc(strlen(u_getDataDirectory()) + 50);
|
||||
strcpy(icuDataFilePath, u_getDataDirectory());
|
||||
strcat(icuDataFilePath, "build");
|
||||
strcat(icuDataFilePath, dirSepString);
|
||||
strcat(icuDataFilePath, "tz.dat");
|
||||
strcat(icuDataFilePath, dirSepString);
|
||||
strcat(icuDataFilePath, "tz.dat");
|
||||
if (stat(icuDataFilePath, &stat_buf) == 0)
|
||||
{
|
||||
int i;
|
||||
strcpy(icuDataFilePath, u_getDataDirectory());
|
||||
strcat(icuDataFilePath, "build");
|
||||
strcat(icuDataFilePath, dirSepString);
|
||||
strcat(icuDataFilePath, "dummyLibraryName");
|
||||
strcat(icuDataFilePath, dirSepString);
|
||||
strcat(icuDataFilePath, "dummyLibraryName");
|
||||
log_verbose("Testing udata_open() on %s\n", icuDataFilePath);
|
||||
for(i=0; i<sizeof(memMap)/sizeof(memMap[0]); i++){
|
||||
status=U_ZERO_ERROR;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* Modification History:
|
||||
*
|
||||
* Date Name Description
|
||||
* 08/21/98 stephen Creation.
|
||||
* 08/21/98 stephen Creation.
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
|
@ -28,8 +28,8 @@ class IEEETest
|
|||
|
||||
// additive constants for flags
|
||||
enum EModeFlags {
|
||||
kNone = 0x00,
|
||||
kVerboseMode = 0x01
|
||||
kNone = 0x00,
|
||||
kVerboseMode = 0x01
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -37,54 +37,54 @@ class IEEETest
|
|||
~IEEETest();
|
||||
|
||||
// method returns the number of errors
|
||||
int run(void);
|
||||
int run(void);
|
||||
|
||||
private:
|
||||
// utility function for running a test function
|
||||
int runTest(const char *testName,
|
||||
int (IEEETest::*testFunc)(void));
|
||||
int runTest(const char *testName,
|
||||
int (IEEETest::*testFunc)(void));
|
||||
|
||||
// the actual tests; methods return the number of errors
|
||||
int testNaN(void);
|
||||
int testPositiveInfinity(void);
|
||||
int testNegativeInfinity(void);
|
||||
int testZero(void);
|
||||
int testNaN(void);
|
||||
int testPositiveInfinity(void);
|
||||
int testNegativeInfinity(void);
|
||||
int testZero(void);
|
||||
|
||||
// subtests of testNaN
|
||||
int testIsNaN(void);
|
||||
int NaNGT(void);
|
||||
int NaNLT(void);
|
||||
int NaNGTE(void);
|
||||
int NaNLTE(void);
|
||||
int NaNE(void);
|
||||
int NaNNE(void);
|
||||
int testIsNaN(void);
|
||||
int NaNGT(void);
|
||||
int NaNLT(void);
|
||||
int NaNGTE(void);
|
||||
int NaNLTE(void);
|
||||
int NaNE(void);
|
||||
int NaNNE(void);
|
||||
|
||||
|
||||
// logging utilities
|
||||
int getTestLevel(void) const;
|
||||
void increaseTestLevel(void);
|
||||
void decreaseTestLevel(void);
|
||||
int getTestLevel(void) const;
|
||||
void increaseTestLevel(void);
|
||||
void decreaseTestLevel(void);
|
||||
|
||||
IEEETest& log(char c);
|
||||
IEEETest& log(const char *s);
|
||||
IEEETest& log(int i);
|
||||
IEEETest& log(long l);
|
||||
IEEETest& log(double d);
|
||||
IEEETest& logln(void);
|
||||
IEEETest& log(char c);
|
||||
IEEETest& log(const char *s);
|
||||
IEEETest& log(int i);
|
||||
IEEETest& log(long l);
|
||||
IEEETest& log(double d);
|
||||
IEEETest& logln(void);
|
||||
|
||||
IEEETest& err(char c);
|
||||
IEEETest& err(const char *s);
|
||||
IEEETest& err(int i);
|
||||
IEEETest& err(long l);
|
||||
IEEETest& err(double d);
|
||||
IEEETest& errln(void);
|
||||
IEEETest& err(char c);
|
||||
IEEETest& err(const char *s);
|
||||
IEEETest& err(int i);
|
||||
IEEETest& err(long l);
|
||||
IEEETest& err(double d);
|
||||
IEEETest& errln(void);
|
||||
|
||||
// data members
|
||||
int mFlags; // flags - only verbose for now
|
||||
int mTestLevel; // indent level
|
||||
int mFlags; // flags - only verbose for now
|
||||
int mTestLevel; // indent level
|
||||
|
||||
short mNeedLogIndent;
|
||||
short mNeedErrIndent;
|
||||
short mNeedLogIndent;
|
||||
short mNeedErrIndent;
|
||||
};
|
||||
|
||||
inline int
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ void CompoundTransliteratorTest::TestGetSetAdoptTransliterator(){
|
|||
if (transarray2[0] != 0) {
|
||||
ct1->adoptTransliterators(transarray2, 1);
|
||||
}
|
||||
if(ct1->getCount() != 1 || ct1->getID() != ID3){
|
||||
if(ct1->getCount() != 1 || ct1->getID() != ID3){
|
||||
errln((UnicodeString)"Error: adoptTransliterators() failed.\n\t Count:- expected->1" + (UnicodeString)". got->" + ct1->getCount() +
|
||||
(UnicodeString)"\n\tID :- expected->" + ID3 + (UnicodeString)". got->" + ct1->getID());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ CollationDanishTest::CollationDanishTest()
|
|||
myCollation = Collator::createInstance(Locale("da", "DK", ""),status);
|
||||
if(!myCollation || U_FAILURE(status)) {
|
||||
errln(__FILE__ "failed to create! err " + UnicodeString(u_errorName(status)));
|
||||
/* if it wasn't already: */
|
||||
delete myCollation;
|
||||
myCollation = NULL;
|
||||
/* if it wasn't already: */
|
||||
delete myCollation;
|
||||
myCollation = NULL;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ void CollationDanishTest::TestTertiary(/* char* par */)
|
|||
/* problem in strcollinc for unfinshed contractions */
|
||||
if(U_FAILURE(status)){
|
||||
errln("ERROR: in setting normalization mode of the Danish collator\n");
|
||||
return;
|
||||
return;
|
||||
}
|
||||
for (i = 0; i < 5 ; i++) {
|
||||
doTest(testSourceCases[i], testTargetCases[i], results[i]);
|
||||
|
|
|
|||
|
|
@ -369,13 +369,13 @@ void IntlTest::setICU_DATA() {
|
|||
return;
|
||||
}
|
||||
|
||||
// U_TOPBUILDDIR is set by the makefiles on UNIXes when building cintltst and intltst
|
||||
// to point to the top of the build hierarchy, which may or
|
||||
// may not be the same as the source directory, depending on
|
||||
// the configure options used. At any rate,
|
||||
// set the data path to the built data from this directory.
|
||||
// The value is complete with quotes, so it can be used
|
||||
// as-is as a string constant.
|
||||
// U_TOPBUILDDIR is set by the makefiles on UNIXes when building cintltst and intltst
|
||||
// to point to the top of the build hierarchy, which may or
|
||||
// may not be the same as the source directory, depending on
|
||||
// the configure options used. At any rate,
|
||||
// set the data path to the built data from this directory.
|
||||
// The value is complete with quotes, so it can be used
|
||||
// as-is as a string constant.
|
||||
|
||||
#if defined (U_TOPBUILDDIR)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -105,20 +105,20 @@ void MajorTestLevel::runIndexedTest( int32_t index, UBool exec, const char* &nam
|
|||
callTest( test, par );
|
||||
}
|
||||
break;
|
||||
case 8: name = "rbnf";
|
||||
if (exec) {
|
||||
logln("TestSuite RuleBasedNumberFormat----"); logln();
|
||||
IntlTestRBNF test;
|
||||
callTest(test, par);
|
||||
}
|
||||
break;
|
||||
case 9: name = "rbnfrt";
|
||||
if (exec) {
|
||||
logln("TestSuite RuleBasedNumberFormat RT----"); logln();
|
||||
RbnfRoundTripTest test;
|
||||
callTest(test, par);
|
||||
}
|
||||
break;
|
||||
case 8: name = "rbnf";
|
||||
if (exec) {
|
||||
logln("TestSuite RuleBasedNumberFormat----"); logln();
|
||||
IntlTestRBNF test;
|
||||
callTest(test, par);
|
||||
}
|
||||
break;
|
||||
case 9: name = "rbnfrt";
|
||||
if (exec) {
|
||||
logln("TestSuite RuleBasedNumberFormat RT----"); logln();
|
||||
RbnfRoundTripTest test;
|
||||
callTest(test, par);
|
||||
}
|
||||
break;
|
||||
|
||||
default: name = ""; break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ void IntlTestRBNF::runIndexedTest(int32_t index, UBool exec, const char* &name,
|
|||
TESTCASE(10, TestFractionalRuleSet);
|
||||
// TESTCASE(11, TestLLong);
|
||||
#else
|
||||
TESTCASE(0, TestRBNFDisabled);
|
||||
TESTCASE(0, TestRBNFDisabled);
|
||||
#endif
|
||||
default:
|
||||
name = "";
|
||||
|
|
@ -1406,7 +1406,7 @@ IntlTestRBNF::doLenientParseTest(RuleBasedNumberFormat* formatter, const char* t
|
|||
|
||||
void
|
||||
IntlTestRBNF::TestRBNFDisabled() {
|
||||
errln("*** RBNF currently disabled on this platform ***\n");
|
||||
errln("*** RBNF currently disabled on this platform ***\n");
|
||||
}
|
||||
|
||||
/* U_HAVE_RBNF */
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ void RbnfRoundTripTest::runIndexedTest(int32_t index, UBool exec, const char* &n
|
|||
TESTCASE(10, TestRussianSpelloutRT);
|
||||
TESTCASE(11, TestGreekSpelloutRT);
|
||||
#else
|
||||
TESTCASE(0, TestRBNFDisabled);
|
||||
TESTCASE(0, TestRBNFDisabled);
|
||||
#endif
|
||||
default:
|
||||
name = "";
|
||||
|
|
@ -350,7 +350,7 @@ RbnfRoundTripTest::doTest(const RuleBasedNumberFormat* formatter,
|
|||
|
||||
void
|
||||
RbnfRoundTripTest::TestRBNFDisabled() {
|
||||
errln("*** RBNF currently disabled on this platform ***\n");
|
||||
errln("*** RBNF currently disabled on this platform ***\n");
|
||||
}
|
||||
|
||||
/* U_HAVE_RBNF */
|
||||
|
|
|
|||
|
|
@ -355,11 +355,11 @@ JamoTest::TestRealText() {
|
|||
Transliterator* hangulJamo = jamoHangul->createInverse(status);
|
||||
if (jamoLatin == 0 || hangulJamo == 0) {
|
||||
errln("FAIL: createInverse returned NULL");
|
||||
delete latinJamo;
|
||||
delete jamoLatin;
|
||||
delete jamoHangul;
|
||||
delete hangulJamo;
|
||||
return;
|
||||
delete latinJamo;
|
||||
delete jamoLatin;
|
||||
delete jamoHangul;
|
||||
delete hangulJamo;
|
||||
return;
|
||||
}
|
||||
|
||||
Transliterator* tarray[4] =
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@ LotusCollationKoreanTest::~LotusCollationKoreanTest()
|
|||
}
|
||||
|
||||
const UChar LotusCollationKoreanTest::testSourceCases[][LotusCollationKoreanTest::MAX_TOKEN_LEN] = {
|
||||
{0xac00, 0}
|
||||
{0xac00, 0}
|
||||
|
||||
};
|
||||
|
||||
const UChar LotusCollationKoreanTest::testTargetCases[][LotusCollationKoreanTest::MAX_TOKEN_LEN] = {
|
||||
{0xac01, 0}
|
||||
{0xac01, 0}
|
||||
};
|
||||
|
||||
const Collator::EComparisonResult LotusCollationKoreanTest::results[] = {
|
||||
|
|
@ -67,12 +67,11 @@ void LotusCollationKoreanTest::doTest( UnicodeString source, UnicodeString targe
|
|||
void LotusCollationKoreanTest::TestTertiary(/* char* par */)
|
||||
{
|
||||
int32_t i = 0;
|
||||
myCollation->setStrength(Collator::TERTIARY);
|
||||
|
||||
myCollation->setStrength(Collator::TERTIARY);
|
||||
|
||||
for (i = 0; i < 1; i++) {
|
||||
doTest(testSourceCases[i], testTargetCases[i], results[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void LotusCollationKoreanTest::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )
|
||||
|
|
|
|||
|
|
@ -911,8 +911,8 @@ void CollationRegressionTest::Test4141640(/* char* par */)
|
|||
for (i = 0; i < localeCount; i += 1)
|
||||
{
|
||||
Collator *c = NULL;
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
|
||||
status = U_ZERO_ERROR;
|
||||
c = Collator::createInstance(locales[i], status);
|
||||
|
||||
if (c == NULL || U_FAILURE(status))
|
||||
|
|
|
|||
|
|
@ -2434,11 +2434,11 @@ void TransliteratorTest::TestTeluguLatinRT(){
|
|||
const int MAX_LEN=10;
|
||||
const char* const source[MAX_LEN] = {
|
||||
"raghur\\u0101m vi\\u015Bvan\\u0101dha", /* Raghuram Viswanadha */
|
||||
"\\u0101nand vaddir\\u0101ju", /* Anand Vaddiraju */
|
||||
"r\\u0101j\\u012Bv ka\\u015Barab\\u0101da", /* Rajeev Kasarabada */
|
||||
"\\u0101nand vaddir\\u0101ju", /* Anand Vaddiraju */
|
||||
"r\\u0101j\\u012Bv ka\\u015Barab\\u0101da", /* Rajeev Kasarabada */
|
||||
"san\\u0304j\\u012Bv ka\\u015Barab\\u0101da", /* sanjeev kasarabada */
|
||||
"san\\u0304j\\u012Bb sen'gupta", /* sanjib sengupata */
|
||||
"amar\\u0113ndra hanum\\u0101nula", /* Amarendra hanumanula */
|
||||
"san\\u0304j\\u012Bb sen'gupta", /* sanjib sengupata */
|
||||
"amar\\u0113ndra hanum\\u0101nula", /* Amarendra hanumanula */
|
||||
"ravi kum\\u0101r vi\\u015Bvan\\u0101dha", /* Ravi Kumar Viswanadha */
|
||||
"\\u0101ditya kandr\\u0113gula", /* Aditya Kandregula */
|
||||
"\\u015Br\\u012Bdhar ka\\u1E47\\u1E6Dama\\u015Be\\u1E6D\\u1E6Di",/* Shridhar Kantamsetty */
|
||||
|
|
|
|||
|
|
@ -457,10 +457,10 @@ void UnicodeTest::TestUnicodeData()
|
|||
strcat(newPath, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
|
||||
|
||||
|
||||
// As a fallback, try to guess where the source data was located
|
||||
// at the time ICU was built, and look there.
|
||||
// As a fallback, try to guess where the source data was located
|
||||
// at the time ICU was built, and look there.
|
||||
# if defined (U_TOPSRCDIR)
|
||||
strcpy(backupPath, U_TOPSRCDIR U_FILE_SEP_STRING "data");
|
||||
strcpy(backupPath, U_TOPSRCDIR U_FILE_SEP_STRING "data");
|
||||
# else
|
||||
strcpy(backupPath, u_getDataDirectory());
|
||||
strcat(backupPath, ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
|
||||
|
|
|
|||
|
|
@ -29,227 +29,227 @@
|
|||
FontObject::FontObject(char *fileName)
|
||||
: directory(NULL), numTables(0), searchRange(0),entrySelector(0),
|
||||
cmapTable(NULL), cmSegCount(0), cmSearchRange(0), cmEntrySelector(0),
|
||||
cmEndCodes(NULL), cmStartCodes(NULL), cmIdDelta(0), cmIdRangeOffset(0),
|
||||
headTable(NULL), hmtxTable(NULL), numGlyphs(0), numOfLongHorMetrics(0), file(NULL)
|
||||
cmEndCodes(NULL), cmStartCodes(NULL), cmIdDelta(0), cmIdRangeOffset(0),
|
||||
headTable(NULL), hmtxTable(NULL), numGlyphs(0), numOfLongHorMetrics(0), file(NULL)
|
||||
{
|
||||
file = fopen(fileName, "rb");
|
||||
file = fopen(fileName, "rb");
|
||||
|
||||
if (file == NULL) {
|
||||
printf("?? Couldn't open %s", fileName);
|
||||
return;
|
||||
}
|
||||
if (file == NULL) {
|
||||
printf("?? Couldn't open %s", fileName);
|
||||
return;
|
||||
}
|
||||
|
||||
SFNTDirectory tempDir;
|
||||
SFNTDirectory tempDir;
|
||||
|
||||
fread(&tempDir, sizeof tempDir, 1, file);
|
||||
fread(&tempDir, sizeof tempDir, 1, file);
|
||||
|
||||
numTables = SWAPW(tempDir.numTables);
|
||||
searchRange = SWAPW(tempDir.searchRange) >> 4;
|
||||
entrySelector = SWAPW(tempDir.entrySelector);
|
||||
rangeShift = SWAPW(tempDir.rangeShift) >> 4;
|
||||
numTables = SWAPW(tempDir.numTables);
|
||||
searchRange = SWAPW(tempDir.searchRange) >> 4;
|
||||
entrySelector = SWAPW(tempDir.entrySelector);
|
||||
rangeShift = SWAPW(tempDir.rangeShift) >> 4;
|
||||
|
||||
int dirSize = sizeof tempDir + ((numTables - ANY_NUMBER) * sizeof(DirectoryEntry));
|
||||
int dirSize = sizeof tempDir + ((numTables - ANY_NUMBER) * sizeof(DirectoryEntry));
|
||||
|
||||
directory = (SFNTDirectory *) new char[dirSize];
|
||||
directory = (SFNTDirectory *) new char[dirSize];
|
||||
|
||||
fseek(file, 0L, SEEK_SET);
|
||||
fread(directory, sizeof(char), dirSize, file);
|
||||
fseek(file, 0L, SEEK_SET);
|
||||
fread(directory, sizeof(char), dirSize, file);
|
||||
|
||||
initUnicodeCMAP();
|
||||
initUnicodeCMAP();
|
||||
}
|
||||
|
||||
FontObject::~FontObject()
|
||||
{
|
||||
fclose(file);
|
||||
delete[] directory;
|
||||
delete[] cmapTable;
|
||||
delete[] headTable;
|
||||
delete[] hmtxTable;
|
||||
delete[] directory;
|
||||
delete[] cmapTable;
|
||||
delete[] headTable;
|
||||
delete[] hmtxTable;
|
||||
}
|
||||
|
||||
void FontObject::deleteTable(void *table)
|
||||
{
|
||||
delete[] (char *) table;
|
||||
delete[] (char *) table;
|
||||
}
|
||||
|
||||
DirectoryEntry *FontObject::findTable(LETag tag)
|
||||
{
|
||||
le_uint16 table = 0;
|
||||
le_uint16 probe = 1 << entrySelector;
|
||||
le_uint16 table = 0;
|
||||
le_uint16 probe = 1 << entrySelector;
|
||||
|
||||
if (SWAPL(directory->tableDirectory[rangeShift].tag) <= tag) {
|
||||
table = rangeShift;
|
||||
}
|
||||
if (SWAPL(directory->tableDirectory[rangeShift].tag) <= tag) {
|
||||
table = rangeShift;
|
||||
}
|
||||
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
|
||||
if (SWAPL(directory->tableDirectory[table + probe].tag) <= tag) {
|
||||
table += probe;
|
||||
}
|
||||
}
|
||||
if (SWAPL(directory->tableDirectory[table + probe].tag) <= tag) {
|
||||
table += probe;
|
||||
}
|
||||
}
|
||||
|
||||
if (SWAPL(directory->tableDirectory[table].tag) == tag) {
|
||||
return &directory->tableDirectory[table];
|
||||
}
|
||||
if (SWAPL(directory->tableDirectory[table].tag) == tag) {
|
||||
return &directory->tableDirectory[table];
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void *FontObject::readTable(LETag tag, le_uint32 *length)
|
||||
{
|
||||
DirectoryEntry *entry = findTable(tag);
|
||||
DirectoryEntry *entry = findTable(tag);
|
||||
|
||||
if (entry == NULL) {
|
||||
*length = 0;
|
||||
return NULL;
|
||||
}
|
||||
if (entry == NULL) {
|
||||
*length = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
*length = SWAPL(entry->length);
|
||||
*length = SWAPL(entry->length);
|
||||
|
||||
void *table = new char[*length];
|
||||
void *table = new char[*length];
|
||||
|
||||
fseek(file, SWAPL(entry->offset), SEEK_SET);
|
||||
fread(table, sizeof(char), *length, file);
|
||||
fseek(file, SWAPL(entry->offset), SEEK_SET);
|
||||
fread(table, sizeof(char), *length, file);
|
||||
|
||||
return table;
|
||||
return table;
|
||||
}
|
||||
|
||||
CMAPEncodingSubtable *FontObject::findCMAP(le_uint16 platformID, le_uint16 platformSpecificID)
|
||||
{
|
||||
LETag cmapTag = 0x636D6170; // 'cmap'
|
||||
LETag cmapTag = 0x636D6170; // 'cmap'
|
||||
|
||||
if (cmapTable == NULL) {
|
||||
le_uint32 length;
|
||||
if (cmapTable == NULL) {
|
||||
le_uint32 length;
|
||||
|
||||
cmapTable = (CMAPTable *) readTable(cmapTag, &length);
|
||||
}
|
||||
cmapTable = (CMAPTable *) readTable(cmapTag, &length);
|
||||
}
|
||||
|
||||
if (cmapTable != NULL) {
|
||||
le_uint16 i;
|
||||
le_uint16 nSubtables = SWAPW(cmapTable->numberSubtables);
|
||||
if (cmapTable != NULL) {
|
||||
le_uint16 i;
|
||||
le_uint16 nSubtables = SWAPW(cmapTable->numberSubtables);
|
||||
|
||||
|
||||
for (i = 0; i < nSubtables; i += 1) {
|
||||
CMAPEncodingSubtableHeader *esh = &cmapTable->encodingSubtableHeaders[i];
|
||||
for (i = 0; i < nSubtables; i += 1) {
|
||||
CMAPEncodingSubtableHeader *esh = &cmapTable->encodingSubtableHeaders[i];
|
||||
|
||||
if (SWAPW(esh->platformID) == platformID &&
|
||||
SWAPW(esh->platformSpecificID) == platformSpecificID) {
|
||||
return (CMAPEncodingSubtable *) ((char *) cmapTable + SWAPL(esh->encodingOffset));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (SWAPW(esh->platformID) == platformID &&
|
||||
SWAPW(esh->platformSpecificID) == platformSpecificID) {
|
||||
return (CMAPEncodingSubtable *) ((char *) cmapTable + SWAPL(esh->encodingOffset));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void FontObject::initUnicodeCMAP()
|
||||
{
|
||||
CMAPEncodingSubtable *encodingSubtable = findCMAP(3, 1);
|
||||
CMAPEncodingSubtable *encodingSubtable = findCMAP(3, 1);
|
||||
|
||||
if (encodingSubtable == 0 ||
|
||||
SWAPW(encodingSubtable->format) != 4) {
|
||||
printf("Can't find unicode 'cmap'");
|
||||
return;
|
||||
}
|
||||
if (encodingSubtable == 0 ||
|
||||
SWAPW(encodingSubtable->format) != 4) {
|
||||
printf("Can't find unicode 'cmap'");
|
||||
return;
|
||||
}
|
||||
|
||||
CMAPFormat4Encoding *header = (CMAPFormat4Encoding *) encodingSubtable;
|
||||
CMAPFormat4Encoding *header = (CMAPFormat4Encoding *) encodingSubtable;
|
||||
|
||||
cmSegCount = SWAPW(header->segCountX2) / 2;
|
||||
cmSearchRange = SWAPW(header->searchRange);
|
||||
cmEntrySelector = SWAPW(header->entrySelector);
|
||||
cmRangeShift = SWAPW(header->rangeShift) / 2;
|
||||
cmEndCodes = &header->endCodes[0];
|
||||
cmStartCodes = &header->endCodes[cmSegCount + 1]; // + 1 for reservedPad...
|
||||
cmIdDelta = &cmStartCodes[cmSegCount];
|
||||
cmIdRangeOffset = &cmIdDelta[cmSegCount];
|
||||
cmSegCount = SWAPW(header->segCountX2) / 2;
|
||||
cmSearchRange = SWAPW(header->searchRange);
|
||||
cmEntrySelector = SWAPW(header->entrySelector);
|
||||
cmRangeShift = SWAPW(header->rangeShift) / 2;
|
||||
cmEndCodes = &header->endCodes[0];
|
||||
cmStartCodes = &header->endCodes[cmSegCount + 1]; // + 1 for reservedPad...
|
||||
cmIdDelta = &cmStartCodes[cmSegCount];
|
||||
cmIdRangeOffset = &cmIdDelta[cmSegCount];
|
||||
}
|
||||
|
||||
LEGlyphID FontObject::unicodeToGlyph(LEUnicode32 unicode32)
|
||||
{
|
||||
if (unicode32 >= 0x10000) {
|
||||
return 0;
|
||||
}
|
||||
if (unicode32 >= 0x10000) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
LEUnicode16 unicode = (LEUnicode16) unicode32;
|
||||
le_uint16 index = 0;
|
||||
le_uint16 probe = 1 << cmEntrySelector;
|
||||
LEGlyphID result = 0;
|
||||
LEUnicode16 unicode = (LEUnicode16) unicode32;
|
||||
le_uint16 index = 0;
|
||||
le_uint16 probe = 1 << cmEntrySelector;
|
||||
LEGlyphID result = 0;
|
||||
|
||||
if (SWAPW(cmStartCodes[cmRangeShift]) <= unicode) {
|
||||
index = cmRangeShift;
|
||||
}
|
||||
if (SWAPW(cmStartCodes[cmRangeShift]) <= unicode) {
|
||||
index = cmRangeShift;
|
||||
}
|
||||
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
|
||||
if (SWAPW(cmStartCodes[index + probe]) <= unicode) {
|
||||
index += probe;
|
||||
}
|
||||
}
|
||||
if (SWAPW(cmStartCodes[index + probe]) <= unicode) {
|
||||
index += probe;
|
||||
}
|
||||
}
|
||||
|
||||
if (unicode >= SWAPW(cmStartCodes[index]) && unicode <= SWAPW(cmEndCodes[index])) {
|
||||
if (cmIdRangeOffset[index] == 0) {
|
||||
result = (LEGlyphID) unicode;
|
||||
} else {
|
||||
le_uint16 offset = unicode - SWAPW(cmStartCodes[index]);
|
||||
le_uint16 rangeOffset = SWAPW(cmIdRangeOffset[index]);
|
||||
le_uint16 *glyphIndexTable = (le_uint16 *) ((char *) &cmIdRangeOffset[index] + rangeOffset);
|
||||
if (unicode >= SWAPW(cmStartCodes[index]) && unicode <= SWAPW(cmEndCodes[index])) {
|
||||
if (cmIdRangeOffset[index] == 0) {
|
||||
result = (LEGlyphID) unicode;
|
||||
} else {
|
||||
le_uint16 offset = unicode - SWAPW(cmStartCodes[index]);
|
||||
le_uint16 rangeOffset = SWAPW(cmIdRangeOffset[index]);
|
||||
le_uint16 *glyphIndexTable = (le_uint16 *) ((char *) &cmIdRangeOffset[index] + rangeOffset);
|
||||
|
||||
result = SWAPW(glyphIndexTable[offset]);
|
||||
}
|
||||
result = SWAPW(glyphIndexTable[offset]);
|
||||
}
|
||||
|
||||
result += SWAPW(cmIdDelta[index]);
|
||||
} else {
|
||||
result = 0;
|
||||
}
|
||||
result += SWAPW(cmIdDelta[index]);
|
||||
} else {
|
||||
result = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
le_uint16 FontObject::getUnitsPerEM()
|
||||
{
|
||||
if (headTable == NULL) {
|
||||
LETag headTag = 0x68656164; // 'head'
|
||||
le_uint32 length;
|
||||
if (headTable == NULL) {
|
||||
LETag headTag = 0x68656164; // 'head'
|
||||
le_uint32 length;
|
||||
|
||||
headTable = (HEADTable *) readTable(headTag, &length);
|
||||
}
|
||||
headTable = (HEADTable *) readTable(headTag, &length);
|
||||
}
|
||||
|
||||
return SWAPW(headTable->unitsPerEm);
|
||||
return SWAPW(headTable->unitsPerEm);
|
||||
}
|
||||
|
||||
le_uint16 FontObject::getGlyphAdvance(LEGlyphID glyph)
|
||||
{
|
||||
if (hmtxTable == NULL) {
|
||||
LETag maxpTag = 0x6D617870; // 'maxp'
|
||||
LETag hheaTag = 0x68686561; // 'hhea'
|
||||
LETag hmtxTag = 0x686D7478; // 'hmtx'
|
||||
le_uint32 length;
|
||||
HHEATable *hheaTable;
|
||||
MAXPTable *maxpTable = (MAXPTable *) readTable(maxpTag, &length);
|
||||
if (hmtxTable == NULL) {
|
||||
LETag maxpTag = 0x6D617870; // 'maxp'
|
||||
LETag hheaTag = 0x68686561; // 'hhea'
|
||||
LETag hmtxTag = 0x686D7478; // 'hmtx'
|
||||
le_uint32 length;
|
||||
HHEATable *hheaTable;
|
||||
MAXPTable *maxpTable = (MAXPTable *) readTable(maxpTag, &length);
|
||||
|
||||
numGlyphs = SWAPW(maxpTable->numGlyphs);
|
||||
deleteTable(maxpTable);
|
||||
numGlyphs = SWAPW(maxpTable->numGlyphs);
|
||||
deleteTable(maxpTable);
|
||||
|
||||
hheaTable = (HHEATable *) readTable(hheaTag, &length);
|
||||
numOfLongHorMetrics = SWAPW(hheaTable->numOfLongHorMetrics);
|
||||
deleteTable(hheaTable);
|
||||
hheaTable = (HHEATable *) readTable(hheaTag, &length);
|
||||
numOfLongHorMetrics = SWAPW(hheaTable->numOfLongHorMetrics);
|
||||
deleteTable(hheaTable);
|
||||
|
||||
hmtxTable = (HMTXTable *) readTable(hmtxTag, &length);
|
||||
}
|
||||
hmtxTable = (HMTXTable *) readTable(hmtxTag, &length);
|
||||
}
|
||||
|
||||
le_uint16 index = glyph;
|
||||
le_uint16 index = glyph;
|
||||
|
||||
if (glyph >= numGlyphs) {
|
||||
return 0;
|
||||
}
|
||||
if (glyph >= numGlyphs) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (glyph >= numOfLongHorMetrics) {
|
||||
index = numOfLongHorMetrics - 1;
|
||||
}
|
||||
if (glyph >= numOfLongHorMetrics) {
|
||||
index = numOfLongHorMetrics - 1;
|
||||
}
|
||||
|
||||
return SWAPW(hmtxTable->hMetrics[index].advanceWidth);
|
||||
return SWAPW(hmtxTable->hMetrics[index].advanceWidth);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,214 +34,214 @@
|
|||
|
||||
struct DirectoryEntry
|
||||
{
|
||||
le_uint32 tag;
|
||||
le_uint32 checksum;
|
||||
le_uint32 offset;
|
||||
le_uint32 length;
|
||||
le_uint32 tag;
|
||||
le_uint32 checksum;
|
||||
le_uint32 offset;
|
||||
le_uint32 length;
|
||||
};
|
||||
|
||||
struct SFNTDirectory
|
||||
{
|
||||
le_uint32 scalerType;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
DirectoryEntry tableDirectory[ANY_NUMBER];
|
||||
le_uint32 scalerType;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
DirectoryEntry tableDirectory[ANY_NUMBER];
|
||||
};
|
||||
|
||||
|
||||
struct CMAPEncodingSubtableHeader
|
||||
{
|
||||
le_uint16 platformID;
|
||||
le_uint16 platformSpecificID;
|
||||
le_uint32 encodingOffset;
|
||||
le_uint16 platformID;
|
||||
le_uint16 platformSpecificID;
|
||||
le_uint32 encodingOffset;
|
||||
};
|
||||
|
||||
struct CMAPTable
|
||||
{
|
||||
le_uint16 version;
|
||||
le_uint16 numberSubtables;
|
||||
CMAPEncodingSubtableHeader encodingSubtableHeaders[ANY_NUMBER];
|
||||
le_uint16 version;
|
||||
le_uint16 numberSubtables;
|
||||
CMAPEncodingSubtableHeader encodingSubtableHeaders[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 format;
|
||||
le_uint16 length;
|
||||
le_uint16 language;
|
||||
le_uint16 format;
|
||||
le_uint16 length;
|
||||
le_uint16 language;
|
||||
};
|
||||
|
||||
struct CMAPFormat0Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint8 glyphIndexArray[256];
|
||||
le_uint8 glyphIndexArray[256];
|
||||
};
|
||||
|
||||
struct CMAPFormat2Subheader
|
||||
{
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_int16 idDelta;
|
||||
le_uint16 idRangeOffset;
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_int16 idDelta;
|
||||
le_uint16 idRangeOffset;
|
||||
};
|
||||
|
||||
struct CMAPFormat2Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 subHeadKeys[256];
|
||||
CMAPFormat2Subheader subheaders[ANY_NUMBER];
|
||||
le_uint16 subHeadKeys[256];
|
||||
CMAPFormat2Subheader subheaders[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat4Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 segCountX2;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
le_uint16 endCodes[ANY_NUMBER];
|
||||
// le_uint16 reservedPad;
|
||||
// le_uint16 startCodes[ANY_NUMBER];
|
||||
// le_uint16 idDelta[ANY_NUMBER];
|
||||
// le_uint16 idRangeOffset[ANY_NUMBER];
|
||||
// le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
le_uint16 segCountX2;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
le_uint16 endCodes[ANY_NUMBER];
|
||||
// le_uint16 reservedPad;
|
||||
// le_uint16 startCodes[ANY_NUMBER];
|
||||
// le_uint16 idDelta[ANY_NUMBER];
|
||||
// le_uint16 idRangeOffset[ANY_NUMBER];
|
||||
// le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat6Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
};
|
||||
|
||||
typedef le_int32 fixed;
|
||||
|
||||
struct BigDate
|
||||
{
|
||||
le_uint32 bc;
|
||||
le_uint32 ad;
|
||||
le_uint32 bc;
|
||||
le_uint32 ad;
|
||||
};
|
||||
|
||||
struct HEADTable
|
||||
{
|
||||
fixed version;
|
||||
fixed fontRevision;
|
||||
le_uint32 checksumAdjustment;
|
||||
le_uint32 magicNumber;
|
||||
le_uint16 flags;
|
||||
le_uint16 unitsPerEm;
|
||||
BigDate created;
|
||||
BigDate modified;
|
||||
le_int16 xMin;
|
||||
le_int16 yMin;
|
||||
le_int16 xMax;
|
||||
le_int16 yMax;
|
||||
le_int16 lowestRecPPEM;
|
||||
le_int16 fontDirectionHint;
|
||||
le_int16 indexToLocFormat;
|
||||
le_int16 glyphDataFormat;
|
||||
fixed version;
|
||||
fixed fontRevision;
|
||||
le_uint32 checksumAdjustment;
|
||||
le_uint32 magicNumber;
|
||||
le_uint16 flags;
|
||||
le_uint16 unitsPerEm;
|
||||
BigDate created;
|
||||
BigDate modified;
|
||||
le_int16 xMin;
|
||||
le_int16 yMin;
|
||||
le_int16 xMax;
|
||||
le_int16 yMax;
|
||||
le_int16 lowestRecPPEM;
|
||||
le_int16 fontDirectionHint;
|
||||
le_int16 indexToLocFormat;
|
||||
le_int16 glyphDataFormat;
|
||||
};
|
||||
|
||||
struct MAXPTable
|
||||
{
|
||||
fixed version;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 maxPoints;
|
||||
le_uint16 maxContours;
|
||||
le_uint16 maxComponentPoints;
|
||||
le_uint16 maxComponentContours;
|
||||
le_uint16 maxZones;
|
||||
le_uint16 maxTwilightPoints;
|
||||
le_uint16 maxStorage;
|
||||
le_uint16 maxFunctionDefs;
|
||||
le_uint16 maxInstructionDefs;
|
||||
le_uint16 maxStackElements;
|
||||
le_uint16 maxSizeOfInstructions;
|
||||
le_uint16 maxComponentElements;
|
||||
le_uint16 maxComponentDepth;
|
||||
fixed version;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 maxPoints;
|
||||
le_uint16 maxContours;
|
||||
le_uint16 maxComponentPoints;
|
||||
le_uint16 maxComponentContours;
|
||||
le_uint16 maxZones;
|
||||
le_uint16 maxTwilightPoints;
|
||||
le_uint16 maxStorage;
|
||||
le_uint16 maxFunctionDefs;
|
||||
le_uint16 maxInstructionDefs;
|
||||
le_uint16 maxStackElements;
|
||||
le_uint16 maxSizeOfInstructions;
|
||||
le_uint16 maxComponentElements;
|
||||
le_uint16 maxComponentDepth;
|
||||
};
|
||||
|
||||
struct HHEATable
|
||||
{
|
||||
fixed version;
|
||||
le_int16 ascent;
|
||||
le_int16 descent;
|
||||
le_int16 lineGap;
|
||||
le_uint16 advanceWidthMax;
|
||||
le_int16 minLeftSideBearing;
|
||||
le_int16 minRightSideBearing;
|
||||
le_int16 xMaxExtent;
|
||||
le_int16 caretSlopeRise;
|
||||
le_int16 caretSlopeRun;
|
||||
le_int16 caretOffset;
|
||||
le_int16 reserved1;
|
||||
le_int16 reserved2;
|
||||
le_int16 reserved3;
|
||||
le_int16 reserved4;
|
||||
le_int16 metricDataFormat;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
fixed version;
|
||||
le_int16 ascent;
|
||||
le_int16 descent;
|
||||
le_int16 lineGap;
|
||||
le_uint16 advanceWidthMax;
|
||||
le_int16 minLeftSideBearing;
|
||||
le_int16 minRightSideBearing;
|
||||
le_int16 xMaxExtent;
|
||||
le_int16 caretSlopeRise;
|
||||
le_int16 caretSlopeRun;
|
||||
le_int16 caretOffset;
|
||||
le_int16 reserved1;
|
||||
le_int16 reserved2;
|
||||
le_int16 reserved3;
|
||||
le_int16 reserved4;
|
||||
le_int16 metricDataFormat;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
};
|
||||
|
||||
struct LongHorMetric
|
||||
{
|
||||
le_uint16 advanceWidth;
|
||||
le_int16 leftSideBearing;
|
||||
le_uint16 advanceWidth;
|
||||
le_int16 leftSideBearing;
|
||||
};
|
||||
|
||||
struct HMTXTable
|
||||
{
|
||||
LongHorMetric hMetrics[ANY_NUMBER]; // ANY_NUMBER = numOfLongHorMetrics from hhea table
|
||||
// le_int16 leftSideBearing[ANY_NUMBER]; // ANY_NUMBER = numGlyphs - numOfLongHorMetrics
|
||||
LongHorMetric hMetrics[ANY_NUMBER]; // ANY_NUMBER = numOfLongHorMetrics from hhea table
|
||||
// le_int16 leftSideBearing[ANY_NUMBER]; // ANY_NUMBER = numGlyphs - numOfLongHorMetrics
|
||||
};
|
||||
|
||||
class FontObject
|
||||
{
|
||||
public:
|
||||
FontObject(char *fontName);
|
||||
~FontObject();
|
||||
FontObject(char *fontName);
|
||||
~FontObject();
|
||||
|
||||
void *readTable(LETag tag, le_uint32 *length);
|
||||
void deleteTable(void *table);
|
||||
void *readTable(LETag tag, le_uint32 *length);
|
||||
void deleteTable(void *table);
|
||||
|
||||
LEGlyphID unicodeToGlyph(LEUnicode32 unicode);
|
||||
LEGlyphID unicodeToGlyph(LEUnicode32 unicode);
|
||||
|
||||
#if 0
|
||||
le_uint32 unicodesToGlyphs(LEUnicode *chars, le_uint32 nChars, LEGlyphID *glyphs,
|
||||
le_uint32 unicodesToGlyphs(LEUnicode *chars, le_uint32 nChars, LEGlyphID *glyphs,
|
||||
le_uint32 *charIndices, le_bool rightToLeft);
|
||||
#endif
|
||||
|
||||
le_uint16 getUnitsPerEM();
|
||||
le_uint16 getUnitsPerEM();
|
||||
|
||||
le_uint16 getGlyphAdvance(LEGlyphID glyph);
|
||||
le_uint16 getGlyphAdvance(LEGlyphID glyph);
|
||||
|
||||
private:
|
||||
FontObject();
|
||||
FontObject();
|
||||
|
||||
DirectoryEntry *findTable(LETag tag);
|
||||
CMAPEncodingSubtable *findCMAP(le_uint16 platformID, le_uint16 platformSpecificID);
|
||||
void initUnicodeCMAP();
|
||||
DirectoryEntry *findTable(LETag tag);
|
||||
CMAPEncodingSubtable *findCMAP(le_uint16 platformID, le_uint16 platformSpecificID);
|
||||
void initUnicodeCMAP();
|
||||
|
||||
SFNTDirectory *directory;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
SFNTDirectory *directory;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
|
||||
CMAPTable *cmapTable;
|
||||
le_uint16 cmSegCount;
|
||||
le_uint16 cmSearchRange;
|
||||
le_uint16 cmEntrySelector;
|
||||
le_uint16 cmRangeShift;
|
||||
le_uint16 *cmEndCodes;
|
||||
le_uint16 *cmStartCodes;
|
||||
le_uint16 *cmIdDelta;
|
||||
le_uint16 *cmIdRangeOffset;
|
||||
CMAPTable *cmapTable;
|
||||
le_uint16 cmSegCount;
|
||||
le_uint16 cmSearchRange;
|
||||
le_uint16 cmEntrySelector;
|
||||
le_uint16 cmRangeShift;
|
||||
le_uint16 *cmEndCodes;
|
||||
le_uint16 *cmStartCodes;
|
||||
le_uint16 *cmIdDelta;
|
||||
le_uint16 *cmIdRangeOffset;
|
||||
|
||||
HEADTable *headTable;
|
||||
HEADTable *headTable;
|
||||
|
||||
HMTXTable *hmtxTable;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
HMTXTable *hmtxTable;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
|
||||
FILE *file;
|
||||
FILE *file;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -66,41 +66,41 @@ le_int8 PortableFontInstance::highBit(le_int32 value)
|
|||
PortableFontInstance::PortableFontInstance(char *fileName, float pointSize, PFIErrorCode &status)
|
||||
: fFile(NULL), fUnitsPerEM(0), fPointSize(pointSize), fDirectory(NULL),
|
||||
fTableCache(NULL), fTableCacheCurr(0), fTableCacheSize(0), fCMAPMapper(NULL),
|
||||
fHMTXTable(NULL), fNumGlyphs(0), fNumLongHorMetrics(0)
|
||||
fHMTXTable(NULL), fNumGlyphs(0), fNumLongHorMetrics(0)
|
||||
{
|
||||
le_uint32 length;
|
||||
le_uint32 length;
|
||||
|
||||
if (LE_FAILURE(status)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// open the font file
|
||||
fFile = fopen(fileName, "rb");
|
||||
// open the font file
|
||||
fFile = fopen(fileName, "rb");
|
||||
|
||||
if (fFile == NULL) {
|
||||
if (fFile == NULL) {
|
||||
status = PFI_FONT_FILE_NOT_FOUND_ERROR;
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// read in the directory
|
||||
SFNTDirectory tempDir;
|
||||
// read in the directory
|
||||
SFNTDirectory tempDir;
|
||||
|
||||
fread(&tempDir, sizeof tempDir, 1, fFile);
|
||||
fread(&tempDir, sizeof tempDir, 1, fFile);
|
||||
|
||||
le_int32 dirSize = sizeof tempDir + ((SWAPW(tempDir.numTables) - ANY_NUMBER) * sizeof(DirectoryEntry));
|
||||
const LETag headTag = 0x68656164; // 'head'
|
||||
const HEADTable *headTable = NULL;
|
||||
le_int32 dirSize = sizeof tempDir + ((SWAPW(tempDir.numTables) - ANY_NUMBER) * sizeof(DirectoryEntry));
|
||||
const LETag headTag = 0x68656164; // 'head'
|
||||
const HEADTable *headTable = NULL;
|
||||
le_uint16 numTables = 0;
|
||||
|
||||
fDirectory = (const SFNTDirectory *) new char[dirSize];
|
||||
fDirectory = (const SFNTDirectory *) new char[dirSize];
|
||||
|
||||
if (fDirectory == NULL) {
|
||||
status = PFI_OUT_OF_MEMORY_ERROR;
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
fseek(fFile, 0L, SEEK_SET);
|
||||
fread((void *) fDirectory, sizeof(char), dirSize, fFile);
|
||||
fseek(fFile, 0L, SEEK_SET);
|
||||
fread((void *) fDirectory, sizeof(char), dirSize, fFile);
|
||||
|
||||
//
|
||||
// We calculate these numbers 'cause some fonts
|
||||
|
|
@ -110,18 +110,18 @@ PortableFontInstance::PortableFontInstance(char *fileName, float pointSize, PFIE
|
|||
fDirPower = 1 << highBit(numTables);
|
||||
fDirExtra = numTables - fDirPower;
|
||||
|
||||
// read unitsPerEm from 'head' table
|
||||
headTable = (const HEADTable *) readTable(headTag, &length);
|
||||
// read unitsPerEm from 'head' table
|
||||
headTable = (const HEADTable *) readTable(headTag, &length);
|
||||
|
||||
if (headTable == NULL) {
|
||||
status = PFI_MISSING_FONT_TABLE_ERROR;
|
||||
goto error_exit;
|
||||
}
|
||||
|
||||
fUnitsPerEM = (float) SWAPW(headTable->unitsPerEm);
|
||||
deleteTable(headTable);
|
||||
fUnitsPerEM = (float) SWAPW(headTable->unitsPerEm);
|
||||
deleteTable(headTable);
|
||||
|
||||
fCMAPMapper = findUnicodeMapper();
|
||||
fCMAPMapper = findUnicodeMapper();
|
||||
|
||||
if (fCMAPMapper == NULL) {
|
||||
status = PFI_MISSING_FONT_TABLE_ERROR;
|
||||
|
|
@ -141,12 +141,12 @@ error_exit:
|
|||
PortableFontInstance::~PortableFontInstance()
|
||||
{
|
||||
if (fFile != NULL) {
|
||||
fclose(fFile);
|
||||
fclose(fFile);
|
||||
|
||||
deleteTable(fHMTXTable);
|
||||
deleteTable(fHMTXTable);
|
||||
|
||||
flushFontTableCache();
|
||||
delete fCMAPMapper;
|
||||
delete fCMAPMapper;
|
||||
|
||||
delete[] (void *) fDirectory;
|
||||
}
|
||||
|
|
@ -154,33 +154,33 @@ PortableFontInstance::~PortableFontInstance()
|
|||
|
||||
void PortableFontInstance::deleteTable(const void *table) const
|
||||
{
|
||||
delete[] (char *) table;
|
||||
delete[] (char *) table;
|
||||
}
|
||||
|
||||
const DirectoryEntry *PortableFontInstance::findTable(LETag tag) const
|
||||
{
|
||||
if (fDirectory != NULL) {
|
||||
le_uint16 table = 0;
|
||||
le_uint16 probe = fDirPower;
|
||||
le_uint16 table = 0;
|
||||
le_uint16 probe = fDirPower;
|
||||
|
||||
if (SWAPL(fDirectory->tableDirectory[fDirExtra].tag) <= tag) {
|
||||
table = fDirExtra;
|
||||
}
|
||||
if (SWAPL(fDirectory->tableDirectory[fDirExtra].tag) <= tag) {
|
||||
table = fDirExtra;
|
||||
}
|
||||
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
|
||||
if (SWAPL(fDirectory->tableDirectory[table + probe].tag) <= tag) {
|
||||
table += probe;
|
||||
}
|
||||
}
|
||||
if (SWAPL(fDirectory->tableDirectory[table + probe].tag) <= tag) {
|
||||
table += probe;
|
||||
}
|
||||
}
|
||||
|
||||
if (SWAPL(fDirectory->tableDirectory[table].tag) == tag) {
|
||||
return &fDirectory->tableDirectory[table];
|
||||
}
|
||||
if (SWAPL(fDirectory->tableDirectory[table].tag) == tag) {
|
||||
return &fDirectory->tableDirectory[table];
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PFIErrorCode PortableFontInstance::initFontTableCache()
|
||||
|
|
@ -211,23 +211,23 @@ void PortableFontInstance::flushFontTableCache()
|
|||
|
||||
const void *PortableFontInstance::readTable(LETag tag, le_uint32 *length) const
|
||||
{
|
||||
const DirectoryEntry *entry = findTable(tag);
|
||||
const DirectoryEntry *entry = findTable(tag);
|
||||
|
||||
if (entry == NULL) {
|
||||
*length = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
*length = SWAPL(entry->length);
|
||||
|
||||
void *table = new char[*length];
|
||||
|
||||
if (table != NULL) {
|
||||
fseek(fFile, SWAPL(entry->offset), SEEK_SET);
|
||||
fread(table, sizeof(char), *length, fFile);
|
||||
if (entry == NULL) {
|
||||
*length = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return table;
|
||||
*length = SWAPL(entry->length);
|
||||
|
||||
void *table = new char[*length];
|
||||
|
||||
if (table != NULL) {
|
||||
fseek(fFile, SWAPL(entry->offset), SEEK_SET);
|
||||
fread(table, sizeof(char), *length, fFile);
|
||||
}
|
||||
|
||||
return table;
|
||||
}
|
||||
|
||||
const void *PortableFontInstance::getFontTable(LETag tableTag) const
|
||||
|
|
@ -271,15 +271,15 @@ const void *PortableFontInstance::getFontTable(LETag tableTag) const
|
|||
|
||||
CMAPMapper *PortableFontInstance::findUnicodeMapper()
|
||||
{
|
||||
le_uint32 length;
|
||||
LETag cmapTag = 0x636D6170; // 'cmap'
|
||||
const CMAPTable *cmap = (CMAPTable *) readTable(cmapTag, &length);
|
||||
le_uint32 length;
|
||||
LETag cmapTag = 0x636D6170; // 'cmap'
|
||||
const CMAPTable *cmap = (CMAPTable *) readTable(cmapTag, &length);
|
||||
|
||||
if (cmap == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
if (cmap == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return CMAPMapper::createUnicodeMapper(cmap);
|
||||
return CMAPMapper::createUnicodeMapper(cmap);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -293,23 +293,23 @@ void PortableFontInstance::mapCharsToGlyphs(const LEUnicode chars[], le_int32 of
|
|||
}
|
||||
|
||||
for (i = offset; i < offset + count; i += 1, out += dir) {
|
||||
LEUnicode16 high = chars[i];
|
||||
LEUnicode32 code = high;
|
||||
LEUnicode16 high = chars[i];
|
||||
LEUnicode32 code = high;
|
||||
|
||||
if (i < offset + count - 1 && high >= 0xD800 && high <= 0xDBFF) {
|
||||
LEUnicode16 low = chars[i + 1];
|
||||
if (i < offset + count - 1 && high >= 0xD800 && high <= 0xDBFF) {
|
||||
LEUnicode16 low = chars[i + 1];
|
||||
|
||||
if (low >= 0xDC00 && low <= 0xDFFF) {
|
||||
code = (high - 0xD800) * 0x400 + low - 0xDC00 + 0x10000;
|
||||
}
|
||||
}
|
||||
if (low >= 0xDC00 && low <= 0xDFFF) {
|
||||
code = (high - 0xD800) * 0x400 + low - 0xDC00 + 0x10000;
|
||||
}
|
||||
}
|
||||
|
||||
glyphs[out] = mapCharToGlyph(code, mapper);
|
||||
|
||||
if (code >= 0x10000) {
|
||||
i += 1;
|
||||
glyphs[out += dir] = 0xFFFF;
|
||||
}
|
||||
if (code >= 0x10000) {
|
||||
i += 1;
|
||||
glyphs[out += dir] = 0xFFFF;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -334,40 +334,40 @@ LEGlyphID PortableFontInstance::mapCharToGlyph(LEUnicode32 ch, const LECharMappe
|
|||
|
||||
void PortableFontInstance::getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const
|
||||
{
|
||||
if (fHMTXTable == NULL) {
|
||||
LETag maxpTag = 0x6D617870; // 'maxp'
|
||||
LETag hheaTag = 0x68686561; // 'hhea'
|
||||
LETag hmtxTag = 0x686D7478; // 'hmtx'
|
||||
le_uint32 length;
|
||||
const HHEATable *hheaTable;
|
||||
const MAXPTable *maxpTable = (MAXPTable *) readTable(maxpTag, &length);
|
||||
PortableFontInstance *realThis = (PortableFontInstance *) this;
|
||||
if (fHMTXTable == NULL) {
|
||||
LETag maxpTag = 0x6D617870; // 'maxp'
|
||||
LETag hheaTag = 0x68686561; // 'hhea'
|
||||
LETag hmtxTag = 0x686D7478; // 'hmtx'
|
||||
le_uint32 length;
|
||||
const HHEATable *hheaTable;
|
||||
const MAXPTable *maxpTable = (MAXPTable *) readTable(maxpTag, &length);
|
||||
PortableFontInstance *realThis = (PortableFontInstance *) this;
|
||||
|
||||
if (maxpTable != NULL) {
|
||||
realThis->fNumGlyphs = SWAPW(maxpTable->numGlyphs);
|
||||
deleteTable(maxpTable);
|
||||
realThis->fNumGlyphs = SWAPW(maxpTable->numGlyphs);
|
||||
deleteTable(maxpTable);
|
||||
}
|
||||
|
||||
hheaTable = (HHEATable *) readTable(hheaTag, &length);
|
||||
hheaTable = (HHEATable *) readTable(hheaTag, &length);
|
||||
|
||||
if (hheaTable != NULL) {
|
||||
realThis->fNumLongHorMetrics = SWAPW(hheaTable->numOfLongHorMetrics);
|
||||
deleteTable((void *) hheaTable);
|
||||
realThis->fNumLongHorMetrics = SWAPW(hheaTable->numOfLongHorMetrics);
|
||||
deleteTable((void *) hheaTable);
|
||||
}
|
||||
|
||||
realThis->fHMTXTable = (const HMTXTable *) readTable(hmtxTag, &length);
|
||||
}
|
||||
realThis->fHMTXTable = (const HMTXTable *) readTable(hmtxTag, &length);
|
||||
}
|
||||
|
||||
le_uint16 index = glyph;
|
||||
le_uint16 index = glyph;
|
||||
|
||||
if (glyph >= fNumGlyphs || fHMTXTable == NULL) {
|
||||
advance.fX = advance.fY = 0;
|
||||
return;
|
||||
}
|
||||
if (glyph >= fNumGlyphs || fHMTXTable == NULL) {
|
||||
advance.fX = advance.fY = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (glyph >= fNumLongHorMetrics) {
|
||||
index = fNumLongHorMetrics - 1;
|
||||
}
|
||||
if (glyph >= fNumLongHorMetrics) {
|
||||
index = fNumLongHorMetrics - 1;
|
||||
}
|
||||
|
||||
advance.fX = xUnitsToPoints(SWAPW(fHMTXTable->hMetrics[index].advanceWidth));
|
||||
advance.fY = 0;
|
||||
|
|
@ -388,7 +388,7 @@ le_bool PortableFontInstance::getGlyphPoint(LEGlyphID glyph, le_int32 pointNumbe
|
|||
|
||||
return result;
|
||||
#else
|
||||
return false;
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -47,12 +47,12 @@ typedef enum PFIErrorCode PFIErrorCode;
|
|||
class PortableFontInstance : public LEFontInstance
|
||||
{
|
||||
private:
|
||||
FILE *fFile;
|
||||
FILE *fFile;
|
||||
|
||||
float fUnitsPerEM;
|
||||
float fPointSize;
|
||||
|
||||
const SFNTDirectory *fDirectory;
|
||||
const SFNTDirectory *fDirectory;
|
||||
le_uint16 fDirPower;
|
||||
le_uint16 fDirExtra;
|
||||
|
||||
|
|
@ -60,22 +60,22 @@ private:
|
|||
le_int32 fTableCacheCurr;
|
||||
le_int32 fTableCacheSize;
|
||||
|
||||
CMAPMapper *fCMAPMapper;
|
||||
CMAPMapper *fCMAPMapper;
|
||||
|
||||
const HMTXTable *fHMTXTable;
|
||||
le_uint16 fNumGlyphs;
|
||||
le_uint16 fNumLongHorMetrics;
|
||||
const HMTXTable *fHMTXTable;
|
||||
le_uint16 fNumGlyphs;
|
||||
le_uint16 fNumLongHorMetrics;
|
||||
|
||||
static le_int8 highBit(le_int32 value);
|
||||
|
||||
PFIErrorCode PortableFontInstance::initFontTableCache();
|
||||
void PortableFontInstance::flushFontTableCache();
|
||||
|
||||
const DirectoryEntry *findTable(LETag tag) const;
|
||||
const void *readTable(LETag tag, le_uint32 *length) const;
|
||||
void deleteTable(const void *table) const;
|
||||
const DirectoryEntry *findTable(LETag tag) const;
|
||||
const void *readTable(LETag tag, le_uint32 *length) const;
|
||||
void deleteTable(const void *table) const;
|
||||
|
||||
CMAPMapper *PortableFontInstance::findUnicodeMapper();
|
||||
CMAPMapper *PortableFontInstance::findUnicodeMapper();
|
||||
|
||||
public:
|
||||
PortableFontInstance(char *fileName, float pointSize, PFIErrorCode &status);
|
||||
|
|
@ -97,7 +97,7 @@ public:
|
|||
virtual le_int32 getLineHeight() const
|
||||
{
|
||||
// this is a cheap hack!!
|
||||
return (le_int32) fPointSize;
|
||||
return (le_int32) fPointSize;
|
||||
};
|
||||
|
||||
virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, const LECharMapper *mapper, LEGlyphID glyphs[]) const;
|
||||
|
|
@ -106,13 +106,13 @@ public:
|
|||
|
||||
virtual le_int32 getName(le_uint16 platformID, le_uint16 scriptID, le_uint16 languageID, le_uint16 nameID, LEUnicode *name) const
|
||||
{
|
||||
// This is only used for CDAC fonts, and we'll have to loose that support anyhow...
|
||||
// This is only used for CDAC fonts, and we'll have to loose that support anyhow...
|
||||
//return (le_int32) fFontObject->getName(platformID, scriptID, languageID, nameID, name);
|
||||
if (name != NULL) {
|
||||
*name = 0;
|
||||
}
|
||||
if (name != NULL) {
|
||||
*name = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
};
|
||||
|
||||
virtual void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const;
|
||||
|
|
|
|||
|
|
@ -64,117 +64,117 @@ le_int8 highBit(le_uint32 value)
|
|||
|
||||
CMAPMapper *CMAPMapper::createUnicodeMapper(const CMAPTable *cmap)
|
||||
{
|
||||
le_uint16 i;
|
||||
le_uint16 nSubtables = SWAPW(cmap->numberSubtables);
|
||||
const CMAPEncodingSubtable *subtable = NULL;
|
||||
le_uint32 offset1 = 0, offset10 = 0;
|
||||
le_uint16 i;
|
||||
le_uint16 nSubtables = SWAPW(cmap->numberSubtables);
|
||||
const CMAPEncodingSubtable *subtable = NULL;
|
||||
le_uint32 offset1 = 0, offset10 = 0;
|
||||
|
||||
for (i = 0; i < nSubtables; i += 1) {
|
||||
const CMAPEncodingSubtableHeader *esh = &cmap->encodingSubtableHeaders[i];
|
||||
for (i = 0; i < nSubtables; i += 1) {
|
||||
const CMAPEncodingSubtableHeader *esh = &cmap->encodingSubtableHeaders[i];
|
||||
|
||||
if (SWAPW(esh->platformID) == 3) {
|
||||
switch (SWAPW(esh->platformSpecificID)) {
|
||||
case 1:
|
||||
offset1 = SWAPL(esh->encodingOffset);
|
||||
break;
|
||||
if (SWAPW(esh->platformID) == 3) {
|
||||
switch (SWAPW(esh->platformSpecificID)) {
|
||||
case 1:
|
||||
offset1 = SWAPL(esh->encodingOffset);
|
||||
break;
|
||||
|
||||
case 10:
|
||||
offset10 = SWAPL(esh->encodingOffset);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
case 10:
|
||||
offset10 = SWAPL(esh->encodingOffset);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (offset10 != 0)
|
||||
{
|
||||
subtable = (const CMAPEncodingSubtable *) ((const char *) cmap + offset10);
|
||||
} else if (offset1 != 0) {
|
||||
subtable = (const CMAPEncodingSubtable *) ((const char *) cmap + offset1);
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
if (offset10 != 0)
|
||||
{
|
||||
subtable = (const CMAPEncodingSubtable *) ((const char *) cmap + offset10);
|
||||
} else if (offset1 != 0) {
|
||||
subtable = (const CMAPEncodingSubtable *) ((const char *) cmap + offset1);
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
switch (SWAPW(subtable->format)) {
|
||||
case 4:
|
||||
return new CMAPFormat4Mapper(cmap, (const CMAPFormat4Encoding *) subtable);
|
||||
switch (SWAPW(subtable->format)) {
|
||||
case 4:
|
||||
return new CMAPFormat4Mapper(cmap, (const CMAPFormat4Encoding *) subtable);
|
||||
|
||||
case 12:
|
||||
{
|
||||
const CMAPFormat12Encoding *encoding = (const CMAPFormat12Encoding *) subtable;
|
||||
case 12:
|
||||
{
|
||||
const CMAPFormat12Encoding *encoding = (const CMAPFormat12Encoding *) subtable;
|
||||
|
||||
return new CMAPGroupMapper(cmap, encoding->groups, SWAPL(encoding->nGroups));
|
||||
}
|
||||
return new CMAPGroupMapper(cmap, encoding->groups, SWAPL(encoding->nGroups));
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
CMAPFormat4Mapper::CMAPFormat4Mapper(const CMAPTable *cmap, const CMAPFormat4Encoding *header)
|
||||
: CMAPMapper(cmap)
|
||||
: CMAPMapper(cmap)
|
||||
{
|
||||
le_uint16 segCount = SWAPW(header->segCountX2) / 2;
|
||||
le_uint16 segCount = SWAPW(header->segCountX2) / 2;
|
||||
|
||||
fEntrySelector = SWAPW(header->entrySelector);
|
||||
fRangeShift = SWAPW(header->rangeShift) / 2;
|
||||
fEndCodes = &header->endCodes[0];
|
||||
fStartCodes = &header->endCodes[segCount + 1]; // + 1 for reservedPad...
|
||||
fIdDelta = &fStartCodes[segCount];
|
||||
fIdRangeOffset = &fIdDelta[segCount];
|
||||
fEntrySelector = SWAPW(header->entrySelector);
|
||||
fRangeShift = SWAPW(header->rangeShift) / 2;
|
||||
fEndCodes = &header->endCodes[0];
|
||||
fStartCodes = &header->endCodes[segCount + 1]; // + 1 for reservedPad...
|
||||
fIdDelta = &fStartCodes[segCount];
|
||||
fIdRangeOffset = &fIdDelta[segCount];
|
||||
}
|
||||
|
||||
LEGlyphID CMAPFormat4Mapper::unicodeToGlyph(LEUnicode32 unicode32) const
|
||||
{
|
||||
if (unicode32 >= 0x10000) {
|
||||
return 0;
|
||||
}
|
||||
if (unicode32 >= 0x10000) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
LEUnicode16 unicode = (LEUnicode16) unicode32;
|
||||
le_uint16 index = 0;
|
||||
le_uint16 probe = 1 << fEntrySelector;
|
||||
LEGlyphID result = 0;
|
||||
LEUnicode16 unicode = (LEUnicode16) unicode32;
|
||||
le_uint16 index = 0;
|
||||
le_uint16 probe = 1 << fEntrySelector;
|
||||
LEGlyphID result = 0;
|
||||
|
||||
if (SWAPW(fStartCodes[fRangeShift]) <= unicode) {
|
||||
index = fRangeShift;
|
||||
}
|
||||
if (SWAPW(fStartCodes[fRangeShift]) <= unicode) {
|
||||
index = fRangeShift;
|
||||
}
|
||||
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
while (probe > (1 << 0)) {
|
||||
probe >>= 1;
|
||||
|
||||
if (SWAPW(fStartCodes[index + probe]) <= unicode) {
|
||||
index += probe;
|
||||
}
|
||||
}
|
||||
if (SWAPW(fStartCodes[index + probe]) <= unicode) {
|
||||
index += probe;
|
||||
}
|
||||
}
|
||||
|
||||
if (unicode >= SWAPW(fStartCodes[index]) && unicode <= SWAPW(fEndCodes[index])) {
|
||||
if (fIdRangeOffset[index] == 0) {
|
||||
result = (LEGlyphID) unicode;
|
||||
} else {
|
||||
le_uint16 offset = unicode - SWAPW(fStartCodes[index]);
|
||||
le_uint16 rangeOffset = SWAPW(fIdRangeOffset[index]);
|
||||
le_uint16 *glyphIndexTable = (le_uint16 *) ((char *) &fIdRangeOffset[index] + rangeOffset);
|
||||
if (unicode >= SWAPW(fStartCodes[index]) && unicode <= SWAPW(fEndCodes[index])) {
|
||||
if (fIdRangeOffset[index] == 0) {
|
||||
result = (LEGlyphID) unicode;
|
||||
} else {
|
||||
le_uint16 offset = unicode - SWAPW(fStartCodes[index]);
|
||||
le_uint16 rangeOffset = SWAPW(fIdRangeOffset[index]);
|
||||
le_uint16 *glyphIndexTable = (le_uint16 *) ((char *) &fIdRangeOffset[index] + rangeOffset);
|
||||
|
||||
result = SWAPW(glyphIndexTable[offset]);
|
||||
}
|
||||
result = SWAPW(glyphIndexTable[offset]);
|
||||
}
|
||||
|
||||
result += SWAPW(fIdDelta[index]);
|
||||
} else {
|
||||
result = 0;
|
||||
}
|
||||
result += SWAPW(fIdDelta[index]);
|
||||
} else {
|
||||
result = 0;
|
||||
}
|
||||
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
CMAPFormat4Mapper::~CMAPFormat4Mapper()
|
||||
{
|
||||
// parent destructor does it all
|
||||
// parent destructor does it all
|
||||
}
|
||||
|
||||
CMAPGroupMapper::CMAPGroupMapper(const CMAPTable *cmap, const CMAPGroup *groups, le_uint32 nGroups)
|
||||
: CMAPMapper(cmap), fGroups(groups)
|
||||
: CMAPMapper(cmap), fGroups(groups)
|
||||
{
|
||||
le_uint8 bit = highBit(nGroups);
|
||||
fPower = 1 << bit;
|
||||
|
|
@ -207,6 +207,6 @@ LEGlyphID CMAPGroupMapper::unicodeToGlyph(LEUnicode32 unicode32) const
|
|||
|
||||
CMAPGroupMapper::~CMAPGroupMapper()
|
||||
{
|
||||
// parent destructor does it all
|
||||
// parent destructor does it all
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,69 +29,69 @@
|
|||
class CMAPMapper
|
||||
{
|
||||
public:
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const = 0;
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const = 0;
|
||||
|
||||
virtual ~CMAPMapper();
|
||||
virtual ~CMAPMapper();
|
||||
|
||||
static CMAPMapper *createUnicodeMapper(const CMAPTable *cmap);
|
||||
static CMAPMapper *createUnicodeMapper(const CMAPTable *cmap);
|
||||
|
||||
protected:
|
||||
CMAPMapper(const CMAPTable *cmap);
|
||||
CMAPMapper(const CMAPTable *cmap);
|
||||
|
||||
CMAPMapper() {};
|
||||
CMAPMapper() {};
|
||||
|
||||
private:
|
||||
const CMAPTable *fcmap;
|
||||
const CMAPTable *fcmap;
|
||||
};
|
||||
|
||||
class CMAPFormat4Mapper : public CMAPMapper
|
||||
{
|
||||
public:
|
||||
CMAPFormat4Mapper(const CMAPTable *cmap, const CMAPFormat4Encoding *header);
|
||||
CMAPFormat4Mapper(const CMAPTable *cmap, const CMAPFormat4Encoding *header);
|
||||
|
||||
virtual ~CMAPFormat4Mapper();
|
||||
virtual ~CMAPFormat4Mapper();
|
||||
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const;
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const;
|
||||
|
||||
protected:
|
||||
CMAPFormat4Mapper() {};
|
||||
CMAPFormat4Mapper() {};
|
||||
|
||||
private:
|
||||
le_uint16 fEntrySelector;
|
||||
le_uint16 fRangeShift;
|
||||
const le_uint16 *fEndCodes;
|
||||
const le_uint16 *fStartCodes;
|
||||
const le_uint16 *fIdDelta;
|
||||
const le_uint16 *fIdRangeOffset;
|
||||
le_uint16 fEntrySelector;
|
||||
le_uint16 fRangeShift;
|
||||
const le_uint16 *fEndCodes;
|
||||
const le_uint16 *fStartCodes;
|
||||
const le_uint16 *fIdDelta;
|
||||
const le_uint16 *fIdRangeOffset;
|
||||
};
|
||||
|
||||
class CMAPGroupMapper : public CMAPMapper
|
||||
{
|
||||
public:
|
||||
CMAPGroupMapper(const CMAPTable *cmap, const CMAPGroup *groups, le_uint32 nGroups);
|
||||
CMAPGroupMapper(const CMAPTable *cmap, const CMAPGroup *groups, le_uint32 nGroups);
|
||||
|
||||
virtual ~CMAPGroupMapper();
|
||||
virtual ~CMAPGroupMapper();
|
||||
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const;
|
||||
virtual LEGlyphID unicodeToGlyph(LEUnicode32 unicode32) const;
|
||||
|
||||
protected:
|
||||
CMAPGroupMapper() {};
|
||||
CMAPGroupMapper() {};
|
||||
|
||||
private:
|
||||
le_int32 fPower;
|
||||
le_int32 fRangeOffset;
|
||||
const CMAPGroup *fGroups;
|
||||
le_int32 fPower;
|
||||
le_int32 fRangeOffset;
|
||||
const CMAPGroup *fGroups;
|
||||
};
|
||||
|
||||
inline CMAPMapper::CMAPMapper(const CMAPTable *cmap)
|
||||
: fcmap(cmap)
|
||||
: fcmap(cmap)
|
||||
{
|
||||
// nothing else to do
|
||||
// nothing else to do
|
||||
}
|
||||
|
||||
inline CMAPMapper::~CMAPMapper()
|
||||
{
|
||||
delete[] (char *) fcmap;
|
||||
delete[] (char *) fcmap;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -27,73 +27,73 @@ U_NAMESPACE_USE
|
|||
|
||||
UBool compareResults(int32_t testNumber, TestResult *expected, TestResult *actual)
|
||||
{
|
||||
/* NOTE: we'll stop on the first failure 'cause once there's one error, it may cascade... */
|
||||
if (actual->glyphCount != expected->glyphCount) {
|
||||
printf("incorrect glyph count: exptected %d, got %d\n", expected->glyphCount, actual->glyphCount);
|
||||
return false;
|
||||
}
|
||||
/* NOTE: we'll stop on the first failure 'cause once there's one error, it may cascade... */
|
||||
if (actual->glyphCount != expected->glyphCount) {
|
||||
printf("incorrect glyph count: exptected %d, got %d\n", expected->glyphCount, actual->glyphCount);
|
||||
return false;
|
||||
}
|
||||
|
||||
int32_t i;
|
||||
int32_t i;
|
||||
|
||||
for (i = 0; i < actual->glyphCount; i += 1) {
|
||||
if (actual->glyphs[i] != expected->glyphs[i]) {
|
||||
printf("incorrect id for glyph %d: expected %4X, got %4X\n", i, expected->glyphs[i], actual->glyphs[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < actual->glyphCount; i += 1) {
|
||||
if (actual->glyphs[i] != expected->glyphs[i]) {
|
||||
printf("incorrect id for glyph %d: expected %4X, got %4X\n", i, expected->glyphs[i], actual->glyphs[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < actual->glyphCount; i += 1) {
|
||||
if (actual->indices[i] != expected->indices[i]) {
|
||||
printf("incorrect index for glyph %d: expected %8X, got %8X\n", i, expected->indices[i], actual->indices[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (i = 0; i < actual->glyphCount; i += 1) {
|
||||
if (actual->indices[i] != expected->indices[i]) {
|
||||
printf("incorrect index for glyph %d: expected %8X, got %8X\n", i, expected->indices[i], actual->indices[i]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i <= actual->glyphCount; i += 1) {
|
||||
double xError = fabs(actual->positions[i * 2] - expected->positions[i * 2]);
|
||||
for (i = 0; i <= actual->glyphCount; i += 1) {
|
||||
double xError = fabs(actual->positions[i * 2] - expected->positions[i * 2]);
|
||||
|
||||
if (xError > 0.0001) {
|
||||
printf("incorrect x position for glyph %d: expected %f, got %f\n", i, expected->positions[i * 2], actual->positions[i * 2]);
|
||||
return false;
|
||||
}
|
||||
if (xError > 0.0001) {
|
||||
printf("incorrect x position for glyph %d: expected %f, got %f\n", i, expected->positions[i * 2], actual->positions[i * 2]);
|
||||
return false;
|
||||
}
|
||||
|
||||
double yError = fabs(actual->positions[i * 2 + 1] - expected->positions[i * 2 + 1]);
|
||||
double yError = fabs(actual->positions[i * 2 + 1] - expected->positions[i * 2 + 1]);
|
||||
|
||||
if (yError < 0) {
|
||||
yError = -yError;
|
||||
}
|
||||
if (yError < 0) {
|
||||
yError = -yError;
|
||||
}
|
||||
|
||||
if (yError > 0.0001) {
|
||||
printf("incorrect y position for glyph %d: expected %f, got %f\n", i, expected->positions[i * 2 + 1], actual->positions[i * 2 + 1]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (yError > 0.0001) {
|
||||
printf("incorrect y position for glyph %d: expected %f, got %f\n", i, expected->positions[i * 2 + 1], actual->positions[i * 2 + 1]);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
Locale dummyLocale;
|
||||
int failures = 0;
|
||||
Locale dummyLocale;
|
||||
int failures = 0;
|
||||
|
||||
for (int test = 0; test < testCount; test += 1) {
|
||||
for (int test = 0; test < testCount; test += 1) {
|
||||
PFIErrorCode fontStatus = PFI_NO_ERROR;
|
||||
|
||||
printf("Test %d, font = %s... ", test, testInputs[test].fontName);
|
||||
|
||||
PortableFontInstance fontInstance(testInputs[test].fontName, 12, fontStatus);
|
||||
PortableFontInstance fontInstance(testInputs[test].fontName, 12, fontStatus);
|
||||
|
||||
if (LE_FAILURE(fontStatus)) {
|
||||
printf("could not open font.\n");
|
||||
continue;
|
||||
}
|
||||
|
||||
UErrorCode success = U_ZERO_ERROR;
|
||||
ICULayoutEngine *engine = ICULayoutEngine::createInstance(&fontInstance, testInputs[test].scriptCode, dummyLocale, success);
|
||||
int32_t textLength = testInputs[test].textLength;
|
||||
UBool result;
|
||||
TestResult actual;
|
||||
UErrorCode success = U_ZERO_ERROR;
|
||||
ICULayoutEngine *engine = ICULayoutEngine::createInstance(&fontInstance, testInputs[test].scriptCode, dummyLocale, success);
|
||||
int32_t textLength = testInputs[test].textLength;
|
||||
UBool result;
|
||||
TestResult actual;
|
||||
|
||||
if (LE_FAILURE(success)) {
|
||||
// would be nice to print the script name here, but
|
||||
|
|
@ -106,28 +106,28 @@ int main(int argc, char *argv[])
|
|||
|
||||
actual.glyphCount = engine->layoutChars(testInputs[test].text, 0, textLength, textLength, testInputs[test].rightToLeft, 0, 0, success);
|
||||
|
||||
actual.glyphs = new uint16_t[actual.glyphCount];
|
||||
actual.indices = new int32_t[actual.glyphCount];
|
||||
actual.positions = new float[actual.glyphCount * 2 + 2];
|
||||
actual.glyphs = new uint16_t[actual.glyphCount];
|
||||
actual.indices = new int32_t[actual.glyphCount];
|
||||
actual.positions = new float[actual.glyphCount * 2 + 2];
|
||||
|
||||
engine->getGlyphs(actual.glyphs, success);
|
||||
engine->getCharIndices(actual.indices, success);
|
||||
engine->getGlyphPositions(actual.positions, success);
|
||||
engine->getGlyphs(actual.glyphs, success);
|
||||
engine->getCharIndices(actual.indices, success);
|
||||
engine->getGlyphPositions(actual.positions, success);
|
||||
|
||||
result = compareResults(test, &testResults[test], &actual);
|
||||
result = compareResults(test, &testResults[test], &actual);
|
||||
|
||||
if (result) {
|
||||
printf("passed.\n");
|
||||
} else {
|
||||
failures += 1;
|
||||
printf("failed.\n");
|
||||
}
|
||||
if (result) {
|
||||
printf("passed.\n");
|
||||
} else {
|
||||
failures += 1;
|
||||
printf("failed.\n");
|
||||
}
|
||||
|
||||
delete[] actual.positions;
|
||||
delete[] actual.indices;
|
||||
delete[] actual.glyphs;
|
||||
delete engine;
|
||||
}
|
||||
delete[] actual.positions;
|
||||
delete[] actual.indices;
|
||||
delete[] actual.glyphs;
|
||||
delete engine;
|
||||
}
|
||||
|
||||
return failures;
|
||||
return failures;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@
|
|||
|
||||
struct TestInput
|
||||
{
|
||||
char *fontName;
|
||||
UChar *text;
|
||||
int32_t textLength;
|
||||
UScriptCode scriptCode;
|
||||
UBool rightToLeft;
|
||||
char *fontName;
|
||||
UChar *text;
|
||||
int32_t textLength;
|
||||
UScriptCode scriptCode;
|
||||
UBool rightToLeft;
|
||||
};
|
||||
|
||||
extern int32_t testCount;
|
||||
|
|
@ -31,10 +31,10 @@ extern TestInput testInputs[];
|
|||
|
||||
struct TestResult
|
||||
{
|
||||
int32_t glyphCount;
|
||||
uint16_t *glyphs;
|
||||
int32_t *indices;
|
||||
float *positions;
|
||||
int32_t glyphCount;
|
||||
uint16_t *glyphs;
|
||||
int32_t *indices;
|
||||
float *positions;
|
||||
};
|
||||
|
||||
extern TestResult testResults[];
|
||||
|
|
|
|||
|
|
@ -32,196 +32,196 @@
|
|||
|
||||
struct DirectoryEntry
|
||||
{
|
||||
le_uint32 tag;
|
||||
le_uint32 checksum;
|
||||
le_uint32 offset;
|
||||
le_uint32 length;
|
||||
le_uint32 tag;
|
||||
le_uint32 checksum;
|
||||
le_uint32 offset;
|
||||
le_uint32 length;
|
||||
};
|
||||
|
||||
struct SFNTDirectory
|
||||
{
|
||||
le_uint32 scalerType;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
DirectoryEntry tableDirectory[ANY_NUMBER];
|
||||
le_uint32 scalerType;
|
||||
le_uint16 numTables;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
DirectoryEntry tableDirectory[ANY_NUMBER];
|
||||
};
|
||||
|
||||
|
||||
struct CMAPEncodingSubtableHeader
|
||||
{
|
||||
le_uint16 platformID;
|
||||
le_uint16 platformSpecificID;
|
||||
le_uint32 encodingOffset;
|
||||
le_uint16 platformID;
|
||||
le_uint16 platformSpecificID;
|
||||
le_uint32 encodingOffset;
|
||||
};
|
||||
|
||||
struct CMAPTable
|
||||
{
|
||||
le_uint16 version;
|
||||
le_uint16 numberSubtables;
|
||||
CMAPEncodingSubtableHeader encodingSubtableHeaders[ANY_NUMBER];
|
||||
le_uint16 version;
|
||||
le_uint16 numberSubtables;
|
||||
CMAPEncodingSubtableHeader encodingSubtableHeaders[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 format;
|
||||
le_uint16 length;
|
||||
le_uint16 language;
|
||||
le_uint16 format;
|
||||
le_uint16 length;
|
||||
le_uint16 language;
|
||||
};
|
||||
|
||||
struct CMAPFormat0Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint8 glyphIndexArray[256];
|
||||
le_uint8 glyphIndexArray[256];
|
||||
};
|
||||
|
||||
struct CMAPFormat2Subheader
|
||||
{
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_int16 idDelta;
|
||||
le_uint16 idRangeOffset;
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_int16 idDelta;
|
||||
le_uint16 idRangeOffset;
|
||||
};
|
||||
|
||||
struct CMAPFormat2Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 subHeadKeys[256];
|
||||
CMAPFormat2Subheader subheaders[ANY_NUMBER];
|
||||
le_uint16 subHeadKeys[256];
|
||||
CMAPFormat2Subheader subheaders[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat4Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 segCountX2;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
le_uint16 endCodes[ANY_NUMBER];
|
||||
// le_uint16 reservedPad;
|
||||
// le_uint16 startCodes[ANY_NUMBER];
|
||||
// le_uint16 idDelta[ANY_NUMBER];
|
||||
// le_uint16 idRangeOffset[ANY_NUMBER];
|
||||
// le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
le_uint16 segCountX2;
|
||||
le_uint16 searchRange;
|
||||
le_uint16 entrySelector;
|
||||
le_uint16 rangeShift;
|
||||
le_uint16 endCodes[ANY_NUMBER];
|
||||
// le_uint16 reservedPad;
|
||||
// le_uint16 startCodes[ANY_NUMBER];
|
||||
// le_uint16 idDelta[ANY_NUMBER];
|
||||
// le_uint16 idRangeOffset[ANY_NUMBER];
|
||||
// le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat6Encoding : CMAPEncodingSubtable
|
||||
{
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
le_uint16 firstCode;
|
||||
le_uint16 entryCount;
|
||||
le_uint16 glyphIndexArray[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPEncodingSubtable32
|
||||
{
|
||||
le_uint32 format;
|
||||
le_uint32 length;
|
||||
le_uint32 language;
|
||||
le_uint32 format;
|
||||
le_uint32 length;
|
||||
le_uint32 language;
|
||||
};
|
||||
|
||||
struct CMAPGroup
|
||||
{
|
||||
le_uint32 startCharCode;
|
||||
le_uint32 endCharCode;
|
||||
le_uint32 startGlyphCode;
|
||||
le_uint32 startCharCode;
|
||||
le_uint32 endCharCode;
|
||||
le_uint32 startGlyphCode;
|
||||
};
|
||||
|
||||
struct CMAPFormat8Encoding : CMAPEncodingSubtable32
|
||||
{
|
||||
le_uint32 is32[65536/32];
|
||||
le_uint32 nGroups;
|
||||
CMAPGroup groups[ANY_NUMBER];
|
||||
le_uint32 is32[65536/32];
|
||||
le_uint32 nGroups;
|
||||
CMAPGroup groups[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat10Encoding : CMAPEncodingSubtable32
|
||||
{
|
||||
le_uint32 startCharCode;
|
||||
le_uint32 numCharCodes;
|
||||
le_uint16 glyphs[ANY_NUMBER];
|
||||
le_uint32 startCharCode;
|
||||
le_uint32 numCharCodes;
|
||||
le_uint16 glyphs[ANY_NUMBER];
|
||||
};
|
||||
|
||||
struct CMAPFormat12Encoding : CMAPEncodingSubtable32
|
||||
{
|
||||
le_uint32 nGroups;
|
||||
CMAPGroup groups[ANY_NUMBER];
|
||||
le_uint32 nGroups;
|
||||
CMAPGroup groups[ANY_NUMBER];
|
||||
};
|
||||
|
||||
typedef le_int32 fixed;
|
||||
|
||||
struct BigDate
|
||||
{
|
||||
le_uint32 bc;
|
||||
le_uint32 ad;
|
||||
le_uint32 bc;
|
||||
le_uint32 ad;
|
||||
};
|
||||
|
||||
struct HEADTable
|
||||
{
|
||||
fixed version;
|
||||
fixed fontRevision;
|
||||
le_uint32 checksumAdjustment;
|
||||
le_uint32 magicNumber;
|
||||
le_uint16 flags;
|
||||
le_uint16 unitsPerEm;
|
||||
BigDate created;
|
||||
BigDate modified;
|
||||
le_int16 xMin;
|
||||
le_int16 yMin;
|
||||
le_int16 xMax;
|
||||
le_int16 yMax;
|
||||
le_int16 lowestRecPPEM;
|
||||
le_int16 fontDirectionHint;
|
||||
le_int16 indexToLocFormat;
|
||||
le_int16 glyphDataFormat;
|
||||
fixed version;
|
||||
fixed fontRevision;
|
||||
le_uint32 checksumAdjustment;
|
||||
le_uint32 magicNumber;
|
||||
le_uint16 flags;
|
||||
le_uint16 unitsPerEm;
|
||||
BigDate created;
|
||||
BigDate modified;
|
||||
le_int16 xMin;
|
||||
le_int16 yMin;
|
||||
le_int16 xMax;
|
||||
le_int16 yMax;
|
||||
le_int16 lowestRecPPEM;
|
||||
le_int16 fontDirectionHint;
|
||||
le_int16 indexToLocFormat;
|
||||
le_int16 glyphDataFormat;
|
||||
};
|
||||
|
||||
struct MAXPTable
|
||||
{
|
||||
fixed version;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 maxPoints;
|
||||
le_uint16 maxContours;
|
||||
le_uint16 maxComponentPoints;
|
||||
le_uint16 maxComponentContours;
|
||||
le_uint16 maxZones;
|
||||
le_uint16 maxTwilightPoints;
|
||||
le_uint16 maxStorage;
|
||||
le_uint16 maxFunctionDefs;
|
||||
le_uint16 maxInstructionDefs;
|
||||
le_uint16 maxStackElements;
|
||||
le_uint16 maxSizeOfInstructions;
|
||||
le_uint16 maxComponentElements;
|
||||
le_uint16 maxComponentDepth;
|
||||
fixed version;
|
||||
le_uint16 numGlyphs;
|
||||
le_uint16 maxPoints;
|
||||
le_uint16 maxContours;
|
||||
le_uint16 maxComponentPoints;
|
||||
le_uint16 maxComponentContours;
|
||||
le_uint16 maxZones;
|
||||
le_uint16 maxTwilightPoints;
|
||||
le_uint16 maxStorage;
|
||||
le_uint16 maxFunctionDefs;
|
||||
le_uint16 maxInstructionDefs;
|
||||
le_uint16 maxStackElements;
|
||||
le_uint16 maxSizeOfInstructions;
|
||||
le_uint16 maxComponentElements;
|
||||
le_uint16 maxComponentDepth;
|
||||
};
|
||||
|
||||
struct HHEATable
|
||||
{
|
||||
fixed version;
|
||||
le_int16 ascent;
|
||||
le_int16 descent;
|
||||
le_int16 lineGap;
|
||||
le_uint16 advanceWidthMax;
|
||||
le_int16 minLeftSideBearing;
|
||||
le_int16 minRightSideBearing;
|
||||
le_int16 xMaxExtent;
|
||||
le_int16 caretSlopeRise;
|
||||
le_int16 caretSlopeRun;
|
||||
le_int16 caretOffset;
|
||||
le_int16 reserved1;
|
||||
le_int16 reserved2;
|
||||
le_int16 reserved3;
|
||||
le_int16 reserved4;
|
||||
le_int16 metricDataFormat;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
fixed version;
|
||||
le_int16 ascent;
|
||||
le_int16 descent;
|
||||
le_int16 lineGap;
|
||||
le_uint16 advanceWidthMax;
|
||||
le_int16 minLeftSideBearing;
|
||||
le_int16 minRightSideBearing;
|
||||
le_int16 xMaxExtent;
|
||||
le_int16 caretSlopeRise;
|
||||
le_int16 caretSlopeRun;
|
||||
le_int16 caretOffset;
|
||||
le_int16 reserved1;
|
||||
le_int16 reserved2;
|
||||
le_int16 reserved3;
|
||||
le_int16 reserved4;
|
||||
le_int16 metricDataFormat;
|
||||
le_uint16 numOfLongHorMetrics;
|
||||
};
|
||||
|
||||
struct LongHorMetric
|
||||
{
|
||||
le_uint16 advanceWidth;
|
||||
le_int16 leftSideBearing;
|
||||
le_uint16 advanceWidth;
|
||||
le_int16 leftSideBearing;
|
||||
};
|
||||
|
||||
struct HMTXTable
|
||||
{
|
||||
LongHorMetric hMetrics[ANY_NUMBER]; // ANY_NUMBER = numOfLongHorMetrics from hhea table
|
||||
// le_int16 leftSideBearing[ANY_NUMBER]; // ANY_NUMBER = numGlyphs - numOfLongHorMetrics
|
||||
LongHorMetric hMetrics[ANY_NUMBER]; // ANY_NUMBER = numOfLongHorMetrics from hhea table
|
||||
// le_int16 leftSideBearing[ANY_NUMBER]; // ANY_NUMBER = numGlyphs - numOfLongHorMetrics
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -85,36 +85,36 @@ public:
|
|||
// noSpaces - pointer to a UChar array for the text without spaces
|
||||
// noSpaceCount - the number of characters in the noSpaces array
|
||||
// verbose - report all breaks if true, otherwise just report differences
|
||||
ThaiWordbreakTest(const UChar *spaces, int32_t spaceCount, const UChar *noSpaces, int32_t noSpaceCount, UBool verbose);
|
||||
~ThaiWordbreakTest();
|
||||
ThaiWordbreakTest(const UChar *spaces, int32_t spaceCount, const UChar *noSpaces, int32_t noSpaceCount, UBool verbose);
|
||||
~ThaiWordbreakTest();
|
||||
|
||||
// returns the number of breaks that are in the spaces array
|
||||
// but aren't found in the noSpaces array
|
||||
int32_t getBreaksNotFound();
|
||||
int32_t getBreaksNotFound();
|
||||
|
||||
// returns the number of breaks which are found in the noSpaces
|
||||
// array but aren't in the spaces array
|
||||
int32_t getInvalidBreaks();
|
||||
int32_t getInvalidBreaks();
|
||||
|
||||
// returns the number of words found in the spaces array
|
||||
int32_t getWordCount();
|
||||
int32_t getWordCount();
|
||||
|
||||
// reads the input Unicode text file:
|
||||
// fileName - the path name of the file
|
||||
// charCount - set to the number of UChars read from the file
|
||||
// returns - the address of the UChar array containing the characters
|
||||
static const UChar *readFile(char *fileName, int32_t &charCount);
|
||||
static const UChar *readFile(char *fileName, int32_t &charCount);
|
||||
|
||||
// removes spaces form the input UChar array:
|
||||
// spaces - pointer to the input UChar array
|
||||
// count - number of UChars in the spaces array
|
||||
// nonSpaceCount - the number of UChars in the result array
|
||||
// returns - the address of the UChar array with spaces removed
|
||||
static const UChar *crunchSpaces(const UChar *spaces, int32_t count, int32_t &nonSpaceCount);
|
||||
static const UChar *crunchSpaces(const UChar *spaces, int32_t count, int32_t &nonSpaceCount);
|
||||
|
||||
private:
|
||||
// The no arg constructor - private so clients can't call it
|
||||
ThaiWordbreakTest();
|
||||
ThaiWordbreakTest();
|
||||
|
||||
// This does the actual comparison:
|
||||
// spaces - the address of the UChar array for the text with spaces
|
||||
|
|
@ -122,30 +122,30 @@ private:
|
|||
// noSpaces - the address of the UChar array for the text without spaces
|
||||
// noSpaceCount - the number of UChars in the noSpaces array
|
||||
// returns - true if all breaks match, false otherwise
|
||||
UBool compareWordBreaks(const UChar *spaces, int32_t spaceCount,
|
||||
UBool compareWordBreaks(const UChar *spaces, int32_t spaceCount,
|
||||
const UChar *noSpaces, int32_t noSpaceCount);
|
||||
|
||||
// helper method to report a break in the spaces
|
||||
// array that's not found in the noSpaces array
|
||||
void breakNotFound(int32_t br);
|
||||
void breakNotFound(int32_t br);
|
||||
|
||||
// helper method to report a break that's found in
|
||||
// the noSpaces array that's not in the spaces array
|
||||
void foundInvalidBreak(int32_t br);
|
||||
void foundInvalidBreak(int32_t br);
|
||||
|
||||
// count of breaks in the spaces array that
|
||||
// aren't found in the noSpaces array
|
||||
int32_t fBreaksNotFound;
|
||||
int32_t fBreaksNotFound;
|
||||
|
||||
// count of breaks found in the noSpaces array
|
||||
// that aren't in the spaces array
|
||||
int32_t fInvalidBreaks;
|
||||
int32_t fInvalidBreaks;
|
||||
|
||||
// number of words found in the spaces array
|
||||
int32_t fWordCount;
|
||||
int32_t fWordCount;
|
||||
|
||||
// report all breaks if true, otherwise just report differences
|
||||
UBool fVerbose;
|
||||
UBool fVerbose;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -155,7 +155,7 @@ ThaiWordbreakTest::ThaiWordbreakTest(const UChar *spaces, int32_t spaceCount,
|
|||
const UChar *noSpaces, int32_t noSpaceCount, UBool verbose)
|
||||
: fBreaksNotFound(0), fInvalidBreaks(0), fWordCount(0), fVerbose(verbose)
|
||||
{
|
||||
compareWordBreaks(spaces, spaceCount, noSpaces, noSpaceCount);
|
||||
compareWordBreaks(spaces, spaceCount, noSpaces, noSpaceCount);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -163,7 +163,7 @@ ThaiWordbreakTest::ThaiWordbreakTest(const UChar *spaces, int32_t spaceCount,
|
|||
*/
|
||||
ThaiWordbreakTest::ThaiWordbreakTest()
|
||||
{
|
||||
// nothing
|
||||
// nothing
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -171,7 +171,7 @@ ThaiWordbreakTest::ThaiWordbreakTest()
|
|||
*/
|
||||
ThaiWordbreakTest::~ThaiWordbreakTest()
|
||||
{
|
||||
// nothing?
|
||||
// nothing?
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -180,7 +180,7 @@ ThaiWordbreakTest::~ThaiWordbreakTest()
|
|||
*/
|
||||
inline int32_t ThaiWordbreakTest::getBreaksNotFound()
|
||||
{
|
||||
return fBreaksNotFound;
|
||||
return fBreaksNotFound;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -189,7 +189,7 @@ inline int32_t ThaiWordbreakTest::getBreaksNotFound()
|
|||
*/
|
||||
inline int32_t ThaiWordbreakTest::getInvalidBreaks()
|
||||
{
|
||||
return fInvalidBreaks;
|
||||
return fInvalidBreaks;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -197,7 +197,7 @@ inline int32_t ThaiWordbreakTest::getInvalidBreaks()
|
|||
*/
|
||||
inline int32_t ThaiWordbreakTest::getWordCount()
|
||||
{
|
||||
return fWordCount;
|
||||
return fWordCount;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -212,7 +212,7 @@ UBool ThaiWordbreakTest::compareWordBreaks(const UChar *spaces, int32_t spaceCou
|
|||
UBool result = true;
|
||||
Locale thai("th");
|
||||
UCharCharacterIterator *noSpaceIter = new UCharCharacterIterator(noSpaces, noSpaceCount);
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
UErrorCode status = U_ZERO_ERROR;
|
||||
|
||||
BreakIterator *breakIter = BreakIterator::createWordInstance(thai, status);
|
||||
breakIter->adoptText(noSpaceIter);
|
||||
|
|
@ -369,13 +369,13 @@ const UChar *ThaiWordbreakTest::crunchSpaces(const UChar *spaces, int32_t count,
|
|||
}
|
||||
}
|
||||
|
||||
nonSpaceCount = count - spaceCount;
|
||||
nonSpaceCount = count - spaceCount;
|
||||
UChar *noSpaces = new UChar[nonSpaceCount];
|
||||
|
||||
if (noSpaces == 0) {
|
||||
fprintf(stderr, "Couldn't allocate memory for the space stripped text.\n");
|
||||
return 0;
|
||||
}
|
||||
if (noSpaces == 0) {
|
||||
fprintf(stderr, "Couldn't allocate memory for the space stripped text.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (out = 0, i = 0; i < count; i += 1) {
|
||||
if (spaces[i] != 0x0020 /*! Unicode::isSpaceChar(spaces[i])*/) {
|
||||
|
|
@ -383,7 +383,7 @@ const UChar *ThaiWordbreakTest::crunchSpaces(const UChar *spaces, int32_t count,
|
|||
}
|
||||
}
|
||||
|
||||
return noSpaces;
|
||||
return noSpaces;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -410,7 +410,7 @@ int main(int argc, char **argv)
|
|||
return 1;
|
||||
}
|
||||
|
||||
int32_t spaceCount, nonSpaceCount;
|
||||
int32_t spaceCount, nonSpaceCount;
|
||||
const UChar *spaces, *noSpaces;
|
||||
|
||||
spaces = ThaiWordbreakTest::readFile(fileName, spaceCount);
|
||||
|
|
@ -421,15 +421,15 @@ int main(int argc, char **argv)
|
|||
|
||||
noSpaces = ThaiWordbreakTest::crunchSpaces(spaces, spaceCount, nonSpaceCount);
|
||||
|
||||
if (noSpaces == 0) {
|
||||
return 1;
|
||||
}
|
||||
if (noSpaces == 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
ThaiWordbreakTest test(spaces, spaceCount, noSpaces, nonSpaceCount, verbose);
|
||||
|
||||
printf("word count: %d\n", test.getWordCount());
|
||||
printf("breaks not found: %d\n", test.getBreaksNotFound());
|
||||
printf("invalid breaks found: %d\n", test.getInvalidBreaks());
|
||||
printf("word count: %d\n", test.getWordCount());
|
||||
printf("breaks not found: %d\n", test.getBreaksNotFound());
|
||||
printf("invalid breaks found: %d\n", test.getInvalidBreaks());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ strlist_open(UErrorCode *status)
|
|||
|
||||
void
|
||||
strlist_close(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t i;
|
||||
|
||||
|
|
@ -77,8 +77,8 @@ strlist_close(struct SList *list,
|
|||
|
||||
void
|
||||
strlist_add(struct SList *list,
|
||||
const UChar *s,
|
||||
UErrorCode *status)
|
||||
const UChar *s,
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t index;
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ strlist_add(struct SList *list,
|
|||
|
||||
static void
|
||||
strlist_grow(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t i, j;
|
||||
int32_t newCapacity;
|
||||
|
|
@ -136,7 +136,7 @@ strlist_grow(struct SList *list,
|
|||
if(newData[i] == 0) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
for(j = 0; j < i; ++j)
|
||||
uprv_free(newData[j]);
|
||||
uprv_free(newData[j]);
|
||||
uprv_free(newData);
|
||||
return;
|
||||
}
|
||||
|
|
@ -186,7 +186,7 @@ strlist2d_open(UErrorCode *status)
|
|||
|
||||
void
|
||||
strlist2d_close(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t i;
|
||||
|
||||
|
|
@ -211,7 +211,7 @@ strlist2d_close(struct SList *list,
|
|||
|
||||
void
|
||||
strlist2d_newRow(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
if(U_FAILURE(*status)) return;
|
||||
|
||||
|
|
@ -228,8 +228,8 @@ strlist2d_newRow(struct SList *list,
|
|||
}
|
||||
|
||||
void strlist2d_add(struct SList *list,
|
||||
const UChar *s,
|
||||
UErrorCode *status)
|
||||
const UChar *s,
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t index;
|
||||
|
||||
|
|
@ -258,7 +258,7 @@ void strlist2d_add(struct SList *list,
|
|||
|
||||
static void
|
||||
strlist2d_grow(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t i, j;
|
||||
int32_t newCapacity;
|
||||
|
|
@ -287,7 +287,7 @@ strlist2d_grow(struct SList *list,
|
|||
if(newData[i] == 0) {
|
||||
*status = U_MEMORY_ALLOCATION_ERROR;
|
||||
for(j = 0; j < i; ++j)
|
||||
uprv_free(newData[j]);
|
||||
uprv_free(newData[j]);
|
||||
uprv_free(newData);
|
||||
return;
|
||||
}
|
||||
|
|
@ -301,7 +301,7 @@ strlist2d_grow(struct SList *list,
|
|||
|
||||
static void
|
||||
strlist2d_growRows(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
int32_t i;
|
||||
int32_t newCapacity;
|
||||
|
|
@ -361,7 +361,7 @@ taglist_open(UErrorCode *status)
|
|||
|
||||
void
|
||||
taglist_close(struct SList *list,
|
||||
UErrorCode *status)
|
||||
UErrorCode *status)
|
||||
{
|
||||
struct SStringPair *current;
|
||||
struct SStringPair *prev;
|
||||
|
|
@ -390,9 +390,9 @@ taglist_close(struct SList *list,
|
|||
|
||||
void
|
||||
taglist_add(struct SList *list,
|
||||
const UChar *tag,
|
||||
const UChar *data,
|
||||
UErrorCode *status)
|
||||
const UChar *tag,
|
||||
const UChar *data,
|
||||
UErrorCode *status)
|
||||
{
|
||||
/*int32_t index;*/
|
||||
struct SStringPair *pair = NULL;
|
||||
|
|
@ -472,8 +472,8 @@ taglist_add(struct SList *list,
|
|||
|
||||
const UChar*
|
||||
taglist_get(const struct SList *list,
|
||||
const char *tag,
|
||||
UErrorCode *status)
|
||||
const char *tag,
|
||||
UErrorCode *status)
|
||||
{
|
||||
/*int32_t i;*/
|
||||
struct SStringPair *current;
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ struct SRBItemList {
|
|||
struct SRBItemList* rblist_open(UErrorCode *status);
|
||||
|
||||
struct SRBItem* make_rbitem(const UChar *tag, const struct SList *data,
|
||||
UErrorCode *status);
|
||||
UErrorCode *status);
|
||||
|
||||
void rblist_close(struct SRBItemList *list, UErrorCode *status);
|
||||
|
||||
void rblist_setlocale(struct SRBItemList *list, const UChar *locale,
|
||||
UErrorCode *status);
|
||||
UErrorCode *status);
|
||||
void rblist_add(struct SRBItemList *list, struct SRBItem *s,
|
||||
UErrorCode *status);
|
||||
UErrorCode *status);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
*
|
||||
* Date Name Description
|
||||
* 05/26/99 stephen Creation.
|
||||
* 5/10/01 Ram removed ustdio dependency
|
||||
* 5/10/01 Ram removed ustdio dependency
|
||||
*******************************************************************************
|
||||
*/
|
||||
|
||||
|
|
@ -43,8 +43,8 @@ UChar32 unescape(UCHARBUF *buf, UErrorCode *status);
|
|||
void resetLineNumber(void);
|
||||
|
||||
enum ETokenType getNextToken(UCHARBUF *buf,
|
||||
struct UString *token,
|
||||
uint32_t *linenumber, /* out: linenumber of token */
|
||||
UErrorCode *status);
|
||||
struct UString *token,
|
||||
uint32_t *linenumber, /* out: linenumber of token */
|
||||
UErrorCode *status);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
/* go from "/usr/local/include/curses.h" to "/usr/local/include" */
|
||||
void
|
||||
get_dirname(char *dirname,
|
||||
const char *filename)
|
||||
const char *filename)
|
||||
{
|
||||
const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ get_dirname(char *dirname,
|
|||
/* go from "/usr/local/include/curses.h" to "curses" */
|
||||
void
|
||||
get_basename(char *basename,
|
||||
const char *filename)
|
||||
const char *filename)
|
||||
{
|
||||
/* strip off any leading directory portions */
|
||||
const char *lastSlash = uprv_strrchr(filename, U_FILE_SEP_CHAR) + 1;
|
||||
|
|
|
|||
|
|
@ -29,11 +29,11 @@
|
|||
static void write_ustring(FileStream *rb, const UChar *data);
|
||||
static void write_string(FileStream *rb, const char *data);
|
||||
static void write_strlist(FileStream *rb, const char *name,
|
||||
const struct SStringList *list);
|
||||
const struct SStringList *list);
|
||||
static void write_strlist2d(FileStream *rb, const char *name,
|
||||
const struct SStringList2d *list);
|
||||
const struct SStringList2d *list);
|
||||
static void write_taglist(FileStream *rb, const char *name,
|
||||
const struct STaggedList *list);
|
||||
const struct STaggedList *list);
|
||||
|
||||
/* Special values */
|
||||
static const int32_t sBOM = 0x021C;
|
||||
|
|
@ -53,7 +53,7 @@ static const UChar gCollationElementsTag [] = {
|
|||
/* Write a null-terminated UChar array */
|
||||
static void
|
||||
write_ustring(FileStream *rb,
|
||||
const UChar *data)
|
||||
const UChar *data)
|
||||
{
|
||||
int32_t len;
|
||||
|
||||
|
|
@ -80,8 +80,8 @@ write_string(FileStream *rb,
|
|||
/* Write a string list */
|
||||
static void
|
||||
write_strlist(FileStream *rb,
|
||||
const char *name,
|
||||
const struct SStringList *list)
|
||||
const char *name,
|
||||
const struct SStringList *list)
|
||||
{
|
||||
int32_t i;
|
||||
|
||||
|
|
@ -103,8 +103,8 @@ write_strlist(FileStream *rb,
|
|||
/* Write a 2-d string list */
|
||||
static void
|
||||
write_strlist2d(FileStream *rb,
|
||||
const char *name,
|
||||
const struct SStringList2d *list)
|
||||
const char *name,
|
||||
const struct SStringList2d *list)
|
||||
{
|
||||
int32_t i, j;
|
||||
int32_t itemcount;
|
||||
|
|
@ -136,8 +136,8 @@ write_strlist2d(FileStream *rb,
|
|||
/* Write a tagged list */
|
||||
static void
|
||||
write_taglist(FileStream *rb,
|
||||
const char *name,
|
||||
const struct STaggedList *list)
|
||||
const char *name,
|
||||
const struct STaggedList *list)
|
||||
{
|
||||
/* int32_t i; */
|
||||
struct SStringPair *current;
|
||||
|
|
@ -169,8 +169,8 @@ write_taglist(FileStream *rb,
|
|||
/* Write a parsed SRBItemList to a file */
|
||||
void
|
||||
rb_write(FileStream *f,
|
||||
struct SRBItemList *data,
|
||||
UErrorCode *status)
|
||||
struct SRBItemList *data,
|
||||
UErrorCode *status)
|
||||
{
|
||||
/* int32_t i; */
|
||||
struct SRBItem *item;
|
||||
|
|
@ -194,7 +194,7 @@ rb_write(FileStream *f,
|
|||
switch(item->fData->fType) {
|
||||
case eStringList:
|
||||
/*if(u_strcmp(item->fTag, gCollationElementsTag) == 0)
|
||||
puts("got CollationElements");*/
|
||||
puts("got CollationElements");*/
|
||||
write_strlist(f, item->fTag, &item->fData->u.fStringList);
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@ struct {
|
|||
uprv_free(inverse);
|
||||
fclose(data);
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static UOption options[]={
|
||||
|
|
|
|||
|
|
@ -71,38 +71,38 @@ const char *pkg_writeCharListWrap(FileStream *s, CharList *l, const char *delim,
|
|||
|
||||
const char *pkg_writeCharList(FileStream *s, CharList *l, const char *delim, int32_t quote)
|
||||
{
|
||||
char buffer[1024];
|
||||
while(l != NULL)
|
||||
char buffer[1024];
|
||||
while(l != NULL)
|
||||
{
|
||||
if(l->str)
|
||||
{
|
||||
uprv_strcpy(buffer, l->str);
|
||||
if(quote < 0) { /* remove quotes */
|
||||
if(buffer[uprv_strlen(buffer)-1] == '"') {
|
||||
buffer[uprv_strlen(buffer)-1] = '\0';
|
||||
}
|
||||
if(buffer[0] == '"') {
|
||||
uprv_strcpy(buffer, buffer+1);
|
||||
}
|
||||
} else if(quote > 0) { /* add quotes */
|
||||
if(l->str[0] != '"') {
|
||||
uprv_strcpy(buffer, "\"");
|
||||
uprv_strcat(buffer, l->str);
|
||||
}
|
||||
if(l->str[uprv_strlen(l->str)-1] != '"') {
|
||||
uprv_strcat(buffer, "\"");
|
||||
}
|
||||
}
|
||||
T_FileStream_write(s, buffer, uprv_strlen(buffer));
|
||||
}
|
||||
|
||||
if(l->next && delim)
|
||||
{
|
||||
T_FileStream_write(s, delim, uprv_strlen(delim));
|
||||
}
|
||||
l = l->next;
|
||||
if(l->str)
|
||||
{
|
||||
uprv_strcpy(buffer, l->str);
|
||||
if(quote < 0) { /* remove quotes */
|
||||
if(buffer[uprv_strlen(buffer)-1] == '"') {
|
||||
buffer[uprv_strlen(buffer)-1] = '\0';
|
||||
}
|
||||
if(buffer[0] == '"') {
|
||||
uprv_strcpy(buffer, buffer+1);
|
||||
}
|
||||
} else if(quote > 0) { /* add quotes */
|
||||
if(l->str[0] != '"') {
|
||||
uprv_strcpy(buffer, "\"");
|
||||
uprv_strcat(buffer, l->str);
|
||||
}
|
||||
if(l->str[uprv_strlen(l->str)-1] != '"') {
|
||||
uprv_strcat(buffer, "\"");
|
||||
}
|
||||
}
|
||||
T_FileStream_write(s, buffer, uprv_strlen(buffer));
|
||||
}
|
||||
|
||||
if(l->next && delim)
|
||||
{
|
||||
T_FileStream_write(s, delim, uprv_strlen(delim));
|
||||
}
|
||||
l = l->next;
|
||||
}
|
||||
return NULL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -107,8 +107,8 @@ typedef struct UPKGOptions_
|
|||
const char *srcDir;
|
||||
const char *options; /* Options arg */
|
||||
const char *mode; /* Mode of building */
|
||||
const char *version; /* Library version */
|
||||
const char *makeArgs; /* XXX Should be a CharList! */
|
||||
const char *version; /* Library version */
|
||||
const char *makeArgs; /* XXX Should be a CharList! */
|
||||
const char *comment; /* comment string */
|
||||
const char *makeFile; /* Makefile path */
|
||||
const char *install; /* Where to install to (NULL = don't install) */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/******************************************************************************
|
||||
*
|
||||
* Copyright (C) 2000, International Business Machines
|
||||
* Copyright (C) 2000-2002, International Business Machines
|
||||
* Corporation and others. All Rights Reserved.
|
||||
*
|
||||
*******************************************************************************
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
* created by: Vladimir Weinstein
|
||||
*
|
||||
* This program packages the ICU data into different forms
|
||||
* (DLL, common data, etc.)
|
||||
* (DLL, common data, etc.)
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -33,189 +33,189 @@
|
|||
|
||||
void writeCmnRules(UPKGOptions *o, FileStream *makefile)
|
||||
{
|
||||
char tmp[1024];
|
||||
CharList *infiles;
|
||||
char tmp[1024];
|
||||
CharList *infiles;
|
||||
|
||||
infiles = o->filePaths;
|
||||
infiles = o->filePaths;
|
||||
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(CMNTARGET)\" : $(DATAFILEPATHS)\n\t@\"$(GENCMN)\" -C \"%s\" -d \"%s\" -n \"$(NAME)\" 0 <<\n",
|
||||
o->comment, o->targetDir);
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(CMNTARGET)\" : $(DATAFILEPATHS)\n\t@\"$(GENCMN)\" -C \"%s\" -d \"%s\" -n \"$(NAME)\" 0 <<\n",
|
||||
o->comment, o->targetDir);
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
|
||||
pkg_writeCharList(makefile, infiles, "\n", -1);
|
||||
pkg_writeCharList(makefile, infiles, "\n", -1);
|
||||
/*
|
||||
for(;infiles;infiles = infiles->next) {
|
||||
if(infiles->str[0] != '"' && infiles->str[uprv_strlen(infiles->str)-1] != '"') {
|
||||
sprintf(tmp, "\"%s\"\n", infiles->str);
|
||||
} else {
|
||||
sprintf(tmp, "%s\n", infiles->str);
|
||||
}
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
}
|
||||
for(;infiles;infiles = infiles->next) {
|
||||
if(infiles->str[0] != '"' && infiles->str[uprv_strlen(infiles->str)-1] != '"') {
|
||||
sprintf(tmp, "\"%s\"\n", infiles->str);
|
||||
} else {
|
||||
sprintf(tmp, "%s\n", infiles->str);
|
||||
}
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
}
|
||||
*/
|
||||
sprintf(tmp, "\n<<\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp, "\n<<\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status) {
|
||||
char tmp[1024];
|
||||
char tmp2[1024];
|
||||
const char *separator = o->icuroot[uprv_strlen(o->icuroot)-1]=='\\'?"":"\\";
|
||||
UBool isDll = (UBool)(uprv_strcmp(o->mode, "dll") == 0);
|
||||
UBool isStatic = (UBool)(uprv_strcmp(o->mode, "static") == 0);
|
||||
char tmp[1024];
|
||||
char tmp2[1024];
|
||||
const char *separator = o->icuroot[uprv_strlen(o->icuroot)-1]=='\\'?"":"\\";
|
||||
UBool isDll = (UBool)(uprv_strcmp(o->mode, "dll") == 0);
|
||||
UBool isStatic = (UBool)(uprv_strcmp(o->mode, "static") == 0);
|
||||
|
||||
if(U_FAILURE(*status)) {
|
||||
return;
|
||||
}
|
||||
if(U_FAILURE(*status)) {
|
||||
return;
|
||||
}
|
||||
|
||||
sprintf(tmp2, "ICUROOT=%s\n\n", o->icuroot);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
sprintf(tmp2, "ICUROOT=%s\n\n", o->icuroot);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"GENCMN = $(ICUROOT)%sbin\\gencmn.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
sprintf(tmp2,
|
||||
"GENCMN = $(ICUROOT)%sbin\\gencmn.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
if(isDll) {
|
||||
uprv_strcpy(tmp, LIB_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_SO_SUFFIX);
|
||||
if(isDll) {
|
||||
uprv_strcpy(tmp, LIB_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_SO_SUFFIX);
|
||||
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output %s file: %s%s%s\n", UDATA_SO_SUFFIX, o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output %s file: %s%s%s\n", UDATA_SO_SUFFIX, o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
|
||||
if(o->nooutput) {
|
||||
if(o->nooutput) {
|
||||
*status = U_ZERO_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
sprintf(tmp2, "# DLL file to make:\nDLLTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"LINK32 = link.exe\n"
|
||||
"LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /DLL /NOENTRY /base:\"0x4ad00000\" /implib:\"$(TARGETDIR)\\$(ENTRYPOINT).lib\" /comment:\"%s\"\n",
|
||||
o->comment
|
||||
);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"GENCCODE = $(ICUROOT)%sbin\\genccode.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
T_FileStream_writeLine(makefile, "\n"
|
||||
"# Windows specific DLL version information.\n"
|
||||
"!IF EXISTS(\".\\icudata.res\")\n"
|
||||
"DATA_VER_INFO=\".\\icudata.res\"\n"
|
||||
"!ELSE\n"
|
||||
"DATA_VER_INFO=\n"
|
||||
"!ENDIF\n\n");
|
||||
|
||||
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX "$(NAME)" UDATA_CMN_INTERMEDIATE_SUFFIX OBJ_SUFFIX);
|
||||
|
||||
sprintf(tmp2, "# intermediate obj file:\nCMNOBJTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
else if (isStatic)
|
||||
{
|
||||
uprv_strcpy(tmp, LIB_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_LIB_SUFFIX);
|
||||
|
||||
pkg_sttc_writeReadme(o, tmp, status);
|
||||
if(U_FAILURE(*status))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output %s file: %s%s%s\n", UDATA_SO_SUFFIX, o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
|
||||
if(o->nooutput) {
|
||||
*status = U_ZERO_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
sprintf(tmp2, "# LIB file to make:\nDLLTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"LINK32 = LIB.exe\n"
|
||||
"LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /EXPORT:\"%s\"\n",
|
||||
o->cShortName
|
||||
);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"GENCCODE = $(ICUROOT)%sbin\\genccode.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
T_FileStream_writeLine(makefile, "\n"
|
||||
"# Windows specific LIB version information.\n"
|
||||
"!IF EXISTS(\".\\icudata.res\")\n"
|
||||
"DATA_VER_INFO=\".\\icudata.res\"\n"
|
||||
"!ELSE\n"
|
||||
"DATA_VER_INFO=\n"
|
||||
"!ENDIF\n\n");
|
||||
|
||||
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX "$(NAME)" UDATA_CMN_INTERMEDIATE_SUFFIX OBJ_SUFFIX);
|
||||
|
||||
sprintf(tmp2, "# intermediate obj file:\nCMNOBJTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_CMN_SUFFIX);
|
||||
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output file: %s%s%s\n", o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
|
||||
if(o->nooutput) {
|
||||
*status = U_ZERO_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
sprintf(tmp2, "# DLL file to make:\nDLLTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"LINK32 = link.exe\n"
|
||||
"LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /DLL /NOENTRY /base:\"0x4ad00000\" /implib:\"$(TARGETDIR)\\$(ENTRYPOINT).lib\" /comment:\"%s\"\n",
|
||||
o->comment
|
||||
);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"GENCCODE = $(ICUROOT)%sbin\\genccode.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
T_FileStream_writeLine(makefile, "\n"
|
||||
"# Windows specific DLL version information.\n"
|
||||
"!IF EXISTS(\".\\icudata.res\")\n"
|
||||
"DATA_VER_INFO=\".\\icudata.res\"\n"
|
||||
"!ELSE\n"
|
||||
"DATA_VER_INFO=\n"
|
||||
"!ENDIF\n\n");
|
||||
|
||||
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX "$(NAME)" UDATA_CMN_INTERMEDIATE_SUFFIX OBJ_SUFFIX);
|
||||
|
||||
sprintf(tmp2, "# intermediate obj file:\nCMNOBJTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
else if (isStatic)
|
||||
{
|
||||
uprv_strcpy(tmp, LIB_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_LIB_SUFFIX);
|
||||
|
||||
pkg_sttc_writeReadme(o, tmp, status);
|
||||
if(U_FAILURE(*status))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output %s file: %s%s%s\n", UDATA_SO_SUFFIX, o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
|
||||
if(o->nooutput) {
|
||||
*status = U_ZERO_ERROR;
|
||||
return;
|
||||
}
|
||||
|
||||
sprintf(tmp2, "# LIB file to make:\nDLLTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"LINK32 = LIB.exe\n"
|
||||
"LINK32_FLAGS = /nologo /out:\"$(TARGETDIR)\\$(DLLTARGET)\" /EXPORT:\"%s\"\n",
|
||||
o->cShortName
|
||||
);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
sprintf(tmp2,
|
||||
"GENCCODE = $(ICUROOT)%sbin\\genccode.exe\n", separator);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
T_FileStream_writeLine(makefile, "\n"
|
||||
"# Windows specific LIB version information.\n"
|
||||
"!IF EXISTS(\".\\icudata.res\")\n"
|
||||
"DATA_VER_INFO=\".\\icudata.res\"\n"
|
||||
"!ELSE\n"
|
||||
"DATA_VER_INFO=\n"
|
||||
"!ENDIF\n\n");
|
||||
|
||||
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX "$(NAME)" UDATA_CMN_INTERMEDIATE_SUFFIX OBJ_SUFFIX);
|
||||
|
||||
sprintf(tmp2, "# intermediate obj file:\nCMNOBJTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
uprv_strcpy(tmp, UDATA_CMN_PREFIX);
|
||||
uprv_strcat(tmp, o->cShortName);
|
||||
uprv_strcat(tmp, UDATA_CMN_SUFFIX);
|
||||
|
||||
if(o->nooutput || o->verbose) {
|
||||
fprintf(stdout, "# Output file: %s%s%s\n", o->targetDir, U_FILE_SEP_STRING, tmp);
|
||||
}
|
||||
|
||||
if(o->nooutput) {
|
||||
*status = U_ZERO_ERROR;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
sprintf(tmp2, "# common file to make:\nCMNTARGET=%s\n\n", tmp);
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
|
||||
if(isDll || isStatic) {
|
||||
sprintf(tmp, "all: \"$(TARGETDIR)\\$(DLLTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
if(isDll || isStatic) {
|
||||
sprintf(tmp, "all: \"$(TARGETDIR)\\$(DLLTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(DLLTARGET)\": \"$(TARGETDIR)\\$(CMNOBJTARGET)\"\n"
|
||||
"\t$(LINK32) $(LINK32_FLAGS) \"$(TARGETDIR)\\$(CMNOBJTARGET)\" $(DATA_VER_INFO)\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(CMNOBJTARGET)\": \"$(TARGETDIR)\\$(CMNTARGET)\"\n"
|
||||
"\t@\"$(GENCCODE)\" $(GENCOPTIONS) -e $(ENTRYPOINT) -o -d \"$(TARGETDIR)\" \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(DLLTARGET)\": \"$(TARGETDIR)\\$(CMNOBJTARGET)\"\n"
|
||||
"\t$(LINK32) $(LINK32_FLAGS) \"$(TARGETDIR)\\$(CMNOBJTARGET)\" $(DATA_VER_INFO)\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp, "\"$(TARGETDIR)\\$(CMNOBJTARGET)\": \"$(TARGETDIR)\\$(CMNTARGET)\"\n"
|
||||
"\t@\"$(GENCCODE)\" $(GENCOPTIONS) -e $(ENTRYPOINT) -o -d \"$(TARGETDIR)\" \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
|
||||
sprintf(tmp2,
|
||||
"clean:\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(DLLTARGET)\"\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNOBJTARGET)\"\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
} else { /* common */
|
||||
sprintf(tmp, "all: \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp2,
|
||||
"clean:\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(DLLTARGET)\"\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNOBJTARGET)\"\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
} else { /* common */
|
||||
sprintf(tmp, "all: \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
|
||||
sprintf(tmp2,
|
||||
"clean:\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
sprintf(tmp2,
|
||||
"clean:\n"
|
||||
"\t-@erase \"$(TARGETDIR)\\$(CMNTARGET)\"\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
}
|
||||
|
||||
sprintf(tmp2, "rebuild: clean all\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
sprintf(tmp2, "rebuild: clean all\n\n");
|
||||
T_FileStream_writeLine(makefile, tmp2);
|
||||
|
||||
/* Write compile rules */
|
||||
writeCmnRules(o, makefile);
|
||||
/* Write compile rules */
|
||||
writeCmnRules(o, makefile);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -352,10 +352,10 @@ ucbuf_open(FileStream* in,const char* cp, UBool showWarning, UErrorCode* err){
|
|||
}
|
||||
buf->remaining=T_FileStream_size(in)-numRead;
|
||||
buf->buffer=(UChar*) uprv_malloc(sizeof(UChar)* MAX_U_BUF);
|
||||
if (buf->buffer == NULL) {
|
||||
*err = U_MEMORY_ALLOCATION_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
if (buf->buffer == NULL) {
|
||||
*err = U_MEMORY_ALLOCATION_ERROR;
|
||||
return NULL;
|
||||
}
|
||||
buf->currentPos=buf->buffer;
|
||||
buf->bufLimit=buf->buffer;
|
||||
if(U_FAILURE(*err)){
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue