diff options
| author | Dmitry Panin <pank.dm@gmail.com> | 2014-02-11 16:39:27 -0800 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-03-06 23:10:31 +0100 |
| commit | e2fc6b52f04ce2bf2295011d8b768cc0d8097ed7 (patch) | |
| tree | b5e1378d64cac6127e9040a91dae18dfd926a482 | |
| parent | 721b9a7c8dbe52cd3f0d2ac69b8eb9c78a0721c9 (diff) | |
| download | php-git-e2fc6b52f04ce2bf2295011d8b768cc0d8097ed7.tar.gz | |
Fix HTML entity table generation
| -rw-r--r-- | ext/standard/html_tables.h | 4 | ||||
| -rw-r--r-- | ext/standard/html_tables/html_table_gen.php | 1 | ||||
| -rw-r--r-- | ext/standard/tests/strings/get_html_translation_table_basic5.phpt | 9 | ||||
| -rw-r--r-- | ext/standard/tests/strings/htmlentities_html5.phpt | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/ext/standard/html_tables.h b/ext/standard/html_tables.h index 05aea46df1..83c78b5d78 100644 --- a/ext/standard/html_tables.h +++ b/ext/standard/html_tables.h @@ -1395,8 +1395,8 @@ static const entity_multicodepoint_row multi_cp_html5_02ACC[] = { { {0x0FE00, "varsupsetneqq", 13} }, }; static const entity_multicodepoint_row multi_cp_html5_02AFD[] = { - { {01, NULL , 0} }, - { {0x0FE00, "varsupsetneqq", 13} }, + { {01, "parsl", 5} }, + { {0x020E5, "nparsl", 6} }, }; /* End of double code point tables }}} */ diff --git a/ext/standard/html_tables/html_table_gen.php b/ext/standard/html_tables/html_table_gen.php index 7e7314fa35..defddbd0e3 100644 --- a/ext/standard/html_tables/html_table_gen.php +++ b/ext/standard/html_tables/html_table_gen.php @@ -461,6 +461,7 @@ if (empty($multicp_rows)) ksort($multicp_rows); foreach ($multicp_rows as &$v) { ksort($v); } +unset($v); echo "/* {{{ Start of double code point tables for $name */", "\n\n"; diff --git a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt index 600ad43635..c7a9622fb7 100644 --- a/ext/standard/tests/strings/get_html_translation_table_basic5.phpt +++ b/ext/standard/tests/strings/get_html_translation_table_basic5.phpt @@ -46,7 +46,7 @@ echo "Done\n"; --EXPECT-- *** Testing get_html_translation_table() : basic functionality/HTML 5 *** -- with table = HTML_ENTITIES, ENT_COMPAT -- -int(1509) +int(1510) Array ( [Æ] => Æ @@ -1108,6 +1108,7 @@ Array [⋾] => ⋾ [⋽] => ⋽ [∦] => ∦ + [⫽⃥] => &nparsl [∂̸] => &npart [⨔] => ⨔ [⊀] => ⊀ @@ -1196,6 +1197,7 @@ Array [⌽] => ⌽ [¶] => ¶ [⫳] => ⫳ + [⫽] => ⫽ [∂] => ∂ [п] => п [%] => % @@ -1500,7 +1502,6 @@ Array [⦜] => ⦜ [ϰ] => ϰ [⫌︀] => &varsupsetneqq - [⫽︀] => &varsupsetneqq [⊲] => ⊲ [в] => в [⊢] => ⊢ @@ -1561,9 +1562,9 @@ Array [] => ‌ ) -- with table = HTML_ENTITIES, ENT_QUOTES -- -int(1510) +int(1511) -- with table = HTML_ENTITIES, ENT_NOQUOTES -- -int(1508) +int(1509) -- with table = HTML_SPECIALCHARS, ENT_COMPAT -- int(4) Array diff --git a/ext/standard/tests/strings/htmlentities_html5.phpt b/ext/standard/tests/strings/htmlentities_html5.phpt index 1f3409723e..e7c216a292 100644 --- a/ext/standard/tests/strings/htmlentities_html5.phpt +++ b/ext/standard/tests/strings/htmlentities_html5.phpt @@ -1418,6 +1418,7 @@ foreach ($mpcent as $i) { ⫱ U+02AF1 ⫲ U+02AF2 ⫳ U+02AF3 +⫽ U+02AFD ff U+0FB00 fi U+0FB01 fl U+0FB02 @@ -1620,4 +1621,4 @@ foreach ($mpcent as $i) { ⫆̸ U+02AC6 U+00338 ⫋︀ U+02ACB U+0FE00 ⫌︀ U+02ACC U+0FE00 -⫌︀ U+02AFD U+0FE00 +⫽︀ U+02AFD U+0FE00
\ No newline at end of file |