You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/02/05 14:11:45 UTC
cvs commit: xml-xerces/c/src/xercesc/util TransService.cpp XMLUni.cpp XMLUni.hpp
tng 02/02/05 05:11:45
Modified: c/src/xercesc/util TransService.cpp XMLUni.cpp XMLUni.hpp
Log:
Recognize IBM01140 (IANA encoding) as alias of intrinsic encoding IBM1140.
Revision Changes Path
1.2 +4 -3 xml-xerces/c/src/xercesc/util/TransService.cpp
Index: TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/TransService.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransService.cpp 1 Feb 2002 22:22:13 -0000 1.1
+++ TransService.cpp 5 Feb 2002 13:11:45 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: TransService.cpp,v 1.1 2002/02/01 22:22:13 peiyongz Exp $
+ * $Id: TransService.cpp,v 1.2 2002/02/05 13:11:45 tng Exp $
*/
// ---------------------------------------------------------------------------
// Includes
@@ -492,9 +492,10 @@
//
// Add in our mappings for IBM037 with Euro update, i.e. IBM1140. It
- // has no aliases
+ // has alias IBM01140, the one suggested by IANA
//
gMappings->put((void*)XMLUni::fgIBM1140EncodingString, new ENameMapFor<XMLIBM1140Transcoder>(XMLUni::fgIBM1140EncodingString));
+ gMappings->put((void*)XMLUni::fgIBM1140EncodingString2, new ENameMapFor<XMLIBM1140Transcoder>(XMLUni::fgIBM1140EncodingString2));
//
// Add in our mappings for Windows-1252. We don't have any aliases for
1.2 +7 -2 xml-xerces/c/src/xercesc/util/XMLUni.cpp
Index: XMLUni.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUni.cpp 1 Feb 2002 22:22:17 -0000 1.1
+++ XMLUni.cpp 5 Feb 2002 13:11:45 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLUni.cpp,v 1.1 2002/02/01 22:22:17 peiyongz Exp $
+ * $Id: XMLUni.cpp,v 1.2 2002/02/05 13:11:45 tng Exp $
*/
@@ -171,6 +171,11 @@
const XMLCh XMLUni::fgIBM1140EncodingString[] =
{
chLatin_I, chLatin_B, chLatin_M, chDigit_1, chDigit_1, chDigit_4, chDigit_0, chNull
+};
+
+const XMLCh XMLUni::fgIBM1140EncodingString2[] =
+{
+ chLatin_I, chLatin_B, chLatin_M, chDigit_0, chDigit_1, chDigit_1, chDigit_4, chDigit_0, chNull
};
const XMLCh XMLUni::fgIESString[] =
1.2 +3 -2 xml-xerces/c/src/xercesc/util/XMLUni.hpp
Index: XMLUni.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLUni.hpp 1 Feb 2002 22:22:17 -0000 1.1
+++ XMLUni.hpp 5 Feb 2002 13:11:45 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999-2001 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@
*/
/*
- * $Id: XMLUni.hpp,v 1.1 2002/02/01 22:22:17 peiyongz Exp $
+ * $Id: XMLUni.hpp,v 1.2 2002/02/05 13:11:45 tng Exp $
*/
@@ -100,6 +100,7 @@
static const XMLCh fgIBM037EncodingString[];
static const XMLCh fgIBM037EncodingString2[];
static const XMLCh fgIBM1140EncodingString[];
+ static const XMLCh fgIBM1140EncodingString2[];
static const XMLCh fgIESString[];
static const XMLCh fgIDString[];
static const XMLCh fgIDRefString[];
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org