com php-src: Fix HTML entity table generation: ext/standard/htm l_tables.h ext/standard/html_tables/html_table_gen .php
ext/standard/tests/strings/get_html_translation_ table_basic5.phpt ext/standard/tests/strings/htmlentiti es_html5.phpt

Commit: e2fc6b52f04ce2bf2295011d8b768cc0d8097ed7 Author: Dmitry Panin <pank.dm@gmail.com> Tue, 11 Feb 2014 16:39:27 -0800 Committer: Nikita Popov <nikic@php.net> Thu, 6 Mar 2014 23:10:31 +0100 Parents: 721b9a7c8dbe52cd3f0d2ac69b8eb9c78a0721c9 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e2fc6b52f04ce2bf2295011d8b768cc0d8097ed7 Log: Fix HTML entity table generation Changed paths: M ext/standard/html_tables.h M ext/standard/html_tables/html_table_gen.php M ext/standard/tests/strings/get_html_translation_table_basic5.phpt M ext/standard/tests/strings/htmlentities_html5.phpt Diff: diff --git a/ext/standard/html_tables.h b/ext/standard/html_tables.h index 05aea46..83c78b5 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 7e7314f..defddbd 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 600ad43..c7a9622 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 ( [Æ] => &AElig; @@ -1108,6 +1108,7 @@ Array [⋾] => &notnivb; [⋽] => &notnivc; [∦] => &nparallel; + [⫽⃥] => &nparsl [∂̸] => &npart [⨔] => &npolint; [⊀] => &npr; @@ -1196,6 +1197,7 @@ Array [⌽] => &ovbar; [¶] => &para; [⫳] => &parsim; + [⫽] => &parsl; [∂] => &part; [п] => &pcy; [%] => &percnt; @@ -1500,7 +1502,6 @@ Array [⦜] => &vangrt; [ϰ] => &varkappa; [⫌︀] => &varsupsetneqq - [⫽︀] => &varsupsetneqq [⊲] => &vartriangleleft; [в] => &vcy; [⊢] => &vdash; @@ -1561,9 +1562,9 @@ Array [‌] => &zwnj; ) -- 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 1f34097..e7c216a 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) { &topcir; U+02AF1 &nhpar; U+02AF2 &parsim; U+02AF3 +&parsl; U+02AFD &fflig; U+0FB00 &filig; U+0FB01 &fllig; U+0FB02 @@ -1620,4 +1621,4 @@ foreach ($mpcent as $i) { &nsupseteqq; U+02AC6 U+00338 &vsubnE; U+02ACB U+0FE00 &varsupsetneqq; U+02ACC U+0FE00 -&varsupsetneqq; U+02AFD U+0FE00 +&parsl;︀ U+02AFD U+0FE00 \ No newline at end of file