tng 2002/12/24 09:59:07
Modified: c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/util/Platforms/Win32 Version.rc
c/src/xercesc/util/Transcoders/ICU ICUTransService.cpp
c/src/xercesc/util/regx TokenFactory.cpp XMLUniCharacter.cpp
Log:
Build with ICU 2.4
Revision Changes Path
1.24 +1 -1 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLErrList_EN_US.Xml 17 Dec 2002 12:19:08 -0000 1.23
+++ XMLErrList_EN_US.Xml 24 Dec 2002 17:59:06 -0000 1.24
@@ -559,7 +559,7 @@
<Message Id="Parser_Ope3" Text="The range end code point '{0}' is less
than the start code point '{1}'"/>
<Message Id="Parser_Descape1" Text="Invalid Unicode hex notation"/>
<Message Id="Parser_Descape2" Text="Overflow in a hex notation"/>
- <Message Id="Parser_Descape3" Text="'\\x{' must be closed by '}'"/>
+ <Message Id="Parser_Descape3" Text="'\ x{' must be closed by '}'"/>
<Message Id="Parser_Descape4" Text="Invalid Unicode code point"/>
<Message Id="Parser_Descape5" Text="An anchor must not be here"/>
<Message Id="Parser_Process1" Text="This expression is not supported in
the current option setting"/>
1.16 +1 -1 xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- en_US.txt 20 Dec 2002 21:39:22 -0000 1.15
+++ en_US.txt 24 Dec 2002 17:59:06 -0000 1.16
@@ -560,7 +560,7 @@
"The range end code point '{0}' is less than the start code point
'{1}' " ,
"Invalid Unicode hex notation " ,
"Overflow in a hex notation " ,
- "'\\x{' must be closed by '}' " ,
+ "'\ x{' must be closed by '}' " ,
"Invalid Unicode code point " ,
"An anchor must not be here " ,
"This expression is not supported in the current option setting " ,
1.6 +1 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesMessages_en_US.hpp 20 Dec 2002 21:39:49 -0000 1.5
+++ XercesMessages_en_US.hpp 24 Dec 2002 17:59:06 -0000 1.6
@@ -1114,7 +1114,7 @@
0x00 }
, {
0x0049,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0055,0x006E,0x0069,0x0063,0x006F,0x0064,0x0065,0x0020,0x0068,0x0065,0x0078,0x0020,0x006E,0x006F,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x00
}
, {
0x004F,0x0076,0x0065,0x0072,0x0066,0x006C,0x006F,0x0077,0x0020,0x0069,0x006E,0x0020,0x0061,0x0020,0x0068,0x0065,0x0078,0x0020,0x006E,0x006F,0x0074,0x0061,0x0074,0x0069,0x006F,0x006E,0x00
}
- , {
0x0027,0x005C,0x005C,0x0078,0x007B,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0063,0x006C,0x006F,0x0073,0x0065,0x0064,0x0020,0x0062,0x0079,0x0020,0x0027,0x007D,0x0027,0x00
}
+ , {
0x0027,0x005C,0x0020,0x0078,0x007B,0x0027,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0062,0x0065,0x0020,0x0063,0x006C,0x006F,0x0073,0x0065,0x0064,0x0020,0x0062,0x0079,0x0020,0x0027,0x007D,0x0027,0x00
}
, {
0x0049,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x0020,0x0055,0x006E,0x0069,0x0063,0x006F,0x0064,0x0065,0x0020,0x0063,0x006F,0x0064,0x0065,0x0020,0x0070,0x006F,0x0069,0x006E,0x0074,0x00
}
, {
0x0041,0x006E,0x0020,0x0061,0x006E,0x0063,0x0068,0x006F,0x0072,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0068,0x0065,0x0072,0x0065,0x00
}
, {
0x0054,0x0068,0x0069,0x0073,0x0020,0x0065,0x0078,0x0070,0x0072,0x0065,0x0073,0x0073,0x0069,0x006F,0x006E,0x0020,0x0069,0x0073,0x0020,0x006E,0x006F,0x0074,0x0020,0x0073,0x0075,0x0070,0x0070,0x006F,0x0072,0x0074,0x0065,0x0064,0x0020,0x0069,0x006E,
1.6 +1 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesMessages_en_US.Msg 20 Dec 2002 21:40:02 -0000 1.5
+++ XercesMessages_en_US.Msg 24 Dec 2002 17:59:06 -0000 1.6
@@ -543,7 +543,7 @@
138 The range end code point '{0}' is less than the start code point '{1}'
139 Invalid Unicode hex notation
140 Overflow in a hex notation
-141 '\\x{' must be closed by '}'
+141 '\ x{' must be closed by '}'
142 Invalid Unicode code point
143 An anchor must not be here
144 This expression is not supported in the current option setting
1.29 +2 -1 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Version.rc 20 Dec 2002 21:40:21 -0000 1.28
+++ Version.rc 24 Dec 2002 17:59:07 -0000 1.29
@@ -95,6 +95,7 @@
#endif // APSTUDIO_INVOKED
+
// ----------------------------------------------------------------
// This file was generated from the XML error message source.
// so do not edit this file directly!!
@@ -645,7 +646,7 @@
8330
L"\x0054\x0068\x0065\x0020\x0072\x0061\x006E\x0067\x0065\x0020\x0065\x006E\x0064\x0020\x0063\x006F\x0064\x0065\x0020\x0070\x006F\x0069\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x0073\x0020\x006C\x0065\x0073\x0073\x0020\x0074\x0068\x0061\x006E\x0020\x0074\x0068\x0065\x0020\x0073\x0074\x0061\x0072\x0074\x0020\x0063\x006F\x0064\x0065\x0020\x0070\x006F\x0069\x006E\x0074\x0020\x0027\x007B\x0031\x007D\x0027\x00"
8331
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0055\x006E\x0069\x0063\x006F\x0064\x0065\x0020\x0068\x0065\x0078\x0020\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x00"
8332
L"\x004F\x0076\x0065\x0072\x0066\x006C\x006F\x0077\x0020\x0069\x006E\x0020\x0061\x0020\x0068\x0065\x0078\x0020\x006E\x006F\x0074\x0061\x0074\x0069\x006F\x006E\x00"
- 8333
L"\x0027\x005C\x005C\x0078\x007B\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0063\x006C\x006F\x0073\x0065\x0064\x0020\x0062\x0079\x0020\x0027\x007D\x0027\x00"
+ 8333
L"\x0027\x005C\x0020\x0078\x007B\x0027\x0020\x006D\x0075\x0073\x0074\x0020\x0062\x0065\x0020\x0063\x006C\x006F\x0073\x0065\x0064\x0020\x0062\x0079\x0020\x0027\x007D\x0027\x00"
8334
L"\x0049\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0055\x006E\x0069\x0063\x006F\x0064\x0065\x0020\x0063\x006F\x0064\x0065\x0020\x0070\x006F\x0069\x006E\x0074\x00"
8335
L"\x0041\x006E\x0020\x0061\x006E\x0063\x0068\x006F\x0072\x0020\x006D\x0075\x0073\x0074\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x0068\x0065\x0072\x0065\x00"
8336
L"\x0054\x0068\x0069\x0073\x0020\x0065\x0078\x0070\x0072\x0065\x0073\x0073\x0069\x006F\x006E\x0020\x0069\x0073\x0020\x006E\x006F\x0074\x0020\x0073\x0075\x0070\x0070\x006F\x0072\x0074\x0065\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0063\x0075\x0072\x0072\x0065\x006E\x0074\x0020\x006F\x0070\x0074\x0069\x006F\x006E\x0020\x0073\x0065\x0074\x0074\x0069\x006E\x0067\x00"
1.6 +7 -7
xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp
Index: ICUTransService.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/ICU/ICUTransService.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ICUTransService.cpp 4 Nov 2002 15:14:33 -0000 1.5
+++ ICUTransService.cpp 24 Dec 2002 17:59:07 -0000 1.6
@@ -69,7 +69,7 @@
#include "ICUTransService.hpp"
#include <string.h>
#include <unicode/uloc.h>
-#include <unicode/unicode.h>
+#include <unicode/uchar.h>
#include <unicode/ucnv.h>
#include <unicode/ucnv_err.h>
#include <unicode/ustring.h>
@@ -201,7 +201,7 @@
// larger than 0xFFFF, so our cast here will work for both possible
// sizes of XMLCh.
//
- if (Unicode::toUpperCase(UChar(*psz1)) !=
Unicode::toUpperCase(UChar(*psz2)))
+ if (u_toupper(UChar(*psz1)) != u_toupper(UChar(*psz2)))
return int(*psz1) - int(*psz2);
// If either has ended, then they both ended, so equal
@@ -232,7 +232,7 @@
// larger than 0xFFFF, so our cast here will work for both possible
// sizes of XMLCh.
//
- if (Unicode::toUpperCase(UChar(*psz1)) !=
Unicode::toUpperCase(UChar(*psz2)))
+ if (u_toupper(UChar(*psz1)) != u_toupper(UChar(*psz2)))
return int(*psz1) - int(*psz2);
// If either ended, then both ended, so equal
@@ -276,7 +276,7 @@
{
return true;
}
- return (Unicode::isSpaceChar(UChar(toCheck)) != 0);
+ return (u_isspace(UChar(toCheck)) != 0);
}
@@ -309,7 +309,7 @@
XMLCh* outPtr = toUpperCase;
while (*outPtr)
{
- *outPtr = XMLCh(Unicode::toUpperCase(UChar(*outPtr)));
+ *outPtr = XMLCh(u_toupper(UChar(*outPtr)));
outPtr++;
}
}
@@ -319,7 +319,7 @@
XMLCh* outPtr = toLowerCase;
while (*outPtr)
{
- *outPtr = XMLCh(Unicode::toLowerCase(UChar(*outPtr)));
+ *outPtr = XMLCh(u_tolower(UChar(*outPtr)));
outPtr++;
}
}
1.4 +20 -17 xml-xerces/c/src/xercesc/util/regx/TokenFactory.cpp
Index: TokenFactory.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/TokenFactory.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TokenFactory.cpp 4 Nov 2002 15:17:00 -0000 1.3
+++ TokenFactory.cpp 24 Dec 2002 17:59:07 -0000 1.4
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.4 2002/12/24 17:59:07 tng
+ * Build with ICU 2.4
+ *
* Revision 1.3 2002/11/04 15:17:00 tng
* C++ Namespace Support.
*
@@ -467,7 +470,7 @@
/*
#if defined (XML_USE_ICU_TRANSCODER)
- #include <unicode/unicode.h>
+ #include <unicode/uchar.h>
#endif
#include <stdio.h>
@@ -485,22 +488,22 @@
{
fprintf(outFl
, " , 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X,
0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X\n"
- , (unsigned int)Unicode::getType(index)
- , (unsigned int)Unicode::getType(index+1)
- , (unsigned int)Unicode::getType(index+2)
- , (unsigned int)Unicode::getType(index+3)
- , (unsigned int)Unicode::getType(index+4)
- , (unsigned int)Unicode::getType(index+5)
- , (unsigned int)Unicode::getType(index+6)
- , (unsigned int)Unicode::getType(index+7)
- , (unsigned int)Unicode::getType(index+8)
- , (unsigned int)Unicode::getType(index+9)
- , (unsigned int)Unicode::getType(index+10)
- , (unsigned int)Unicode::getType(index+11)
- , (unsigned int)Unicode::getType(index+12)
- , (unsigned int)Unicode::getType(index+13)
- , (unsigned int)Unicode::getType(index+14)
- , (unsigned int)Unicode::getType(index+15));
+ , (unsigned int)u_charType(index)
+ , (unsigned int)u_charType(index+1)
+ , (unsigned int)u_charType(index+2)
+ , (unsigned int)u_charType(index+3)
+ , (unsigned int)u_charType(index+4)
+ , (unsigned int)u_charType(index+5)
+ , (unsigned int)u_charType(index+6)
+ , (unsigned int)u_charType(index+7)
+ , (unsigned int)u_charType(index+8)
+ , (unsigned int)u_charType(index+9)
+ , (unsigned int)u_charType(index+10)
+ , (unsigned int)u_charType(index+11)
+ , (unsigned int)u_charType(index+12)
+ , (unsigned int)u_charType(index+13)
+ , (unsigned int)u_charType(index+14)
+ , (unsigned int)u_charType(index+15));
}
fprintf(outFl, "};\n");
1.3 +5 -2 xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.cpp
Index: XMLUniCharacter.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/XMLUniCharacter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLUniCharacter.cpp 4 Nov 2002 15:17:01 -0000 1.2
+++ XMLUniCharacter.cpp 24 Dec 2002 17:59:07 -0000 1.3
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.3 2002/12/24 17:59:07 tng
+ * Build with ICU 2.4
+ *
* Revision 1.2 2002/11/04 15:17:01 tng
* C++ Namespace Support.
*
@@ -77,7 +80,7 @@
#include <xercesc/util/regx/XMLUniCharacter.hpp>
#if defined (XML_USE_ICU_TRANSCODER)
- #include <unicode/unicode.h>
+ #include <unicode/uchar.h>
#else
#include <xercesc/util/regx/UniCharTable.hpp>
#endif
@@ -90,7 +93,7 @@
unsigned short XMLUniCharacter::getType(const XMLCh ch) {
#if defined (XML_USE_ICU_TRANSCODER)
- return (unsigned short) Unicode::getType(ch);
+ return (unsigned short) u_charType(ch);
#else
return (unsigned short) fgUniCharsTable[ch];
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
