You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@locus.apache.org on 2000/01/26 00:37:44 UTC

cvs commit: xml-xalan/c/src/XMLSupport FormatterToHTML.cpp FormatterToXML.cpp

dbertoni    00/01/25 15:37:44

  Modified:    c/src/XMLSupport FormatterToHTML.cpp FormatterToXML.cpp
  Log:
  New static string initialization.
  
  Revision  Changes    Path
  1.2       +173 -109  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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FormatterToHTML.cpp	1999/12/18 19:47:52	1.1
  +++ FormatterToHTML.cpp	2000/01/25 23:37:44	1.2
  @@ -55,7 +55,7 @@
    * <http://www.apache.org/>.
    */
   /**
  - * $Id: FormatterToHTML.cpp,v 1.1 1999/12/18 19:47:52 robweir Exp $
  + * $Id: FormatterToHTML.cpp,v 1.2 2000/01/25 23:37:44 dbertoni Exp $
    * 
    * $State: Exp $
    * 
  @@ -620,21 +620,21 @@
   {
   	EmptiesSetType	theEmpties;
   
  -	theEmpties.insert("AREA");
  -	theEmpties.insert("BASE");
  -	theEmpties.insert("BR");
  -	theEmpties.insert("COL");
  -	theEmpties.insert("HR");
  -	theEmpties.insert("IMG");
  -	theEmpties.insert("INPUT");
  -	theEmpties.insert("LINK");
  -	theEmpties.insert("META");
  -	theEmpties.insert("PARAM");
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("AREA"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("BASE"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("BR"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("COL"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("HR"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("IMG"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("INPUT"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("LINK"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("META"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("PARAM"));
   
   	// HTML 4.0 loose DTD
  -	theEmpties.insert("BASEFONT");
  -	theEmpties.insert("FRAME");
  -	theEmpties.insert("ISINDEX");
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("BASEFONT"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("FRAME"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("ISINDEX"));
   
   	return theEmpties;
   }
  @@ -643,12 +643,12 @@
   FormatterToHTML::createAttrEmpties()
   {
   	EmptiesSetType	theEmpties;
  -	theEmpties.insert("checked");
  -	theEmpties.insert("disabled");
  -	theEmpties.insert("readonly");
  -	theEmpties.insert("multiple");
  -	theEmpties.insert("disabled");
  -	theEmpties.insert("selected");
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("checked"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("disabled"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("readonly"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("multiple"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("disabled"));
  +	theEmpties.insert(XALAN_STATIC_UCODE_STRING("selected"));
   	return theEmpties;
   }
   
  @@ -656,12 +656,12 @@
   FormatterToHTML::createNonBlockElems()
   {
   	StringSetType	theElems;
  -	theElems.insert("FONT");
  -	// s_nonblockelems.insert("A");
  -	theElems.insert("TD");
  -	theElems.insert("IMG");
  -	theElems.insert("B");
  -	theElems.insert("I");
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("FONT"));
  +	// s_nonblockelems.insert(XALAN_STATIC_UCODE_STRING("A"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("TD"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("IMG"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("B"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("I"));
   	return theElems;
   }
   
  @@ -669,20 +669,20 @@
   FormatterToHTML::createEscapeElems()
   {
   	StringSetType	theElems;
  -	theElems.insert("%");
  -	theElems.insert("<");
  -	theElems.insert(">");
  -//	theElems.insert(" ");
  -//	theElems.insert("#");
  -	theElems.insert("{");
  -	theElems.insert("}");
  -	theElems.insert("[");
  -	theElems.insert("]");
  -//	theElems.insert("\\");
  -	theElems.insert("|");
  -	theElems.insert("^");
  -	theElems.insert("\"");
  -//	theElems.insert("'"); 	  
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("%"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("<"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING(">"));
  +//	theElems.insert(XALAN_STATIC_UCODE_STRING(" "));
  +//	theElems.insert(XALAN_STATIC_UCODE_STRING("#"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("{"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("}"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("["));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("]"));
  +//	theElems.insert(XALAN_STATIC_UCODE_STRING("\\"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("|"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("^"));
  +	theElems.insert(XALAN_STATIC_UCODE_STRING("\""));
  +//	theElems.insert(XALAN_STATIC_UCODE_STRING("'")); 	  
   	return theElems;
   }
   
  @@ -691,91 +691,122 @@
   {
   	AttributesMapType	theAtts;
   	StringSetType URLAttrsHREFSingle;
  -	URLAttrsHREFSingle.insert(DOMString("href"));
  +	URLAttrsHREFSingle.insert(XALAN_STATIC_UCODE_STRING("href"));
   	StringSetType URLAttrsCITESingle;
  -	URLAttrsCITESingle.insert(DOMString("cite"));
  +	URLAttrsCITESingle.insert(XALAN_STATIC_UCODE_STRING("cite"));
   
  -	theAtts.insert(std::make_pair(DOMString("base"), URLAttrsHREFSingle));
  -	theAtts.insert(std::make_pair(DOMString("link"), URLAttrsHREFSingle));
  -	theAtts.insert(std::make_pair(DOMString("area"), URLAttrsHREFSingle));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("base")), URLAttrsHREFSingle));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("link")), URLAttrsHREFSingle));
  +	theAtts.insert(std::make_pair(DOMString(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(DOMString("href"));
  -	URLAttrs_A.insert(DOMString("name"));
  -	theAtts.insert(std::make_pair(DOMString("a"), URLAttrs_A));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("href"));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("name"));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("a")), URLAttrs_A));
   
   	StringSetType URLAttrs_INPUT;
  -	URLAttrs_A.insert(DOMString("src"));
  -	URLAttrs_A.insert(DOMString("usemap"));
  -	theAtts.insert(std::make_pair(DOMString("input"), URLAttrs_INPUT));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("src"));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("usemap"));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("input")), URLAttrs_INPUT));
   
   	StringSetType URLAttrs_SCRIPT;
  -	URLAttrs_A.insert(DOMString("src"));
  -	URLAttrs_A.insert(DOMString("for"));
  -	theAtts.insert(std::make_pair(DOMString("script"), URLAttrs_SCRIPT));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("src"));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("for"));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("script")), URLAttrs_SCRIPT));
   
   	StringSetType URLAttrs_IMG;
  -	URLAttrs_A.insert(DOMString("src"));
  -	URLAttrs_A.insert(DOMString("longdesc"));
  -	URLAttrs_A.insert(DOMString("usemap"));
  -	theAtts.insert(std::make_pair(DOMString("img"), 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(DOMString(XALAN_STATIC_UCODE_STRING("img")), URLAttrs_IMG));
   
   	StringSetType URLAttrs_OBJECT;
  -	URLAttrs_A.insert(DOMString("classid"));
  -	URLAttrs_A.insert(DOMString("codebase"));
  -	URLAttrs_A.insert(DOMString("data"));
  -	URLAttrs_A.insert(DOMString("archive"));
  -	URLAttrs_A.insert(DOMString("usemap"));
  -	theAtts.insert(std::make_pair(DOMString("object"), URLAttrs_OBJECT));
  -
  -	theAtts.insert(std::make_pair(DOMString("q"), URLAttrsCITESingle));
  -	theAtts.insert(std::make_pair(DOMString("blockquote"), URLAttrsCITESingle));
  -	theAtts.insert(std::make_pair(DOMString("ins"), URLAttrsCITESingle));
  -	theAtts.insert(std::make_pair(DOMString("del"), URLAttrsCITESingle));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("classid"));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("codebase"));
  +	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(DOMString(XALAN_STATIC_UCODE_STRING("object")), URLAttrs_OBJECT));
  +
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("q")), URLAttrsCITESingle));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("blockquote")), URLAttrsCITESingle));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ins")), URLAttrsCITESingle));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("del")), URLAttrsCITESingle));
   
   	StringSetType URLAttrs_FORM;
  -	URLAttrs_A.insert(DOMString("action"));
  -	theAtts.insert(std::make_pair(DOMString("form"), URLAttrs_FORM));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("action"));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("form")), URLAttrs_FORM));
   
   	StringSetType URLAttrs_HEAD;
  -	URLAttrs_A.insert(DOMString("profile"));
  -	theAtts.insert(std::make_pair(DOMString("head"), URLAttrs_HEAD));
  +	URLAttrs_A.insert(XALAN_STATIC_UCODE_STRING("profile"));
  +	theAtts.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("head")), URLAttrs_HEAD));
   	return theAtts;
   }
   
   FormatterToHTML::HTMLAttributesVectorType
   FormatterToHTML::createAttributes()
   {
  +#if defined(XALAN_WIDE_STRING_UCODE_PROBLEM)
   	static const char* const	theHTMLAttributes[] = 
   	{
  -		"nbsp",    "iexcl",    "cent",    "pound",    
  -		"curren",    "yen",    "brvbar",    "sect",    
  -		"uml",    "copy",    "ordf",    "laquo",    
  -		"not",    "shy",    "reg",    "macr",    "deg",    
  -		"plusmn",    "sup2",    "sup3",    "acute",    
  -		"micro",    "para",    "middot",    "cedil",    
  -		"sup1",    "ordm",    "raquo",    "frac14",    
  -		"frac12",    "frac34",    "iquest",    
  -		"Agrave",    "Aacute",    "Acirc",    
  -		"Atilde",    "Auml",    "Aring",    "AElig",    
  +		"nbsp",    "iexcl",    "cent",    "pound",
  +		"curren",    "yen",    "brvbar",    "sect",
  +		"uml",    "copy",    "ordf",    "laquo", 
  +		"not",    "shy",    "reg",    "macr",    "deg",
  +		"plusmn",    "sup2",    "sup3",    "acute",
  +		"micro",    "para",    "middot",    "cedil",
  +		"sup1",    "ordm",    "raquo",    "frac14",
  +		"frac12",    "frac34",    "iquest",
  +		"Agrave",    "Aacute",    "Acirc",
  +		"Atilde",    "Auml",    "Aring",    "AElig",
   		"Ccedil",    "Egrave",    "Eacute",    "Ecirc",    
  -		"Euml",    "Igrave",    "Iacute",    "Icirc",    
  -		"Iuml",    "ETH",    "Ntilde",    "Ograve",    
  -		"Oacute",    "Ocirc",    "Otilde",    "Ouml",    
  -		"times",    "Oslash",    "Ugrave",    "Uacute",    
  -		"Ucirc",    "Uuml",    "Yacute",    "THORN",    
  -		"szlig",    "agrave",    "aacute",    "acirc",    
  -		"atilde",    "auml",    "aring",    "aelig",    
  -		"ccedil",    "egrave",    "eacute",    "ecirc",    
  -		"euml",    "igrave",    "iacute",    "icirc",    
  -		"iuml",    "eth",    "ntilde",    "ograve",    
  -		"oacute",    "ocirc",    "otilde",    "ouml",    
  -		"divide",    "oslash",    "ugrave",    "uacute",    
  -		"ucirc",    "uuml",    "yacute",    "thorn",    
  +		"Euml",    "Igrave",    "Iacute",    "Icirc",
  +		"Iuml",    "ETH",    "Ntilde",    "Ograve",
  +		"Oacute",    "Ocirc",    "Otilde",    "Ouml",
  +		"times",    "Oslash",    "Ugrave",    "Uacute",
  +		"Ucirc",    "Uuml",    "Yacute",    "THORN",
  +		"szlig",    "agrave",    "aacute",    "acirc",
  +		"atilde",    "auml",    "aring",    "aelig",
  +		"ccedil",    "egrave",    "eacute",    "ecirc",
  +		"euml",    "igrave",    "iacute",    "icirc",
  +		"iuml",    "eth",    "ntilde",    "ograve",
  +		"oacute",    "ocirc",    "otilde",    "ouml",
  +		"divide",    "oslash",    "ugrave",    "uacute",
  +		"ucirc",    "uuml",    "yacute",    "thorn",
   		"yuml"
   	};
  +#else
  +	static const XMLCh* const	theHTMLAttributes[] = 
  +	{
  +		L"nbsp",    L"iexcl",    L"cent",    L"pound",
  +		L"curren",    L"yen",    L"brvbar",    L"sect",
  +		L"uml",    L"copy",    L"ordf",    L"laquo", 
  +		L"not",    L"shy",    L"reg",    L"macr",    L"deg",
  +		L"plusmn",    L"sup2",    L"sup3",    L"acute",
  +		L"micro",    L"para",    L"middot",    L"cedil",
  +		L"sup1",    L"ordm",    L"raquo",    L"frac14",
  +		L"frac12",    L"frac34",    L"iquest",
  +		L"Agrave",    L"Aacute",    L"Acirc",
  +		L"Atilde",    L"Auml",    L"Aring",    L"AElig",
  +		L"Ccedil",    L"Egrave",    L"Eacute",    L"Ecirc",    
  +		L"Euml",    L"Igrave",    L"Iacute",    L"Icirc",
  +		L"Iuml",    L"ETH",    L"Ntilde",    L"Ograve",
  +		L"Oacute",    L"Ocirc",    L"Otilde",    L"Ouml",
  +		L"times",    L"Oslash",    L"Ugrave",    L"Uacute",
  +		L"Ucirc",    L"Uuml",    L"Yacute",    L"THORN",
  +		L"szlig",    L"agrave",    L"aacute",    L"acirc",
  +		L"atilde",    L"auml",    L"aring",    L"aelig",
  +		L"ccedil",    L"egrave",    L"eacute",    L"ecirc",
  +		L"euml",    L"igrave",    L"iacute",    L"icirc",
  +		L"iuml",    L"eth",    L"ntilde",    L"ograve",
  +		L"oacute",    L"ocirc",    L"otilde",    L"ouml",
  +		L"divide",    L"oslash",    L"ugrave",    L"uacute",
  +		L"ucirc",    L"uuml",    L"yacute",    L"thorn",
  +		L"yuml"
  +	};
  +#endif
   
   	static const size_t		theArraySize =
   			sizeof(theHTMLAttributes) / sizeof(theHTMLAttributes[0]);
  @@ -786,7 +817,11 @@
   
   	for(size_t	i = 0; i < theArraySize; i++)
   	{
  +#if defined(XALAN_WIDE_STRING_UCODE_PROBLEM)
  +		theAttributes.push_back(initializeAndTranscode(theHTMLAttributes[i]));
  +#else
   		theAttributes.push_back(theHTMLAttributes[i]);
  +#endif
   	}
   
   	return theAttributes;
  @@ -797,30 +832,59 @@
   FormatterToHTML::HTMLSymbolsVectorType
   FormatterToHTML::createSymbols()
   {
  +#if defined(XALAN_WIDE_STRING_UCODE_PROBLEM)
   	static const char* const	theHTMLSymbols[] = 
   	{
  -		"Alpha",    "Beta",    
  -		"Gamma",    "Delta",    "Epsilon",    "Zeta",    
  -		"Eta",    "Theta",    "Iota",    "Kappa",    
  -		"Lambda",    "Mu",    "Nu",    "Xi",    
  -		"Omicron",    "Pi",    "Rho",    "Sigma",    
  -		"Tau",    "Upsilon",    "Phi",    "Chi",    
  -		"Psi",    "Omega",    "alpha",    "beta",    
  -		"gamma",    "delta",    "epsilon",    "zeta",    
  -		"eta",    "theta",    "iota",    "kappa",    
  -		"lambda",    "mu",    "nu",    "xi",    
  -		"omicron",    "pi",    "rho",    "sigmaf",    
  -		"sigma",    "tau",    "upsilon",    "phi",    
  -		"chi",    "psi",    "omega",    "thetasym",    
  +		"Alpha",    "Beta",
  +		"Gamma",    "Delta",    "Epsilon",    "Zeta",
  +		"Eta",    "Theta",    "Iota",    "Kappa",
  +		"Lambda",    "Mu",    "Nu",    "Xi",
  +		"Omicron",    "Pi",    "Rho",    "Sigma",
  +		"Tau",    "Upsilon",    "Phi",    "Chi",
  +		"Psi",    "Omega",    "alpha",    "beta",
  +		"gamma",    "delta",    "epsilon",    "zeta",
  +		"eta",    "theta",    "iota",    "kappa",
  +		"lambda",    "mu",    "nu",    "xi",
  +		"omicron",    "pi",    "rho",    "sigmaf",
  +		"sigma",    "tau",    "upsilon",    "phi",
  +		"chi",    "psi",    "omega",    "thetasym",
   		"upsih",    "piv"
   	};
  +#else
  +	static const XMLCh* const	theHTMLSymbols[] = 
  +	{
  +		L"Alpha",    L"Beta",
  +		L"Gamma",    L"Delta",    L"Epsilon",    L"Zeta",
  +		L"Eta",    L"Theta",    L"Iota",    L"Kappa",
  +		L"Lambda",    L"Mu",    L"Nu",    L"Xi",
  +		L"Omicron",    L"Pi",    L"Rho",    L"Sigma",
  +		L"Tau",    L"Upsilon",    L"Phi",    L"Chi",
  +		L"Psi",    L"Omega",    L"alpha",    L"beta",
  +		L"gamma",    L"delta",    L"epsilon",    L"zeta",
  +		L"eta",    L"theta",    L"iota",    L"kappa",
  +		L"lambda",    L"mu",    L"nu",    L"xi",
  +		L"omicron",    L"pi",    L"rho",    L"sigmaf",
  +		L"sigma",    L"tau",    L"upsilon",    L"phi",
  +		L"chi",    L"psi",    L"omega",    L"thetasym",
  +		L"upsih",    L"piv"
  +	};
  +#endif
  +
   	static const size_t		theArraySize =
   		sizeof(theHTMLSymbols) / sizeof(theHTMLSymbols[0]);
  +
   	HTMLSymbolsVectorType	theSymbols;
  +
   	theSymbols.reserve(theArraySize);
  +
   	for(size_t	i = 0; i < theArraySize; i++)
   	{
  +#if defined(XALAN_WIDE_STRING_UCODE_PROBLEM)
  +		theSymbols.push_back(initializeAndTranscode(theHTMLSymbols[i]));
  +#else
   		theSymbols.push_back(theHTMLSymbols[i]);
  +#endif
   	}
  +
   	return theSymbols;
   }
  
  
  
  1.3       +157 -157  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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FormatterToXML.cpp	2000/01/07 21:25:33	1.2
  +++ FormatterToXML.cpp	2000/01/25 23:37:44	1.3
  @@ -77,7 +77,7 @@
   const char* const	theDefaultAttrSpecialChars = "<>&\"\'\r\n";
   }
   
  -const DOMString FormatterToXML::DEFAULT_MIME_ENCODING = "UTF-8";
  +const DOMString FormatterToXML::DEFAULT_MIME_ENCODING = XALAN_STATIC_UCODE_STRING("UTF-8");
   
   XMLCh				FormatterToXML::m_charBuf[MAXCHARBUF];
   // This should be OK on all platforms ??
  @@ -1069,178 +1069,178 @@
   	// 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(DOMString("WINDOWS-1250"),    0xFF)); // Windows 1250 Peter Smolik
  -	s_revsize.insert(std::make_pair(DOMString("UTF-8"),           0xFFFF)); // Universal Transformation Format 8
  -	s_revsize.insert(std::make_pair(DOMString("US-ASCII"),        0x7F));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-1"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-2"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-3"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-4"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-5"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-6"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-7"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-8"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-8859-9"),      0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-2022-JP"),     0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("SHIFT_JIS"),       0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("EUC-JP"),          0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("GB2312"),          0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("BIG5"),            0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("EUC-KR"),          0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("ISO-2022-KR"),     0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("KOI8-R"),          0xFFFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-US"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-CA"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-NL"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-DK"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-NO"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-FI"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-SE"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-IT"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-ES"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-GB"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-FR"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-AR1"),   0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-HE"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-CH"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-ROECE"), 0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-YU"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-IS"),    0xFF));
  -	s_revsize.insert(std::make_pair(DOMString("EBCDIC-CP-AR2"),   0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")),    0xFF)); // Windows 1250 Peter Smolik
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("UTF-8")),           0xFFFF)); // Universal Transformation Format 8
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),        0x7F));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),      0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),     0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),       0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),          0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("GB2312")),          0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("BIG5")),            0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),          0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),     0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),          0xFFFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),   0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")), 0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),    0xFF));
  +	s_revsize.insert(std::make_pair(DOMString(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(DOMString("WINDOWS-1250"), DOMString("CP1250"))); // Peter Smolik
  -	s_enchash.insert(std::make_pair(DOMString("UTF-8"), DOMString("UTF8")));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("WINDOWS-1250")), DOMString(XALAN_STATIC_UCODE_STRING("CP1250")))); // Peter Smolik
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("UTF-8")), DOMString(XALAN_STATIC_UCODE_STRING("UTF8"))));
   	if(useISOPrefix)
   	{
  -		s_enchash.insert(std::make_pair(DOMString("US-ASCII"),
  -		DOMString("ISO8859_1")));    // ?
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-1"),
  -		DOMString("ISO8859_1")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-2"),
  -		DOMString("ISO8859_2")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-3"),
  -		DOMString("ISO8859_3")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-4"),
  -		DOMString("ISO8859_4")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-5"),
  -		DOMString("ISO8859_5")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-6"),
  -		DOMString("ISO8859_6")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-7"),
  -		DOMString("ISO8859_7")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-8"),
  -		DOMString("ISO8859_8")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-9"),
  -		DOMString("ISO8859_9")));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1"))));    // ?
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_2"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_3"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_4"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_5"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_6"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_7"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_8"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_9"))));
   	}
   	else
   	{
  -		s_enchash.insert(std::make_pair(DOMString("US-ASCII"),
  -		DOMString("8859_1")));    // ?
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-1"),
  -		DOMString("8859_1")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-2"),
  -		DOMString("8859_2")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-3"),
  -		DOMString("8859_3")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-4"),
  -		DOMString("8859_4")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-5"),
  -		DOMString("8859_5")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-6"),
  -		DOMString("8859_6")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-7"),
  -		DOMString("8859_7")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-8"),
  -		DOMString("8859_8")));
  -		s_enchash.insert(std::make_pair(DOMString("ISO-8859-9"),
  -		DOMString("8859_9")));
  -	}
  -	s_enchash.insert(std::make_pair(DOMString("ISO-2022-JP"),     DOMString("JIS")));
  -	s_enchash.insert(std::make_pair(DOMString("SHIFT_JIS"),       DOMString("SJIS")));
  -	s_enchash.insert(std::make_pair(DOMString("EUC-JP"),          DOMString("EUCJIS")));
  -	s_enchash.insert(std::make_pair(DOMString("GB2312"),          DOMString("GB2312")));
  -	s_enchash.insert(std::make_pair(DOMString("BIG5"),            DOMString("Big5")));
  -	s_enchash.insert(std::make_pair(DOMString("EUC-KR"),          DOMString("KSC5601")));
  -	s_enchash.insert(std::make_pair(DOMString("ISO-2022-KR"),     DOMString("ISO2022KR")));
  -	s_enchash.insert(std::make_pair(DOMString("KOI8-R"),          DOMString("KOI8_R")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-US"),    DOMString("CP037")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-CA"),    DOMString("CP037")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-NL"),    DOMString("CP037")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-DK"),    DOMString("CP277")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-NO"),    DOMString("CP277")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-FI"),    DOMString("CP278")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-SE"),    DOMString("CP278")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-IT"),    DOMString("CP280")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-ES"),    DOMString("CP284")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-GB"),    DOMString("CP285")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-FR"),    DOMString("CP297")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-AR1"),   DOMString("CP420")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-HE"),    DOMString("CP424")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-CH"),    DOMString("CP500")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-ROECE"), DOMString("CP870")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-YU"),    DOMString("CP870")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-IS"),    DOMString("CP871")));
  -	s_enchash.insert(std::make_pair(DOMString("EBCDIC-CP-AR2"),   DOMString("CP918")));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("US-ASCII")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_1"))));    // ?
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_1"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_2"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_3"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_4"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_5"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_6"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_7"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_8"))));
  +		s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9")),
  +		DOMString(XALAN_STATIC_UCODE_STRING("8859_9"))));
  +	}
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP")),     DOMString(XALAN_STATIC_UCODE_STRING("JIS"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("SHIFT_JIS")),       DOMString(XALAN_STATIC_UCODE_STRING("SJIS"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EUC-JP")),          DOMString(XALAN_STATIC_UCODE_STRING("EUCJIS"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("GB2312")),          DOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("BIG5")),            DOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EUC-KR")),          DOMString(XALAN_STATIC_UCODE_STRING("KSC5601"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR")),     DOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("KOI8-R")),          DOMString(XALAN_STATIC_UCODE_STRING("KOI8_R"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US")),    DOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA")),    DOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL")),    DOMString(XALAN_STATIC_UCODE_STRING("CP037"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK")),    DOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO")),    DOMString(XALAN_STATIC_UCODE_STRING("CP277"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI")),    DOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE")),    DOMString(XALAN_STATIC_UCODE_STRING("CP278"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT")),    DOMString(XALAN_STATIC_UCODE_STRING("CP280"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES")),    DOMString(XALAN_STATIC_UCODE_STRING("CP284"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB")),    DOMString(XALAN_STATIC_UCODE_STRING("CP285"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR")),    DOMString(XALAN_STATIC_UCODE_STRING("CP297"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1")),   DOMString(XALAN_STATIC_UCODE_STRING("CP420"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE")),    DOMString(XALAN_STATIC_UCODE_STRING("CP424"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH")),    DOMString(XALAN_STATIC_UCODE_STRING("CP500"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE")), DOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU")),    DOMString(XALAN_STATIC_UCODE_STRING("CP870"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS")),    DOMString(XALAN_STATIC_UCODE_STRING("CP871"))));
  +	s_enchash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2")),   DOMString(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(DOMString("CP1252"), DOMString("ISO-8859-1"))); // Close enough, I guess
  -	s_revhash.insert(std::make_pair(DOMString("CP1250"), DOMString("windows-1250"))); // Peter Smolik
  -	s_revhash.insert(std::make_pair(DOMString("UTF8"), DOMString("UTF-8")));
  -	//s_revhash.insert(std::make_pair(DOMString("ISO8859_1"), DOMString("US-ASCII")));    // ?
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP1252")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1")))); // Close enough, I guess
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP1250")), DOMString(XALAN_STATIC_UCODE_STRING("windows-1250")))); // Peter Smolik
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("UTF8")), DOMString(XALAN_STATIC_UCODE_STRING("UTF-8"))));
  +	//s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")), DOMString(XALAN_STATIC_UCODE_STRING("US-ASCII"))));    // ?
   	if(useISOPrefix)
   	{
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_1"), DOMString("ISO-8859-1")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_2"), DOMString("ISO-8859-2")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_3"), DOMString("ISO-8859-3")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_4"), DOMString("ISO-8859-4")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_5"), DOMString("ISO-8859-5")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_6"), DOMString("ISO-8859-6")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_7"), DOMString("ISO-8859-7")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_8"), DOMString("ISO-8859-8")));
  -		s_revhash.insert(std::make_pair(DOMString("ISO8859_9"), DOMString("ISO-8859-9")));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_1")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_2")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_3")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_4")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_5")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_6")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_7")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_8")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO8859_9")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
   	}
   	else
   	{
  -		s_revhash.insert(std::make_pair(DOMString("8859_1"), DOMString("ISO-8859-1")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_2"), DOMString("ISO-8859-2")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_3"), DOMString("ISO-8859-3")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_4"), DOMString("ISO-8859-4")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_5"), DOMString("ISO-8859-5")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_6"), DOMString("ISO-8859-6")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_7"), DOMString("ISO-8859-7")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_8"), DOMString("ISO-8859-8")));
  -		s_revhash.insert(std::make_pair(DOMString("8859_9"), DOMString("ISO-8859-9")));
  -	}
  -	s_revhash.insert(std::make_pair(DOMString("JIS"), DOMString("ISO-2022-JP")));
  -	s_revhash.insert(std::make_pair(DOMString("SJIS"), DOMString("Shift_JIS")));
  -	s_revhash.insert(std::make_pair(DOMString("EUCJIS"), DOMString("EUC-JP")));
  -	s_revhash.insert(std::make_pair(DOMString("GB2312"), DOMString("GB2312")));
  -	s_revhash.insert(std::make_pair(DOMString("BIG5"), DOMString("Big5")));
  -	s_revhash.insert(std::make_pair(DOMString("KSC5601"), DOMString("EUC-KR")));
  -	s_revhash.insert(std::make_pair(DOMString("ISO2022KR"), DOMString("ISO-2022-KR")));
  -	s_revhash.insert(std::make_pair(DOMString("KOI8_R"), DOMString("KOI8-R")));
  -	s_revhash.insert(std::make_pair(DOMString("CP037"), DOMString("EBCDIC-CP-US")));
  -	s_revhash.insert(std::make_pair(DOMString("CP037"), DOMString("EBCDIC-CP-CA")));
  -	s_revhash.insert(std::make_pair(DOMString("CP037"), DOMString("EBCDIC-CP-NL")));
  -	s_revhash.insert(std::make_pair(DOMString("CP277"), DOMString("EBCDIC-CP-DK")));
  -	s_revhash.insert(std::make_pair(DOMString("CP277"), DOMString("EBCDIC-CP-NO")));
  -	s_revhash.insert(std::make_pair(DOMString("CP278"), DOMString("EBCDIC-CP-FI")));
  -	s_revhash.insert(std::make_pair(DOMString("CP278"), DOMString("EBCDIC-CP-SE")));
  -	s_revhash.insert(std::make_pair(DOMString("CP280"), DOMString("EBCDIC-CP-IT")));
  -	s_revhash.insert(std::make_pair(DOMString("CP284"), DOMString("EBCDIC-CP-ES")));
  -	s_revhash.insert(std::make_pair(DOMString("CP285"), DOMString("EBCDIC-CP-GB")));
  -	s_revhash.insert(std::make_pair(DOMString("CP297"), DOMString("EBCDIC-CP-FR")));
  -	s_revhash.insert(std::make_pair(DOMString("CP420"), DOMString("EBCDIC-CP-AR1")));
  -	s_revhash.insert(std::make_pair(DOMString("CP424"), DOMString("EBCDIC-CP-HE")));
  -	s_revhash.insert(std::make_pair(DOMString("CP500"), DOMString("EBCDIC-CP-CH")));
  -	s_revhash.insert(std::make_pair(DOMString("CP870"), DOMString("EBCDIC-CP-ROECE")));
  -	s_revhash.insert(std::make_pair(DOMString("CP870"), DOMString("EBCDIC-CP-YU")));
  -	s_revhash.insert(std::make_pair(DOMString("CP871"), DOMString("EBCDIC-CP-IS")));
  -	s_revhash.insert(std::make_pair(DOMString("CP918"), DOMString("EBCDIC-CP-AR2")));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_1")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-1"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_2")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-2"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_3")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-3"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_4")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-4"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_5")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-5"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_6")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-6"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_7")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-7"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_8")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-8"))));
  +		s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("8859_9")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-8859-9"))));
  +	}
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("JIS")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-JP"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("SJIS")), DOMString(XALAN_STATIC_UCODE_STRING("Shift_JIS"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("EUCJIS")), DOMString(XALAN_STATIC_UCODE_STRING("EUC-JP"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("GB2312")), DOMString(XALAN_STATIC_UCODE_STRING("GB2312"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("BIG5")), DOMString(XALAN_STATIC_UCODE_STRING("Big5"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("KSC5601")), DOMString(XALAN_STATIC_UCODE_STRING("EUC-KR"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("ISO2022KR")), DOMString(XALAN_STATIC_UCODE_STRING("ISO-2022-KR"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("KOI8_R")), DOMString(XALAN_STATIC_UCODE_STRING("KOI8-R"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP037")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-US"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP037")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CA"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP037")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NL"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP277")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-DK"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP277")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-NO"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP278")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FI"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP278")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-SE"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP280")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IT"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP284")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ES"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP285")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-GB"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP297")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-FR"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP420")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR1"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP424")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-HE"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP500")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-CH"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP870")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-ROECE"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP870")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-YU"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP871")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-IS"))));
  +	s_revhash.insert(std::make_pair(DOMString(XALAN_STATIC_UCODE_STRING("CP918")), DOMString(XALAN_STATIC_UCODE_STRING("EBCDIC-CP-AR2"))));
   }