dbertoni 00/04/20 09:41:42
Modified: c/src/XMLSupport FormatterToHTML.cpp FormatterToXML.cpp
FormatterToXML.hpp
Log:
Fixed namespace problems.
Revision Changes Path
1.15 +19 -15 xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FormatterToHTML.cpp 2000/04/20 14:14:20 1.14
+++ FormatterToHTML.cpp 2000/04/20 16:41:41 1.15
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: FormatterToHTML.cpp,v 1.14 2000/04/20 14:14:20 jdonohue Exp $
+ * $Id: FormatterToHTML.cpp,v 1.15 2000/04/20 16:41:41 dbertoni Exp $
*
* $State: Exp $
*
@@ -755,38 +755,42 @@
FormatterToHTML::AttributesMapType
FormatterToHTML::createAttributesMap()
{
+#if !defined(XALAN_NO_NAMESPACES)
+ using std::make_pair;
+#endif
+
AttributesMapType theAtts;
StringSetType URLAttrsHREFSingle;
URLAttrsHREFSingle.insert(XALAN_STATIC_UCODE_STRING("href"));
StringSetType URLAttrsCITESingle;
URLAttrsCITESingle.insert(XALAN_STATIC_UCODE_STRING("cite"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("base")),
URLAttrsHREFSingle));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("link")),
URLAttrsHREFSingle));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("area")),
URLAttrsHREFSingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("base")),
URLAttrsHREFSingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("link")),
URLAttrsHREFSingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("area")),
URLAttrsHREFSingle));
// From the HTML 4.0 spec: Note. The same conversion based on UTF-8
// should be applied to values of the name attribute for the A element.
StringSetType URLAttrs_A;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("href"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("name"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("a")),
URLAttrs_A));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("a")),
URLAttrs_A));
StringSetType URLAttrs_INPUT;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("src"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("usemap"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("input")),
URLAttrs_INPUT));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("input")),
URLAttrs_INPUT));
StringSetType URLAttrs_SCRIPT;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("src"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("for"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("script")),
URLAttrs_SCRIPT));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("script")),
URLAttrs_SCRIPT));
StringSetType URLAttrs_IMG;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("src"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("longdesc"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("usemap"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("img")),
URLAttrs_IMG));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("img")),
URLAttrs_IMG));
StringSetType URLAttrs_OBJECT;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("classid"));
@@ -794,20 +798,20 @@
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("data"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("archive"));
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("usemap"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("object")),
URLAttrs_OBJECT));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("object")),
URLAttrs_OBJECT));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("q")),
URLAttrsCITESingle));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("blockquote")),
URLAttrsCITESingle));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ins")),
URLAttrsCITESingle));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("del")),
URLAttrsCITESingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("q")),
URLAttrsCITESingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("blockquote")),
URLAttrsCITESingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ins")),
URLAttrsCITESingle));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("del")),
URLAttrsCITESingle));
StringSetType URLAttrs_FORM;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("action"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("form")),
URLAttrs_FORM));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("form")),
URLAttrs_FORM));
StringSetType URLAttrs_HEAD;
URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("profile"));
-
theAtts.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("head")),
URLAttrs_HEAD));
+
theAtts.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("head")),
URLAttrs_HEAD));
return theAtts;
}
1.15 +149 -140 xml-xalan/c/src/XMLSupport/FormatterToXML.cpp
Index: FormatterToXML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FormatterToXML.cpp 2000/04/12 19:40:49 1.14
+++ FormatterToXML.cpp 2000/04/20 16:41:41 1.15
@@ -837,7 +837,12 @@
// Whem XalanDOMString has gets a better += operator
// for XalanDOMChar and XalanDOMChar*, a more straightforward
// solution will give good performance
- std::vector<XalanDOMChar> vec;
+#if !defined(XALAN_NO_NAMESPACES)
+ using std::vector;
+#endif
+
+ vector<XalanDOMChar> vec;
+
vec.reserve(theLength*2);
for (unsigned int i = 0; i < theLength; i ++)
@@ -852,9 +857,9 @@
{
vec.push_back('&');
vec.push_back('#');
- DOMString ds = LongToDOMString(ch);
+ const DOMString ds = LongToDOMString(ch);
const XMLCh* pb = c_wstr(ds);
- for(int k = 0; k < ds.length(); k++)
+ for(int k = 0; k < length(ds); k++)
vec.push_back(*pb++);
vec.push_back(';');
}
@@ -1098,182 +1103,186 @@
}
*/
+#if !defined(XALAN_NO_NAMESPACES)
+ using std::make_pair;
+#endif
+
// Make a table to maximum character sizes before we
// need to resort to escaping in the XML.
// TODO: To tell the truth, I'm guessing a bit here.
- // s_revsize.insert(std::make_pair("CP1252", 0xFF)); //
Windows Latin-1
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")),
0xFF)); // Windows 1250 Peter Smolik
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8")),
0xFFFF)); // Universal Transformation Format 8
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
0x7F));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),
0xFFFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),
0xFF));
-
s_revsize.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2")),
0xFF));
+ // s_revsize.insert(make_pair("CP1252", 0xFF)); // Windows
Latin-1
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")),
0xFF)); // Windows 1250 Peter Smolik
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8")),
0xFFFF)); // Universal Transformation Format 8
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
0x7F));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),
0xFFFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),
0xFF));
+
s_revsize.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2")),
0xFF));
// <preferred MIME name>, <Java encoding name>
- // s_enchash.insert(std::make_pair("ISO 8859-1", "CP1252")); // Close
enough, I guess
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1250")))); // Peter Smolik
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF8"))));
+ // s_enchash.insert(make_pair("ISO 8859-1", "CP1252")); // Close
enough, I guess
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1250")))); // Peter Smolik
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF8"))));
if(useISOPrefix)
{
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")))); //
?
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_2"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_3"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_4"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_5"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_6"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_7"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_8"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_9"))));
}
else
{
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_1")))); // ?
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_1"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_2"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_3"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_4"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_5"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_6"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_7"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_8"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_9"))));
}
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("JIS"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("SJIS"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUCJIS"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KSC5601"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8_R"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP280"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP284"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP285"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP297"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP420"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP424"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP500"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP871"))));
-
s_enchash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP918"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("JIS"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("SJIS"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUCJIS"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KSC5601"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8_R"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP280"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP284"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP285"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP297"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP420"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP424"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP500"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP871"))));
+
s_enchash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("CP918"))));
// j:CNS11643 -> EUC-TW?
// ISO-2022-CN? ISO-2022-CN-EXT?
// <Java encoding name>, <preferred MIME name>
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1252")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")))); // Close enough, I
guess
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1250")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("windows-1250")))); // Peter Smolik
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8"))));
-
//s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")))); // ?
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1252")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")))); // Close enough, I
guess
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP1250")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("windows-1250")))); // Peter Smolik
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("UTF-8"))));
+
//s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")))); // ?
if(useISOPrefix)
{
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO8859_9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
}
else
{
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
- }
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("JIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SJIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Shift_JIS"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUCJIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KSC5601")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8_R")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP280")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP284")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP285")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP297")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP420")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP424")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP500")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP871")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS"))));
-
s_revhash.insert(std::make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP918")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_1")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_2")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_3")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_4")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_6")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_7")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_8")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("8859_9")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
+ }
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("JIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("SJIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Shift_JIS"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("EUCJIS")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-JP"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("BIG5")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KSC5601")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EUC-KR"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8_R")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("KOI8-R"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP037")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP277")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP278")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP280")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP284")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP285")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP297")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP420")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP424")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP500")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP870")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP871")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS"))));
+
s_revhash.insert(make_pair(XalanDOMString(XALAN_STATIC_UCODE_STRING("CP918")),
XalanDOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2"))));
}
1.9 +1 -1 xml-xalan/c/src/XMLSupport/FormatterToXML.hpp
Index: FormatterToXML.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToXML.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FormatterToXML.hpp 2000/04/12 19:40:50 1.8
+++ FormatterToXML.hpp 2000/04/20 16:41:41 1.9
@@ -102,7 +102,7 @@
#endif
typedef XALAN_STD map<XalanDOMString, XalanDOMString>
DOMStringMapType;
typedef XALAN_STD map<XalanDOMString, int>
DOMString2IntMapType;
- typedef std::stack<bool>
BoolStackType;
+ typedef XALAN_STD stack<bool>
BoolStackType;
#undef XALAN_STD
/**
