Switch default_charset, if not specified, from ISO-8859-1 to UTF-8

I have been wanting to make this change for years, but there is a small
chance of BC issues, so it shouldn't go into a minor release.

diff --git a/NEWS b/NEWS
index 6ec46d71e4d99b019d2ea96bafbdc9b6ea3cdcb3..e53a63ac851b82324daa3ed1013b4a6c24c88805 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 201?, PHP 5.3.99
+- default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)
        
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)

diff --git a/ext/standard/html.c b/ext/standard/html.c
index e5891588a7080d91ed3fe4e178ddc3e65dbff80a..d9ccff9dd0a81703a6746ebf6f59518018bd3e3c 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -711,17 +711,17 @@ inline static unsigned int get_next_char(enum entity_charset charset,
 
 /* {{{ entity_charset determine_charset
  * returns the charset identifier based on current locale or a hint.
- * defaults to iso-8859-1 */
+ * defaults to UTF-8 */
 static enum entity_charset determine_charset(char *charset_hint TSRMLS_DC)
 {
        int i;
-       enum entity_charset charset = cs_8859_1;
+       enum entity_charset charset = cs_utf_8;
        int len = 0;
        zval *uf_result = NULL;
 
-       /* Guarantee default behaviour for backwards compatibility */
+       /* Default is now UTF-8 */
        if (charset_hint == NULL)
-               return cs_8859_1;
+               return cs_utf_8;
 
        if ((len = strlen(charset_hint)) != 0) {
                goto det_charset;
@@ -855,7 +855,7 @@ det_charset:
                        }
                }
                if (!found) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset `%s' not supported, assuming iso-8859-1",
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "charset `%s' not supported, assuming utf-8",
                                        charset_hint);
                }
        }

diff --git a/ext/standard/tests/strings/bug44703.phpt b/ext/standard/tests/strings/bug44703.phpt
index 0b019b9cb447570244654e172124babdeabc7227..e20b1dd83f68aa471e6c29a7a64a99b174941f55 100644 (file)
--- a/ext/standard/tests/strings/bug44703.phpt
+++ b/ext/standard/tests/strings/bug44703.phpt
@@ -22,25 +22,25 @@ var_dump(htmlspecialchars(b"<>", ENT_COMPAT, str_repeat('a', 100)));
 
 ?>
 --EXPECTF--
-Warning: htmlspecialchars(): charset `1' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `1' not supported, assuming utf-8 in %s on line %d
 string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
-Warning: htmlspecialchars(): charset `12' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `12' not supported, assuming utf-8 in %s on line %d
 string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
-Warning: htmlspecialchars(): charset `125' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `125' not supported, assuming utf-8 in %s on line %d
 string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 
-Warning: htmlspecialchars(): charset `12526' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `12526' not supported, assuming utf-8 in %s on line %d
 string(35) "&lt;a href='test'&gt;Test&lt;/a&gt;"
 string(8) "&lt;&gt;"
 
-Warning: htmlspecialchars(): charset `8666' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `8666' not supported, assuming utf-8 in %s on line %d
 string(8) "&lt;&gt;"
 string(8) "&lt;&gt;"
 string(8) "&lt;&gt;"
 string(8) "&lt;&gt;"
 
-Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming iso-8859-1 in %s on line %d
+Warning: htmlspecialchars(): charset `aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' not supported, assuming utf-8 in %s on line %d
 string(8) "&lt;&gt;"

diff --git a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt
index a3dd5071232b6aef3cc62369b678a8c04a3e5808..c09388335bb397f7f14464c08459c14dce13c751 100644 (file)
--- a/ext/standard/tests/strings/get_html_translation_table_basic1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic1.phpt
@@ -53,33 +53,33 @@ array(4) {
   string(5) "&"
 }
 -- with table = HTML_ENTITIES --
-array(100) {
+array(171) {
   [" "]=>
-  string(6) " "
+  string(4) "Π"
   ["¡"]=>
-  string(7) "¡"
+  string(5) "Ρ"
   ["¢"]=>
   string(6) "¢"
   ["£"]=>
-  string(7) "£"
+  string(7) "Σ"
   ["¤"]=>
-  string(8) "¤"
+  string(5) "Τ"
   ["¥"]=>
-  string(5) "¥"
+  string(6) "⊥"
   ["¦"]=>
-  string(8) "¦"
+  string(5) "Φ"
   ["§"]=>
-  string(6) "§"
+  string(5) "Χ"
   ["¨"]=>
-  string(5) "¨"
+  string(5) "Ψ"
   ["©"]=>
-  string(6) "©"
+  string(7) "Ω"
   ["ª"]=>
   string(6) "ª"
   ["«"]=>
   string(7) "«"
   ["¬"]=>
-  string(5) "¬"
+  string(6) "€"
   ["­"]=>
   string(5) "­"
   ["®"]=>
@@ -89,57 +89,57 @@ array(100) {
   ["°"]=>
   string(5) "°"
   ["±"]=>
-  string(8) "±"
+  string(7) "α"
   ["²"]=>
-  string(6) "²"
+  string(6) "β"
   ["³"]=>
-  string(6) "³"
+  string(7) "γ"
   ["´"]=>
-  string(7) "´"
+  string(7) "δ"
   ["µ"]=>
-  string(7) "µ"
+  string(7) "↵"
   ["¶"]=>
-  string(6) "¶"
+  string(6) "ζ"
   ["·"]=>
-  string(8) "·"
+  string(5) "η"
   ["¸"]=>
-  string(7) "¸"
+  string(7) "θ"
   ["¹"]=>
-  string(6) "¹"
+  string(6) "ι"
   ["º"]=>
-  string(6) "º"
+  string(7) "κ"
   ["»"]=>
-  string(7) "»"
+  string(8) "λ"
   ["¼"]=>
-  string(8) "¼"
+  string(4) "μ"
   ["½"]=>
-  string(8) "½"
+  string(4) "ν"
   ["¾"]=>
-  string(8) "¾"
+  string(4) "ξ"
   ["¿"]=>
-  string(8) "¿"
+  string(9) "ο"
   ["À"]=>
-  string(8) "À"
+  string(4) "π"
   ["Á"]=>
-  string(8) "Á"
+  string(5) "ρ"
   ["Â"]=>
-  string(7) "Â"
+  string(8) "ς"
   ["Ã"]=>
-  string(8) "Ã"
+  string(7) "σ"
   ["Ä"]=>
-  string(6) "Ä"
+  string(5) "τ"
   ["Å"]=>
-  string(7) "Å"
+  string(6) "⋅"
   ["Æ"]=>
-  string(7) "Æ"
+  string(5) "φ"
   ["Ç"]=>
-  string(8) "Ç"
+  string(5) "χ"
   ["È"]=>
-  string(8) "È"
+  string(5) "ψ"
   ["É"]=>
-  string(8) "É"
+  string(7) "ω"
   ["Ê"]=>
-  string(7) "Ê"
+  string(5) "◊"
   ["Ë"]=>
   string(6) "Ë"
   ["Ì"]=>
@@ -151,19 +151,19 @@ array(100) {
   ["Ï"]=>
   string(6) "Ï"
   ["Ð"]=>
-  string(5) "Ð"
+  string(6) "⇐"
   ["Ñ"]=>
-  string(8) "Ñ"
+  string(6) "⇑"
   ["Ò"]=>
-  string(8) "Ò"
+  string(6) "⇒"
   ["Ó"]=>
-  string(8) "Ó"
+  string(6) "⇓"
   ["Ô"]=>
-  string(7) "Ô"
+  string(6) "⇔"
   ["Õ"]=>
   string(8) "Õ"
   ["Ö"]=>
-  string(6) "Ö"
+  string(5) "ϖ"
   ["×"]=>
   string(7) "×"
   ["Ø"]=>
@@ -175,7 +175,7 @@ array(100) {
   ["Û"]=>
   string(7) "Û"
   ["Ü"]=>
-  string(6) "Ü"
+  string(7) "˜"
   ["Ý"]=>
   string(8) "Ý"
   ["Þ"]=>
@@ -246,14 +246,157 @@ array(100) {
   string(7) "þ"
   ["ÿ"]=>
   string(6) "ÿ"
+  ["R"]=>
+  string(7) "Œ"
+  ["S"]=>
+  string(7) "œ"
+  ["`"]=>
+  string(8) "♠"
+  ["a"]=>
+  string(7) "≡"
+  ["x"]=>
+  string(6) "Ÿ"
+  ["\92"]=>
+  string(6) "→"
+  ["\91"]=>
+  string(6) "↑"
+  ["\93"]=>
+  string(6) "↓"
+  ["\94"]=>
+  string(6) "↔"
+  ["\95"]=>
+  string(7) "⊕"
+  ["\96"]=>
+  string(6) "Ζ"
+  ["\97"]=>
+  string(8) "⊗"
+  ["\98"]=>
+  string(7) "Θ"
+  ["\99"]=>
+  string(6) "Ι"
+  ["\9a"]=>
+  string(7) "Κ"
+  ["\9b"]=>
+  string(8) "Λ"
+  ["\9c"]=>
+  string(4) "Μ"
+  ["\9d"]=>
+  string(4) "Ν"
+  ["\9e"]=>
+  string(4) "Ξ"
+  ["\9f"]=>
+  string(9) "Ο"
+  ["\ 2"]=>
+  string(6) "∂"
+  ["\ 3"]=>
+  string(7) "∃"
+  ["   "]=>
+  string(7) "⌉"
+  ["\f"]=>
+  string(6) "‌"
+  ["\r"]=>
+  string(5) "‍"
+  ["\ e"]=>
+  string(5) "‎"
+  ["\ f"]=>
+  string(6) "∏"
+  ["\13"]=>
+  string(7) "–"
+  ["\14"]=>
+  string(7) "—"
+  ["\18"]=>
+  string(8) "℘"
+  ["\19"]=>
+  string(7) "’"
+  ["\1a"]=>
+  string(7) "√"
+  ["\1c"]=>
+  string(6) "ℜ"
+  ["\1d"]=>
+  string(6) "∝"
+  ["\1e"]=>
+  string(7) "∞"
+  [" "]=>
+  string(5) "∠"
+  ["!"]=>
+  string(8) "‡"
   ["""]=>
   string(6) """
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 -- with table = HTML_SPECIALCHARS --
 array(4) {

diff --git a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt
index 3e04638ccd57aa6e60921ba0141fec32baea0267..ca9f8ce8ca0996c2f2c2dd4b592dec29639d2234 100644 (file)
--- a/ext/standard/tests/strings/get_html_translation_table_basic2.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_basic2.phpt
@@ -61,33 +61,33 @@ array(4) {
   string(5) "&"
 }
 -- with table = HTML_ENTITIES & quote_style = ENT_COMPAT --
-array(100) {
+array(171) {
   [" "]=>
-  string(6) " "
+  string(4) "Π"
   ["¡"]=>
-  string(7) "¡"
+  string(5) "Ρ"
   ["¢"]=>
   string(6) "¢"
   ["£"]=>
-  string(7) "£"
+  string(7) "Σ"
   ["¤"]=>
-  string(8) "¤"
+  string(5) "Τ"
   ["¥"]=>
-  string(5) "¥"
+  string(6) "⊥"
   ["¦"]=>
-  string(8) "¦"
+  string(5) "Φ"
   ["§"]=>
-  string(6) "§"
+  string(5) "Χ"
   ["¨"]=>
-  string(5) "¨"
+  string(5) "Ψ"
   ["©"]=>
-  string(6) "©"
+  string(7) "Ω"
   ["ª"]=>
   string(6) "ª"
   ["«"]=>
   string(7) "«"
   ["¬"]=>
-  string(5) "¬"
+  string(6) "€"
   ["­"]=>
   string(5) "­"
   ["®"]=>
@@ -97,57 +97,57 @@ array(100) {
   ["°"]=>
   string(5) "°"
   ["±"]=>
-  string(8) "±"
+  string(7) "α"
   ["²"]=>
-  string(6) "²"
+  string(6) "β"
   ["³"]=>
-  string(6) "³"
+  string(7) "γ"
   ["´"]=>
-  string(7) "´"
+  string(7) "δ"
   ["µ"]=>
-  string(7) "µ"
+  string(7) "↵"
   ["¶"]=>
-  string(6) "¶"
+  string(6) "ζ"
   ["·"]=>
-  string(8) "·"
+  string(5) "η"
   ["¸"]=>
-  string(7) "¸"
+  string(7) "θ"
   ["¹"]=>
-  string(6) "¹"
+  string(6) "ι"
   ["º"]=>
-  string(6) "º"
+  string(7) "κ"
   ["»"]=>
-  string(7) "»"
+  string(8) "λ"
   ["¼"]=>
-  string(8) "¼"
+  string(4) "μ"
   ["½"]=>
-  string(8) "½"
+  string(4) "ν"
   ["¾"]=>
-  string(8) "¾"
+  string(4) "ξ"
   ["¿"]=>
-  string(8) "¿"
+  string(9) "ο"
   ["À"]=>
-  string(8) "À"
+  string(4) "π"
   ["Á"]=>
-  string(8) "Á"
+  string(5) "ρ"
   ["Â"]=>
-  string(7) "Â"
+  string(8) "ς"
   ["Ã"]=>
-  string(8) "Ã"
+  string(7) "σ"
   ["Ä"]=>
-  string(6) "Ä"
+  string(5) "τ"
   ["Å"]=>
-  string(7) "Å"
+  string(6) "⋅"
   ["Æ"]=>
-  string(7) "Æ"
+  string(5) "φ"
   ["Ç"]=>
-  string(8) "Ç"
+  string(5) "χ"
   ["È"]=>
-  string(8) "È"
+  string(5) "ψ"
   ["É"]=>
-  string(8) "É"
+  string(7) "ω"
   ["Ê"]=>
-  string(7) "Ê"
+  string(5) "◊"
   ["Ë"]=>
   string(6) "Ë"
   ["Ì"]=>
@@ -159,19 +159,19 @@ array(100) {
   ["Ï"]=>
   string(6) "Ï"
   ["Ð"]=>
-  string(5) "Ð"
+  string(6) "⇐"
   ["Ñ"]=>
-  string(8) "Ñ"
+  string(6) "⇑"
   ["Ò"]=>
-  string(8) "Ò"
+  string(6) "⇒"
   ["Ó"]=>
-  string(8) "Ó"
+  string(6) "⇓"
   ["Ô"]=>
-  string(7) "Ô"
+  string(6) "⇔"
   ["Õ"]=>
   string(8) "Õ"
   ["Ö"]=>
-  string(6) "Ö"
+  string(5) "ϖ"
   ["×"]=>
   string(7) "×"
   ["Ø"]=>
@@ -183,7 +183,7 @@ array(100) {
   ["Û"]=>
   string(7) "Û"
   ["Ü"]=>
-  string(6) "Ü"
+  string(7) "˜"
   ["Ý"]=>
   string(8) "Ý"
   ["Þ"]=>
@@ -254,43 +254,186 @@ array(100) {
   string(7) "þ"
   ["ÿ"]=>
   string(6) "ÿ"
+  ["R"]=>
+  string(7) "Œ"
+  ["S"]=>
+  string(7) "œ"
+  ["`"]=>
+  string(8) "♠"
+  ["a"]=>
+  string(7) "≡"
+  ["x"]=>
+  string(6) "Ÿ"
+  ["\92"]=>
+  string(6) "→"
+  ["\91"]=>
+  string(6) "↑"
+  ["\93"]=>
+  string(6) "↓"
+  ["\94"]=>
+  string(6) "↔"
+  ["\95"]=>
+  string(7) "⊕"
+  ["\96"]=>
+  string(6) "Ζ"
+  ["\97"]=>
+  string(8) "⊗"
+  ["\98"]=>
+  string(7) "Θ"
+  ["\99"]=>
+  string(6) "Ι"
+  ["\9a"]=>
+  string(7) "Κ"
+  ["\9b"]=>
+  string(8) "Λ"
+  ["\9c"]=>
+  string(4) "Μ"
+  ["\9d"]=>
+  string(4) "Ν"
+  ["\9e"]=>
+  string(4) "Ξ"
+  ["\9f"]=>
+  string(9) "Ο"
+  ["\ 2"]=>
+  string(6) "∂"
+  ["\ 3"]=>
+  string(7) "∃"
+  ["   "]=>
+  string(7) "⌉"
+  ["\f"]=>
+  string(6) "‌"
+  ["\r"]=>
+  string(5) "‍"
+  ["\ e"]=>
+  string(5) "‎"
+  ["\ f"]=>
+  string(6) "∏"
+  ["\13"]=>
+  string(7) "–"
+  ["\14"]=>
+  string(7) "—"
+  ["\18"]=>
+  string(8) "℘"
+  ["\19"]=>
+  string(7) "’"
+  ["\1a"]=>
+  string(7) "√"
+  ["\1c"]=>
+  string(6) "ℜ"
+  ["\1d"]=>
+  string(6) "∝"
+  ["\1e"]=>
+  string(7) "∞"
+  [" "]=>
+  string(5) "∠"
+  ["!"]=>
+  string(8) "‡"
   ["""]=>
   string(6) """
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 -- with table = HTML_ENTITIES & quote_style = ENT_QUOTES --
-array(101) {
+array(171) {
   [" "]=>
-  string(6) "&nbsp;"
+  string(4) "&Pi;"
   ["¡"]=>
-  string(7) "&iexcl;"
+  string(5) "&Rho;"
   ["¢"]=>
   string(6) "&cent;"
   ["£"]=>
-  string(7) "&pound;"
+  string(7) "&Sigma;"
   ["¤"]=>
-  string(8) "&curren;"
+  string(5) "&Tau;"
   ["¥"]=>
-  string(5) "&yen;"
+  string(6) "&perp;"
   ["¦"]=>
-  string(8) "&brvbar;"
+  string(5) "&Phi;"
   ["§"]=>
-  string(6) "&sect;"
+  string(5) "&Chi;"
   ["¨"]=>
-  string(5) "&uml;"
+  string(5) "&Psi;"
   ["©"]=>
-  string(6) "&copy;"
+  string(7) "&Omega;"
   ["ª"]=>
   string(6) "&ordf;"
   ["«"]=>
   string(7) "&laquo;"
   ["¬"]=>
-  string(5) "&not;"
+  string(6) "&euro;"
   ["­"]=>
   string(5) "&shy;"
   ["®"]=>
@@ -300,57 +443,57 @@ array(101) {
   ["°"]=>
   string(5) "&deg;"
   ["±"]=>
-  string(8) "&plusmn;"
+  string(7) "&alpha;"
   ["²"]=>
-  string(6) "&sup2;"
+  string(6) "&beta;"
   ["³"]=>
-  string(6) "&sup3;"
+  string(7) "&gamma;"
   ["´"]=>
-  string(7) "&acute;"
+  string(7) "&delta;"
   ["µ"]=>
-  string(7) "&micro;"
+  string(7) "&crarr;"
   ["¶"]=>
-  string(6) "&para;"
+  string(6) "&zeta;"
   ["·"]=>
-  string(8) "&middot;"
+  string(5) "&eta;"
   ["¸"]=>
-  string(7) "&cedil;"
+  string(7) "&theta;"
   ["¹"]=>
-  string(6) "&sup1;"
+  string(6) "&iota;"
   ["º"]=>
-  string(6) "&ordm;"
+  string(7) "&kappa;"
   ["»"]=>
-  string(7) "&raquo;"
+  string(8) "&lambda;"
   ["¼"]=>
-  string(8) "&frac14;"
+  string(4) "&mu;"
   ["½"]=>
-  string(8) "&frac12;"
+  string(4) "&nu;"
   ["¾"]=>
-  string(8) "&frac34;"
+  string(4) "&xi;"
   ["¿"]=>
-  string(8) "&iquest;"
+  string(9) "&omicron;"
   ["À"]=>
-  string(8) "&Agrave;"
+  string(4) "&pi;"
   ["Á"]=>
-  string(8) "&Aacute;"
+  string(5) "&rho;"
   ["Â"]=>
-  string(7) "&Acirc;"
+  string(8) "&sigmaf;"
   ["Ã"]=>
-  string(8) "&Atilde;"
+  string(7) "&sigma;"
   ["Ä"]=>
-  string(6) "&Auml;"
+  string(5) "&tau;"
   ["Å"]=>
-  string(7) "&Aring;"
+  string(6) "&sdot;"
   ["Æ"]=>
-  string(7) "&AElig;"
+  string(5) "&phi;"
   ["Ç"]=>
-  string(8) "&Ccedil;"
+  string(5) "&chi;"
   ["È"]=>
-  string(8) "&Egrave;"
+  string(5) "&psi;"
   ["É"]=>
-  string(8) "&Eacute;"
+  string(7) "&omega;"
   ["Ê"]=>
-  string(7) "&Ecirc;"
+  string(5) "&loz;"
   ["Ë"]=>
   string(6) "&Euml;"
   ["Ì"]=>
@@ -362,19 +505,19 @@ array(101) {
   ["Ï"]=>
   string(6) "&Iuml;"
   ["Ð"]=>
-  string(5) "&ETH;"
+  string(6) "&lArr;"
   ["Ñ"]=>
-  string(8) "&Ntilde;"
+  string(6) "&uArr;"
   ["Ò"]=>
-  string(8) "&Ograve;"
+  string(6) "&rArr;"
   ["Ó"]=>
-  string(8) "&Oacute;"
+  string(6) "&dArr;"
   ["Ô"]=>
-  string(7) "&Ocirc;"
+  string(6) "&hArr;"
   ["Õ"]=>
   string(8) "&Otilde;"
   ["Ö"]=>
-  string(6) "&Ouml;"
+  string(5) "&piv;"
   ["×"]=>
   string(7) "&times;"
   ["Ø"]=>
@@ -386,7 +529,7 @@ array(101) {
   ["Û"]=>
   string(7) "&Ucirc;"
   ["Ü"]=>
-  string(6) "&Uuml;"
+  string(7) "&tilde;"
   ["Ý"]=>
   string(8) "&Yacute;"
   ["Þ"]=>
@@ -457,45 +600,186 @@ array(101) {
   string(7) "&thorn;"
   ["ÿ"]=>
   string(6) "&yuml;"
+  ["R"]=>
+  string(7) "&OElig;"
+  ["S"]=>
+  string(7) "&oelig;"
+  ["`"]=>
+  string(8) "&spades;"
+  ["a"]=>
+  string(7) "&equiv;"
+  ["x"]=>
+  string(6) "&Yuml;"
+  ["\92"]=>
+  string(6) "&rarr;"
+  ["\91"]=>
+  string(6) "&uarr;"
+  ["\93"]=>
+  string(6) "&darr;"
+  ["\94"]=>
+  string(6) "&harr;"
+  ["\95"]=>
+  string(7) "&oplus;"
+  ["\96"]=>
+  string(6) "&Zeta;"
+  ["\97"]=>
+  string(8) "&otimes;"
+  ["\98"]=>
+  string(7) "&Theta;"
+  ["\99"]=>
+  string(6) "&Iota;"
+  ["\9a"]=>
+  string(7) "&Kappa;"
+  ["\9b"]=>
+  string(8) "&Lambda;"
+  ["\9c"]=>
+  string(4) "&Mu;"
+  ["\9d"]=>
+  string(4) "&Nu;"
+  ["\9e"]=>
+  string(4) "&Xi;"
+  ["\9f"]=>
+  string(9) "&Omicron;"
+  ["\ 2"]=>
+  string(6) "&part;"
+  ["\ 3"]=>
+  string(7) "&exist;"
+  ["   "]=>
+  string(7) "&rceil;"
+  ["\f"]=>
+  string(6) "&zwnj;"
+  ["\r"]=>
+  string(5) "&zwj;"
+  ["\ e"]=>
+  string(5) "&lrm;"
+  ["\ f"]=>
+  string(6) "&prod;"
+  ["\13"]=>
+  string(7) "&ndash;"
+  ["\14"]=>
+  string(7) "&mdash;"
+  ["\18"]=>
+  string(8) "&weierp;"
+  ["\19"]=>
+  string(7) "&rsquo;"
+  ["\1a"]=>
+  string(7) "&radic;"
+  ["\1c"]=>
+  string(6) "&real;"
+  ["\1d"]=>
+  string(6) "&prop;"
+  ["\1e"]=>
+  string(7) "&infin;"
+  [" "]=>
+  string(5) "&ang;"
+  ["!"]=>
+  string(8) "&Dagger;"
   ["""]=>
   string(6) "&quot;"
+  ["&"]=>
+  string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
   ["'"]=>
   string(5) "&#39;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
   ["<"]=>
   string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
-  ["&"]=>
-  string(5) "&amp;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 -- with table = HTML_ENTITIES & quote_style = ENT_NOQUOTES --
-array(99) {
+array(171) {
   [" "]=>
-  string(6) "&nbsp;"
+  string(4) "&Pi;"
   ["¡"]=>
-  string(7) "&iexcl;"
+  string(5) "&Rho;"
   ["¢"]=>
   string(6) "&cent;"
   ["£"]=>
-  string(7) "&pound;"
+  string(7) "&Sigma;"
   ["¤"]=>
-  string(8) "&curren;"
+  string(5) "&Tau;"
   ["¥"]=>
-  string(5) "&yen;"
+  string(6) "&perp;"
   ["¦"]=>
-  string(8) "&brvbar;"
+  string(5) "&Phi;"
   ["§"]=>
-  string(6) "&sect;"
+  string(5) "&Chi;"
   ["¨"]=>
-  string(5) "&uml;"
+  string(5) "&Psi;"
   ["©"]=>
-  string(6) "&copy;"
+  string(7) "&Omega;"
   ["ª"]=>
   string(6) "&ordf;"
   ["«"]=>
   string(7) "&laquo;"
   ["¬"]=>
-  string(5) "&not;"
+  string(6) "&euro;"
   ["­"]=>
   string(5) "&shy;"
   ["®"]=>
@@ -505,57 +789,57 @@ array(99) {
   ["°"]=>
   string(5) "&deg;"
   ["±"]=>
-  string(8) "&plusmn;"
+  string(7) "&alpha;"
   ["²"]=>
-  string(6) "&sup2;"
+  string(6) "&beta;"
   ["³"]=>
-  string(6) "&sup3;"
+  string(7) "&gamma;"
   ["´"]=>
-  string(7) "&acute;"
+  string(7) "&delta;"
   ["µ"]=>
-  string(7) "&micro;"
+  string(7) "&crarr;"
   ["¶"]=>
-  string(6) "&para;"
+  string(6) "&zeta;"
   ["·"]=>
-  string(8) "&middot;"
+  string(5) "&eta;"
   ["¸"]=>
-  string(7) "&cedil;"
+  string(7) "&theta;"
   ["¹"]=>
-  string(6) "&sup1;"
+  string(6) "&iota;"
   ["º"]=>
-  string(6) "&ordm;"
+  string(7) "&kappa;"
   ["»"]=>
-  string(7) "&raquo;"
+  string(8) "&lambda;"
   ["¼"]=>
-  string(8) "&frac14;"
+  string(4) "&mu;"
   ["½"]=>
-  string(8) "&frac12;"
+  string(4) "&nu;"
   ["¾"]=>
-  string(8) "&frac34;"
+  string(4) "&xi;"
   ["¿"]=>
-  string(8) "&iquest;"
+  string(9) "&omicron;"
   ["À"]=>
-  string(8) "&Agrave;"
+  string(4) "&pi;"
   ["Á"]=>
-  string(8) "&Aacute;"
+  string(5) "&rho;"
   ["Â"]=>
-  string(7) "&Acirc;"
+  string(8) "&sigmaf;"
   ["Ã"]=>
-  string(8) "&Atilde;"
+  string(7) "&sigma;"
   ["Ä"]=>
-  string(6) "&Auml;"
+  string(5) "&tau;"
   ["Å"]=>
-  string(7) "&Aring;"
+  string(6) "&sdot;"
   ["Æ"]=>
-  string(7) "&AElig;"
+  string(5) "&phi;"
   ["Ç"]=>
-  string(8) "&Ccedil;"
+  string(5) "&chi;"
   ["È"]=>
-  string(8) "&Egrave;"
+  string(5) "&psi;"
   ["É"]=>
-  string(8) "&Eacute;"
+  string(7) "&omega;"
   ["Ê"]=>
-  string(7) "&Ecirc;"
+  string(5) "&loz;"
   ["Ë"]=>
   string(6) "&Euml;"
   ["Ì"]=>
@@ -567,19 +851,19 @@ array(99) {
   ["Ï"]=>
   string(6) "&Iuml;"
   ["Ð"]=>
-  string(5) "&ETH;"
+  string(6) "&lArr;"
   ["Ñ"]=>
-  string(8) "&Ntilde;"
+  string(6) "&uArr;"
   ["Ò"]=>
-  string(8) "&Ograve;"
+  string(6) "&rArr;"
   ["Ó"]=>
-  string(8) "&Oacute;"
+  string(6) "&dArr;"
   ["Ô"]=>
-  string(7) "&Ocirc;"
+  string(6) "&hArr;"
   ["Õ"]=>
   string(8) "&Otilde;"
   ["Ö"]=>
-  string(6) "&Ouml;"
+  string(5) "&piv;"
   ["×"]=>
   string(7) "&times;"
   ["Ø"]=>
@@ -591,7 +875,7 @@ array(99) {
   ["Û"]=>
   string(7) "&Ucirc;"
   ["Ü"]=>
-  string(6) "&Uuml;"
+  string(7) "&tilde;"
   ["Ý"]=>
   string(8) "&Yacute;"
   ["Þ"]=>
@@ -662,11 +946,156 @@ array(99) {
   string(7) "&thorn;"
   ["ÿ"]=>
   string(6) "&yuml;"
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
+  ["R"]=>
+  string(7) "&OElig;"
+  ["S"]=>
+  string(7) "&oelig;"
+  ["`"]=>
+  string(8) "&spades;"
+  ["a"]=>
+  string(7) "&equiv;"
+  ["x"]=>
+  string(6) "&Yuml;"
+  ["\92"]=>
+  string(6) "&rarr;"
+  ["\91"]=>
+  string(6) "&uarr;"
+  ["\93"]=>
+  string(6) "&darr;"
+  ["\94"]=>
+  string(6) "&harr;"
+  ["\95"]=>
+  string(7) "&oplus;"
+  ["\96"]=>
+  string(6) "&Zeta;"
+  ["\97"]=>
+  string(8) "&otimes;"
+  ["\98"]=>
+  string(7) "&Theta;"
+  ["\99"]=>
+  string(6) "&Iota;"
+  ["\9a"]=>
+  string(7) "&Kappa;"
+  ["\9b"]=>
+  string(8) "&Lambda;"
+  ["\9c"]=>
+  string(4) "&Mu;"
+  ["\9d"]=>
+  string(4) "&Nu;"
+  ["\9e"]=>
+  string(4) "&Xi;"
+  ["\9f"]=>
+  string(9) "&Omicron;"
+  ["\ 2"]=>
+  string(6) "&part;"
+  ["\ 3"]=>
+  string(7) "&exist;"
+  ["   "]=>
+  string(7) "&rceil;"
+  ["\f"]=>
+  string(6) "&zwnj;"
+  ["\r"]=>
+  string(5) "&zwj;"
+  ["\ e"]=>
+  string(5) "&lrm;"
+  ["\ f"]=>
+  string(6) "&prod;"
+  ["\13"]=>
+  string(7) "&ndash;"
+  ["\14"]=>
+  string(7) "&mdash;"
+  ["\18"]=>
+  string(8) "&weierp;"
+  ["\19"]=>
+  string(7) "&rsquo;"
+  ["\1a"]=>
+  string(7) "&radic;"
+  ["\1c"]=>
+  string(6) "&real;"
+  ["\1d"]=>
+  string(6) "&prop;"
+  ["\1e"]=>
+  string(7) "&infin;"
+  [" "]=>
+  string(5) "&ang;"
+  ["!"]=>
+  string(8) "&Dagger;"
+  ["""]=>
+  string(7) "&trade;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 Done

diff --git a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
index 7bf919e3500336f0b29beefe34ee9de377f2e864..3113f40a8b76efc4ea4557b85af69b61327d9479 100644 (file)
--- a/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
+++ b/ext/standard/tests/strings/get_html_translation_table_variation1.phpt
@@ -102,67 +102,67 @@ echo "Done\n";
 --- Testing get_html_translation_table() by supplying different values for 'table' argument ---
 -- Iteration 1 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 -- Iteration 2 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 -- Iteration 3 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 -- Iteration 4 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 -- Iteration 5 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, array given in %s on line %d
 NULL
 -- Iteration 6 --
-array(100) {
+array(171) {
   [" "]=>
-  string(6) " "
+  string(4) "Π"
   ["¡"]=>
-  string(7) "¡"
+  string(5) "Ρ"
   ["¢"]=>
   string(6) "¢"
   ["£"]=>
-  string(7) "£"
+  string(7) "Σ"
   ["¤"]=>
-  string(8) "¤"
+  string(5) "Τ"
   ["¥"]=>
-  string(5) "¥"
+  string(6) "⊥"
   ["¦"]=>
-  string(8) "¦"
+  string(5) "Φ"
   ["§"]=>
-  string(6) "§"
+  string(5) "Χ"
   ["¨"]=>
-  string(5) "¨"
+  string(5) "Ψ"
   ["©"]=>
-  string(6) "©"
+  string(7) "Ω"
   ["ª"]=>
   string(6) "ª"
   ["«"]=>
   string(7) "«"
   ["¬"]=>
-  string(5) "¬"
+  string(6) "€"
   ["­"]=>
   string(5) "­"
   ["®"]=>
@@ -172,57 +172,57 @@ array(100) {
   ["°"]=>
   string(5) "°"
   ["±"]=>
-  string(8) "±"
+  string(7) "α"
   ["²"]=>
-  string(6) "²"
+  string(6) "β"
   ["³"]=>
-  string(6) "³"
+  string(7) "γ"
   ["´"]=>
-  string(7) "´"
+  string(7) "δ"
   ["µ"]=>
-  string(7) "µ"
+  string(7) "↵"
   ["¶"]=>
-  string(6) "¶"
+  string(6) "ζ"
   ["·"]=>
-  string(8) "·"
+  string(5) "η"
   ["¸"]=>
-  string(7) "¸"
+  string(7) "θ"
   ["¹"]=>
-  string(6) "¹"
+  string(6) "ι"
   ["º"]=>
-  string(6) "º"
+  string(7) "κ"
   ["»"]=>
-  string(7) "»"
+  string(8) "λ"
   ["¼"]=>
-  string(8) "¼"
+  string(4) "μ"
   ["½"]=>
-  string(8) "½"
+  string(4) "ν"
   ["¾"]=>
-  string(8) "¾"
+  string(4) "ξ"
   ["¿"]=>
-  string(8) "¿"
+  string(9) "ο"
   ["À"]=>
-  string(8) "À"
+  string(4) "π"
   ["Á"]=>
-  string(8) "Á"
+  string(5) "ρ"
   ["Â"]=>
-  string(7) "Â"
+  string(8) "ς"
   ["Ã"]=>
-  string(8) "Ã"
+  string(7) "σ"
   ["Ä"]=>
-  string(6) "Ä"
+  string(5) "τ"
   ["Å"]=>
-  string(7) "Å"
+  string(6) "⋅"
   ["Æ"]=>
-  string(7) "Æ"
+  string(5) "φ"
   ["Ç"]=>
-  string(8) "Ç"
+  string(5) "χ"
   ["È"]=>
-  string(8) "È"
+  string(5) "ψ"
   ["É"]=>
-  string(8) "É"
+  string(7) "ω"
   ["Ê"]=>
-  string(7) "Ê"
+  string(5) "◊"
   ["Ë"]=>
   string(6) "Ë"
   ["Ì"]=>
@@ -234,19 +234,19 @@ array(100) {
   ["Ï"]=>
   string(6) "Ï"
   ["Ð"]=>
-  string(5) "Ð"
+  string(6) "⇐"
   ["Ñ"]=>
-  string(8) "Ñ"
+  string(6) "⇑"
   ["Ò"]=>
-  string(8) "Ò"
+  string(6) "⇒"
   ["Ó"]=>
-  string(8) "Ó"
+  string(6) "⇓"
   ["Ô"]=>
-  string(7) "Ô"
+  string(6) "⇔"
   ["Õ"]=>
   string(8) "Õ"
   ["Ö"]=>
-  string(6) "Ö"
+  string(5) "ϖ"
   ["×"]=>
   string(7) "×"
   ["Ø"]=>
@@ -258,7 +258,7 @@ array(100) {
   ["Û"]=>
   string(7) "Û"
   ["Ü"]=>
-  string(6) "Ü"
+  string(7) "˜"
   ["Ý"]=>
   string(8) "Ý"
   ["Þ"]=>
@@ -329,42 +329,185 @@ array(100) {
   string(7) "þ"
   ["ÿ"]=>
   string(6) "ÿ"
+  ["R"]=>
+  string(7) "Œ"
+  ["S"]=>
+  string(7) "œ"
+  ["`"]=>
+  string(8) "♠"
+  ["a"]=>
+  string(7) "≡"
+  ["x"]=>
+  string(6) "Ÿ"
+  ["\92"]=>
+  string(6) "→"
+  ["\91"]=>
+  string(6) "↑"
+  ["\93"]=>
+  string(6) "↓"
+  ["\94"]=>
+  string(6) "↔"
+  ["\95"]=>
+  string(7) "⊕"
+  ["\96"]=>
+  string(6) "Ζ"
+  ["\97"]=>
+  string(8) "⊗"
+  ["\98"]=>
+  string(7) "Θ"
+  ["\99"]=>
+  string(6) "Ι"
+  ["\9a"]=>
+  string(7) "Κ"
+  ["\9b"]=>
+  string(8) "Λ"
+  ["\9c"]=>
+  string(4) "Μ"
+  ["\9d"]=>
+  string(4) "Ν"
+  ["\9e"]=>
+  string(4) "Ξ"
+  ["\9f"]=>
+  string(9) "Ο"
+  ["\ 2"]=>
+  string(6) "∂"
+  ["\ 3"]=>
+  string(7) "∃"
+  ["   "]=>
+  string(7) "⌉"
+  ["\f"]=>
+  string(6) "‌"
+  ["\r"]=>
+  string(5) "‍"
+  ["\ e"]=>
+  string(5) "‎"
+  ["\ f"]=>
+  string(6) "∏"
+  ["\13"]=>
+  string(7) "–"
+  ["\14"]=>
+  string(7) "—"
+  ["\18"]=>
+  string(8) "℘"
+  ["\19"]=>
+  string(7) "’"
+  ["\1a"]=>
+  string(7) "√"
+  ["\1c"]=>
+  string(6) "ℜ"
+  ["\1d"]=>
+  string(6) "∝"
+  ["\1e"]=>
+  string(7) "∞"
+  [" "]=>
+  string(5) "∠"
+  ["!"]=>
+  string(8) "‡"
   ["""]=>
   string(6) """
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
-array(100) {
+array(171) {
   [" "]=>
-  string(6) "&nbsp;"
+  string(4) "&Pi;"
   ["¡"]=>
-  string(7) "&iexcl;"
+  string(5) "&Rho;"
   ["¢"]=>
   string(6) "&cent;"
   ["£"]=>
-  string(7) "&pound;"
+  string(7) "&Sigma;"
   ["¤"]=>
-  string(8) "&curren;"
+  string(5) "&Tau;"
   ["¥"]=>
-  string(5) "&yen;"
+  string(6) "&perp;"
   ["¦"]=>
-  string(8) "&brvbar;"
+  string(5) "&Phi;"
   ["§"]=>
-  string(6) "&sect;"
+  string(5) "&Chi;"
   ["¨"]=>
-  string(5) "&uml;"
+  string(5) "&Psi;"
   ["©"]=>
-  string(6) "&copy;"
+  string(7) "&Omega;"
   ["ª"]=>
   string(6) "&ordf;"
   ["«"]=>
   string(7) "&laquo;"
   ["¬"]=>
-  string(5) "&not;"
+  string(6) "&euro;"
   ["­"]=>
   string(5) "&shy;"
   ["®"]=>
@@ -374,57 +517,57 @@ array(100) {
   ["°"]=>
   string(5) "&deg;"
   ["±"]=>
-  string(8) "&plusmn;"
+  string(7) "&alpha;"
   ["²"]=>
-  string(6) "&sup2;"
+  string(6) "&beta;"
   ["³"]=>
-  string(6) "&sup3;"
+  string(7) "&gamma;"
   ["´"]=>
-  string(7) "&acute;"
+  string(7) "&delta;"
   ["µ"]=>
-  string(7) "&micro;"
+  string(7) "&crarr;"
   ["¶"]=>
-  string(6) "&para;"
+  string(6) "&zeta;"
   ["·"]=>
-  string(8) "&middot;"
+  string(5) "&eta;"
   ["¸"]=>
-  string(7) "&cedil;"
+  string(7) "&theta;"
   ["¹"]=>
-  string(6) "&sup1;"
+  string(6) "&iota;"
   ["º"]=>
-  string(6) "&ordm;"
+  string(7) "&kappa;"
   ["»"]=>
-  string(7) "&raquo;"
+  string(8) "&lambda;"
   ["¼"]=>
-  string(8) "&frac14;"
+  string(4) "&mu;"
   ["½"]=>
-  string(8) "&frac12;"
+  string(4) "&nu;"
   ["¾"]=>
-  string(8) "&frac34;"
+  string(4) "&xi;"
   ["¿"]=>
-  string(8) "&iquest;"
+  string(9) "&omicron;"
   ["À"]=>
-  string(8) "&Agrave;"
+  string(4) "&pi;"
   ["Á"]=>
-  string(8) "&Aacute;"
+  string(5) "&rho;"
   ["Â"]=>
-  string(7) "&Acirc;"
+  string(8) "&sigmaf;"
   ["Ã"]=>
-  string(8) "&Atilde;"
+  string(7) "&sigma;"
   ["Ä"]=>
-  string(6) "&Auml;"
+  string(5) "&tau;"
   ["Å"]=>
-  string(7) "&Aring;"
+  string(6) "&sdot;"
   ["Æ"]=>
-  string(7) "&AElig;"
+  string(5) "&phi;"
   ["Ç"]=>
-  string(8) "&Ccedil;"
+  string(5) "&chi;"
   ["È"]=>
-  string(8) "&Egrave;"
+  string(5) "&psi;"
   ["É"]=>
-  string(8) "&Eacute;"
+  string(7) "&omega;"
   ["Ê"]=>
-  string(7) "&Ecirc;"
+  string(5) "&loz;"
   ["Ë"]=>
   string(6) "&Euml;"
   ["Ì"]=>
@@ -436,19 +579,19 @@ array(100) {
   ["Ï"]=>
   string(6) "&Iuml;"
   ["Ð"]=>
-  string(5) "&ETH;"
+  string(6) "&lArr;"
   ["Ñ"]=>
-  string(8) "&Ntilde;"
+  string(6) "&uArr;"
   ["Ò"]=>
-  string(8) "&Ograve;"
+  string(6) "&rArr;"
   ["Ó"]=>
-  string(8) "&Oacute;"
+  string(6) "&dArr;"
   ["Ô"]=>
-  string(7) "&Ocirc;"
+  string(6) "&hArr;"
   ["Õ"]=>
   string(8) "&Otilde;"
   ["Ö"]=>
-  string(6) "&Ouml;"
+  string(5) "&piv;"
   ["×"]=>
   string(7) "&times;"
   ["Ø"]=>
@@ -460,7 +603,7 @@ array(100) {
   ["Û"]=>
   string(7) "&Ucirc;"
   ["Ü"]=>
-  string(6) "&Uuml;"
+  string(7) "&tilde;"
   ["Ý"]=>
   string(8) "&Yacute;"
   ["Þ"]=>
@@ -531,14 +674,157 @@ array(100) {
   string(7) "&thorn;"
   ["ÿ"]=>
   string(6) "&yuml;"
+  ["R"]=>
+  string(7) "&OElig;"
+  ["S"]=>
+  string(7) "&oelig;"
+  ["`"]=>
+  string(8) "&spades;"
+  ["a"]=>
+  string(7) "&equiv;"
+  ["x"]=>
+  string(6) "&Yuml;"
+  ["\92"]=>
+  string(6) "&rarr;"
+  ["\91"]=>
+  string(6) "&uarr;"
+  ["\93"]=>
+  string(6) "&darr;"
+  ["\94"]=>
+  string(6) "&harr;"
+  ["\95"]=>
+  string(7) "&oplus;"
+  ["\96"]=>
+  string(6) "&Zeta;"
+  ["\97"]=>
+  string(8) "&otimes;"
+  ["\98"]=>
+  string(7) "&Theta;"
+  ["\99"]=>
+  string(6) "&Iota;"
+  ["\9a"]=>
+  string(7) "&Kappa;"
+  ["\9b"]=>
+  string(8) "&Lambda;"
+  ["\9c"]=>
+  string(4) "&Mu;"
+  ["\9d"]=>
+  string(4) "&Nu;"
+  ["\9e"]=>
+  string(4) "&Xi;"
+  ["\9f"]=>
+  string(9) "&Omicron;"
+  ["\ 2"]=>
+  string(6) "&part;"
+  ["\ 3"]=>
+  string(7) "&exist;"
+  ["   "]=>
+  string(7) "&rceil;"
+  ["\f"]=>
+  string(6) "&zwnj;"
+  ["\r"]=>
+  string(5) "&zwj;"
+  ["\ e"]=>
+  string(5) "&lrm;"
+  ["\ f"]=>
+  string(6) "&prod;"
+  ["\13"]=>
+  string(7) "&ndash;"
+  ["\14"]=>
+  string(7) "&mdash;"
+  ["\18"]=>
+  string(8) "&weierp;"
+  ["\19"]=>
+  string(7) "&rsquo;"
+  ["\1a"]=>
+  string(7) "&radic;"
+  ["\1c"]=>
+  string(6) "&real;"
+  ["\1d"]=>
+  string(6) "&prop;"
+  ["\1e"]=>
+  string(7) "&infin;"
+  [" "]=>
+  string(5) "&ang;"
+  ["!"]=>
+  string(8) "&Dagger;"
   ["""]=>
   string(6) "&quot;"
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 -- Iteration 7 --
 array(4) {
@@ -562,33 +848,33 @@ array(4) {
   string(5) "&amp;"
 }
 -- Iteration 8 --
-array(100) {
+array(171) {
   [" "]=>
-  string(6) "&nbsp;"
+  string(4) "&Pi;"
   ["¡"]=>
-  string(7) "&iexcl;"
+  string(5) "&Rho;"
   ["¢"]=>
   string(6) "&cent;"
   ["£"]=>
-  string(7) "&pound;"
+  string(7) "&Sigma;"
   ["¤"]=>
-  string(8) "&curren;"
+  string(5) "&Tau;"
   ["¥"]=>
-  string(5) "&yen;"
+  string(6) "&perp;"
   ["¦"]=>
-  string(8) "&brvbar;"
+  string(5) "&Phi;"
   ["§"]=>
-  string(6) "&sect;"
+  string(5) "&Chi;"
   ["¨"]=>
-  string(5) "&uml;"
+  string(5) "&Psi;"
   ["©"]=>
-  string(6) "&copy;"
+  string(7) "&Omega;"
   ["ª"]=>
   string(6) "&ordf;"
   ["«"]=>
   string(7) "&laquo;"
   ["¬"]=>
-  string(5) "&not;"
+  string(6) "&euro;"
   ["­"]=>
   string(5) "&shy;"
   ["®"]=>
@@ -598,57 +884,57 @@ array(100) {
   ["°"]=>
   string(5) "&deg;"
   ["±"]=>
-  string(8) "&plusmn;"
+  string(7) "&alpha;"
   ["²"]=>
-  string(6) "&sup2;"
+  string(6) "&beta;"
   ["³"]=>
-  string(6) "&sup3;"
+  string(7) "&gamma;"
   ["´"]=>
-  string(7) "&acute;"
+  string(7) "&delta;"
   ["µ"]=>
-  string(7) "&micro;"
+  string(7) "&crarr;"
   ["¶"]=>
-  string(6) "&para;"
+  string(6) "&zeta;"
   ["·"]=>
-  string(8) "&middot;"
+  string(5) "&eta;"
   ["¸"]=>
-  string(7) "&cedil;"
+  string(7) "&theta;"
   ["¹"]=>
-  string(6) "&sup1;"
+  string(6) "&iota;"
   ["º"]=>
-  string(6) "&ordm;"
+  string(7) "&kappa;"
   ["»"]=>
-  string(7) "&raquo;"
+  string(8) "&lambda;"
   ["¼"]=>
-  string(8) "&frac14;"
+  string(4) "&mu;"
   ["½"]=>
-  string(8) "&frac12;"
+  string(4) "&nu;"
   ["¾"]=>
-  string(8) "&frac34;"
+  string(4) "&xi;"
   ["¿"]=>
-  string(8) "&iquest;"
+  string(9) "&omicron;"
   ["À"]=>
-  string(8) "&Agrave;"
+  string(4) "&pi;"
   ["Á"]=>
-  string(8) "&Aacute;"
+  string(5) "&rho;"
   ["Â"]=>
-  string(7) "&Acirc;"
+  string(8) "&sigmaf;"
   ["Ã"]=>
-  string(8) "&Atilde;"
+  string(7) "&sigma;"
   ["Ä"]=>
-  string(6) "&Auml;"
+  string(5) "&tau;"
   ["Å"]=>
-  string(7) "&Aring;"
+  string(6) "&sdot;"
   ["Æ"]=>
-  string(7) "&AElig;"
+  string(5) "&phi;"
   ["Ç"]=>
-  string(8) "&Ccedil;"
+  string(5) "&chi;"
   ["È"]=>
-  string(8) "&Egrave;"
+  string(5) "&psi;"
   ["É"]=>
-  string(8) "&Eacute;"
+  string(7) "&omega;"
   ["Ê"]=>
-  string(7) "&Ecirc;"
+  string(5) "&loz;"
   ["Ë"]=>
   string(6) "&Euml;"
   ["Ì"]=>
@@ -660,19 +946,19 @@ array(100) {
   ["Ï"]=>
   string(6) "&Iuml;"
   ["Ð"]=>
-  string(5) "&ETH;"
+  string(6) "&lArr;"
   ["Ñ"]=>
-  string(8) "&Ntilde;"
+  string(6) "&uArr;"
   ["Ò"]=>
-  string(8) "&Ograve;"
+  string(6) "&rArr;"
   ["Ó"]=>
-  string(8) "&Oacute;"
+  string(6) "&dArr;"
   ["Ô"]=>
-  string(7) "&Ocirc;"
+  string(6) "&hArr;"
   ["Õ"]=>
   string(8) "&Otilde;"
   ["Ö"]=>
-  string(6) "&Ouml;"
+  string(5) "&piv;"
   ["×"]=>
   string(7) "&times;"
   ["Ø"]=>
@@ -684,7 +970,7 @@ array(100) {
   ["Û"]=>
   string(7) "&Ucirc;"
   ["Ü"]=>
-  string(6) "&Uuml;"
+  string(7) "&tilde;"
   ["Ý"]=>
   string(8) "&Yacute;"
   ["Þ"]=>
@@ -755,42 +1041,185 @@ array(100) {
   string(7) "&thorn;"
   ["ÿ"]=>
   string(6) "&yuml;"
+  ["R"]=>
+  string(7) "&OElig;"
+  ["S"]=>
+  string(7) "&oelig;"
+  ["`"]=>
+  string(8) "&spades;"
+  ["a"]=>
+  string(7) "&equiv;"
+  ["x"]=>
+  string(6) "&Yuml;"
+  ["\92"]=>
+  string(6) "&rarr;"
+  ["\91"]=>
+  string(6) "&uarr;"
+  ["\93"]=>
+  string(6) "&darr;"
+  ["\94"]=>
+  string(6) "&harr;"
+  ["\95"]=>
+  string(7) "&oplus;"
+  ["\96"]=>
+  string(6) "&Zeta;"
+  ["\97"]=>
+  string(8) "&otimes;"
+  ["\98"]=>
+  string(7) "&Theta;"
+  ["\99"]=>
+  string(6) "&Iota;"
+  ["\9a"]=>
+  string(7) "&Kappa;"
+  ["\9b"]=>
+  string(8) "&Lambda;"
+  ["\9c"]=>
+  string(4) "&Mu;"
+  ["\9d"]=>
+  string(4) "&Nu;"
+  ["\9e"]=>
+  string(4) "&Xi;"
+  ["\9f"]=>
+  string(9) "&Omicron;"
+  ["\ 2"]=>
+  string(6) "&part;"
+  ["\ 3"]=>
+  string(7) "&exist;"
+  ["   "]=>
+  string(7) "&rceil;"
+  ["\f"]=>
+  string(6) "&zwnj;"
+  ["\r"]=>
+  string(5) "&zwj;"
+  ["\ e"]=>
+  string(5) "&lrm;"
+  ["\ f"]=>
+  string(6) "&prod;"
+  ["\13"]=>
+  string(7) "&ndash;"
+  ["\14"]=>
+  string(7) "&mdash;"
+  ["\18"]=>
+  string(8) "&weierp;"
+  ["\19"]=>
+  string(7) "&rsquo;"
+  ["\1a"]=>
+  string(7) "&radic;"
+  ["\1c"]=>
+  string(6) "&real;"
+  ["\1d"]=>
+  string(6) "&prop;"
+  ["\1e"]=>
+  string(7) "&infin;"
+  [" "]=>
+  string(5) "&ang;"
+  ["!"]=>
+  string(8) "&Dagger;"
   ["""]=>
   string(6) "&quot;"
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
-array(100) {
+array(171) {
   [" "]=>
-  string(6) "&nbsp;"
+  string(4) "&Pi;"
   ["¡"]=>
-  string(7) "&iexcl;"
+  string(5) "&Rho;"
   ["¢"]=>
   string(6) "&cent;"
   ["£"]=>
-  string(7) "&pound;"
+  string(7) "&Sigma;"
   ["¤"]=>
-  string(8) "&curren;"
+  string(5) "&Tau;"
   ["¥"]=>
-  string(5) "&yen;"
+  string(6) "&perp;"
   ["¦"]=>
-  string(8) "&brvbar;"
+  string(5) "&Phi;"
   ["§"]=>
-  string(6) "&sect;"
+  string(5) "&Chi;"
   ["¨"]=>
-  string(5) "&uml;"
+  string(5) "&Psi;"
   ["©"]=>
-  string(6) "&copy;"
+  string(7) "&Omega;"
   ["ª"]=>
   string(6) "&ordf;"
   ["«"]=>
   string(7) "&laquo;"
   ["¬"]=>
-  string(5) "&not;"
+  string(6) "&euro;"
   ["­"]=>
   string(5) "&shy;"
   ["®"]=>
@@ -800,57 +1229,57 @@ array(100) {
   ["°"]=>
   string(5) "&deg;"
   ["±"]=>
-  string(8) "&plusmn;"
+  string(7) "&alpha;"
   ["²"]=>
-  string(6) "&sup2;"
+  string(6) "&beta;"
   ["³"]=>
-  string(6) "&sup3;"
+  string(7) "&gamma;"
   ["´"]=>
-  string(7) "&acute;"
+  string(7) "&delta;"
   ["µ"]=>
-  string(7) "&micro;"
+  string(7) "&crarr;"
   ["¶"]=>
-  string(6) "&para;"
+  string(6) "&zeta;"
   ["·"]=>
-  string(8) "&middot;"
+  string(5) "&eta;"
   ["¸"]=>
-  string(7) "&cedil;"
+  string(7) "&theta;"
   ["¹"]=>
-  string(6) "&sup1;"
+  string(6) "&iota;"
   ["º"]=>
-  string(6) "&ordm;"
+  string(7) "&kappa;"
   ["»"]=>
-  string(7) "&raquo;"
+  string(8) "&lambda;"
   ["¼"]=>
-  string(8) "&frac14;"
+  string(4) "&mu;"
   ["½"]=>
-  string(8) "&frac12;"
+  string(4) "&nu;"
   ["¾"]=>
-  string(8) "&frac34;"
+  string(4) "&xi;"
   ["¿"]=>
-  string(8) "&iquest;"
+  string(9) "&omicron;"
   ["À"]=>
-  string(8) "&Agrave;"
+  string(4) "&pi;"
   ["Á"]=>
-  string(8) "&Aacute;"
+  string(5) "&rho;"
   ["Â"]=>
-  string(7) "&Acirc;"
+  string(8) "&sigmaf;"
   ["Ã"]=>
-  string(8) "&Atilde;"
+  string(7) "&sigma;"
   ["Ä"]=>
-  string(6) "&Auml;"
+  string(5) "&tau;"
   ["Å"]=>
-  string(7) "&Aring;"
+  string(6) "&sdot;"
   ["Æ"]=>
-  string(7) "&AElig;"
+  string(5) "&phi;"
   ["Ç"]=>
-  string(8) "&Ccedil;"
+  string(5) "&chi;"
   ["È"]=>
-  string(8) "&Egrave;"
+  string(5) "&psi;"
   ["É"]=>
-  string(8) "&Eacute;"
+  string(7) "&omega;"
   ["Ê"]=>
-  string(7) "&Ecirc;"
+  string(5) "&loz;"
   ["Ë"]=>
   string(6) "&Euml;"
   ["Ì"]=>
@@ -862,19 +1291,19 @@ array(100) {
   ["Ï"]=>
   string(6) "&Iuml;"
   ["Ð"]=>
-  string(5) "&ETH;"
+  string(6) "&lArr;"
   ["Ñ"]=>
-  string(8) "&Ntilde;"
+  string(6) "&uArr;"
   ["Ò"]=>
-  string(8) "&Ograve;"
+  string(6) "&rArr;"
   ["Ó"]=>
-  string(8) "&Oacute;"
+  string(6) "&dArr;"
   ["Ô"]=>
-  string(7) "&Ocirc;"
+  string(6) "&hArr;"
   ["Õ"]=>
   string(8) "&Otilde;"
   ["Ö"]=>
-  string(6) "&Ouml;"
+  string(5) "&piv;"
   ["×"]=>
   string(7) "&times;"
   ["Ø"]=>
@@ -886,7 +1315,7 @@ array(100) {
   ["Û"]=>
   string(7) "&Ucirc;"
   ["Ü"]=>
-  string(6) "&Uuml;"
+  string(7) "&tilde;"
   ["Ý"]=>
   string(8) "&Yacute;"
   ["Þ"]=>
@@ -957,14 +1386,157 @@ array(100) {
   string(7) "&thorn;"
   ["ÿ"]=>
   string(6) "&yuml;"
+  ["R"]=>
+  string(7) "&OElig;"
+  ["S"]=>
+  string(7) "&oelig;"
+  ["`"]=>
+  string(8) "&spades;"
+  ["a"]=>
+  string(7) "&equiv;"
+  ["x"]=>
+  string(6) "&Yuml;"
+  ["\92"]=>
+  string(6) "&rarr;"
+  ["\91"]=>
+  string(6) "&uarr;"
+  ["\93"]=>
+  string(6) "&darr;"
+  ["\94"]=>
+  string(6) "&harr;"
+  ["\95"]=>
+  string(7) "&oplus;"
+  ["\96"]=>
+  string(6) "&Zeta;"
+  ["\97"]=>
+  string(8) "&otimes;"
+  ["\98"]=>
+  string(7) "&Theta;"
+  ["\99"]=>
+  string(6) "&Iota;"
+  ["\9a"]=>
+  string(7) "&Kappa;"
+  ["\9b"]=>
+  string(8) "&Lambda;"
+  ["\9c"]=>
+  string(4) "&Mu;"
+  ["\9d"]=>
+  string(4) "&Nu;"
+  ["\9e"]=>
+  string(4) "&Xi;"
+  ["\9f"]=>
+  string(9) "&Omicron;"
+  ["\ 2"]=>
+  string(6) "&part;"
+  ["\ 3"]=>
+  string(7) "&exist;"
+  ["   "]=>
+  string(7) "&rceil;"
+  ["\f"]=>
+  string(6) "&zwnj;"
+  ["\r"]=>
+  string(5) "&zwj;"
+  ["\ e"]=>
+  string(5) "&lrm;"
+  ["\ f"]=>
+  string(6) "&prod;"
+  ["\13"]=>
+  string(7) "&ndash;"
+  ["\14"]=>
+  string(7) "&mdash;"
+  ["\18"]=>
+  string(8) "&weierp;"
+  ["\19"]=>
+  string(7) "&rsquo;"
+  ["\1a"]=>
+  string(7) "&radic;"
+  ["\1c"]=>
+  string(6) "&real;"
+  ["\1d"]=>
+  string(6) "&prop;"
+  ["\1e"]=>
+  string(7) "&infin;"
+  [" "]=>
+  string(5) "&ang;"
+  ["!"]=>
+  string(8) "&Dagger;"
   ["""]=>
   string(6) "&quot;"
-  ["<"]=>
-  string(4) "&lt;"
-  [">"]=>
-  string(4) "&gt;"
   ["&"]=>
   string(5) "&amp;"
+  [0]=>
+  string(8) "&permil;"
+  [2]=>
+  string(7) "&prime;"
+  [3]=>
+  string(7) "&Prime;"
+  [9]=>
+  string(8) "&lsaquo;"
+  [":"]=>
+  string(8) "&rsaquo;"
+  [">"]=>
+  string(4) "&gt;"
+  ["D"]=>
+  string(7) "&frasl;"
+  ["\11"]=>
+  string(5) "&sum;"
+  [5]=>
+  string(9) "&alefsym;"
+  ["\90"]=>
+  string(6) "&larr;"
+  [""]=>
+  string(8) "&forall;"
+  ["\ 5"]=>
+  string(7) "&empty;"
+  ["\a"]=>
+  string(7) "&nabla;"
+  ["\b"]=>
+  string(7) "&lceil;"
+  ["\v"]=>
+  string(8) "&rfloor;"
+  ["\12"]=>
+  string(7) "&minus;"
+  ["\17"]=>
+  string(8) "&lowast;"
+  ["'"]=>
+  string(5) "&and;"
+  ["("]=>
+  string(4) "&or;"
+  [")"]=>
+  string(6) "&lang;"
+  ["*"]=>
+  string(6) "&rang;"
+  ["+"]=>
+  string(5) "&int;"
+  [4]=>
+  string(8) "&there4;"
+  ["<"]=>
+  string(4) "&lt;"
+  ["E"]=>
+  string(6) "&cong;"
+  ["H"]=>
+  string(7) "&asymp;"
+  ["d"]=>
+  string(4) "&le;"
+  ["e"]=>
+  string(8) "&hearts;"
+  ["\82"]=>
+  string(5) "&sub;"
+  ["\83"]=>
+  string(5) "&sup;"
+  ["\84"]=>
+  string(6) "&nsub;"
+  ["\86"]=>
+  string(6) "&sube;"
+  ["\87"]=>
+  string(6) "&supe;"
+  ["
+"]=>
+  string(8) "&lfloor;"
+  ["c"]=>
+  string(7) "&clubs;"
+  ["f"]=>
+  string(7) "&diams;"
 }
 -- Iteration 9 --
 array(4) {
@@ -989,38 +1561,38 @@ array(4) {
 }
 -- Iteration 10 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 -- Iteration 11 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 -- Iteration 12 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, object given in %s on line %d
 NULL
 -- Iteration 13 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 -- Iteration 14 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, string given in %s on line %d
 NULL
 -- Iteration 15 --
 array(4) {
@@ -1066,10 +1638,10 @@ array(4) {
 }
 -- Iteration 17 --
 
-Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %d
 NULL
 
-Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %s
+Warning: get_html_translation_table() expects parameter 1 to be long, resource given in %s on line %d
 NULL
 -- Iteration 18 --
 array(4) {

diff --git a/ext/standard/tests/strings/htmlentities.phpt b/ext/standard/tests/strings/htmlentities.phpt
index 743651ecad5e6e9a2b880015431fa32dfdcbb59b..f2e107a7355ffad8b3c87d840b92d72de88d9e15 100644 (file)
--- a/ext/standard/tests/strings/htmlentities.phpt
+++ b/ext/standard/tests/strings/htmlentities.phpt
@@ -1,16 +1,16 @@
 --TEST--
-HTML entities
+HTML entities of ISO-8859 chars
 --INI--
 output_handler=
 --FILE--
 <?php 
 setlocale (LC_CTYPE, "C");
-$sc_encoded = htmlspecialchars ("<>\"&åÄ\n");
+$sc_encoded = htmlspecialchars ("<>\"&åÄ\n",ENT_COMPAT,"ISO-8859-1");
 echo $sc_encoded;
-$ent_encoded = htmlentities ("<>\"&åÄ\n");
+$ent_encoded = htmlentities ("<>\"&åÄ\n",ENT_COMPAT,"ISO-8859-1");
 echo $ent_encoded;
-echo html_entity_decode($sc_encoded);
-echo html_entity_decode($ent_encoded);
+echo html_entity_decode($sc_encoded,ENT_COMPAT,"ISO-8859-1");
+echo html_entity_decode($ent_encoded,ENT_COMPAT,"ISO-8859-1");
 ?>
 --EXPECT--
 &lt;&gt;&quot;&amp;åÄ

diff --git a/php.ini-development b/php.ini-development
index 2eecc139ff71de479b0aec8626fc7ad4a9f0404e..7e304461c569ede568ce0e2c5643bceca1081db0 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -769,7 +769,7 @@ default_mimetype = "text/html"
 
 ; PHP's default character set is set to empty.
 ; http://php.net/default-charset
-;default_charset = "iso-8859-1"
+;default_charset = "UTF-8"
 
 ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
 ; to disable this feature.

diff --git a/php.ini-production b/php.ini-production
index c84d8304654bcc60c397da74edb1e46d138edf1e..793f67ed7a3af1a6f9290a0694048572c63485e0 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -769,7 +769,7 @@ default_mimetype = "text/html"
 
 ; PHP's default character set is set to empty.
 ; http://php.net/default-charset
-;default_charset = "iso-8859-1"
+;default_charset = "UTF-8"
 
 ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
 ; to disable this feature.