Skip to content

Commit

Permalink
Fix HTML entity table generation
Browse files Browse the repository at this point in the history
  • Loading branch information
pankdm authored and nikic committed Mar 6, 2014
1 parent 721b9a7 commit e2fc6b5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions ext/standard/html_tables.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}} */
Expand Down
1 change: 1 addition & 0 deletions ext/standard/html_tables/html_table_gen.php
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ enum entity_charset charset;

ksort($multicp_rows);
foreach ($multicp_rows as &$v) { ksort($v); }
unset($v);

echo
"/* {{{ Start of double code point tables for $name */", "\n\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
(
[Æ] => Æ
Expand Down Expand Up @@ -1108,6 +1108,7 @@ Array
[⋾] => ⋾
[⋽] => ⋽
[∦] => ∦
[⫽⃥] => &nparsl
[∂̸] => &npart
[⨔] => ⨔
[⊀] => ⊀
Expand Down Expand Up @@ -1196,6 +1197,7 @@ Array
[⌽] => ⌽
[¶] => ¶
[⫳] => ⫳
[⫽] => ⫽
[∂] => ∂
[п] => п
[%] => %
Expand Down Expand Up @@ -1500,7 +1502,6 @@ Array
[⦜] => ⦜
[ϰ] => ϰ
[⫌︀] => &varsupsetneqq
[⫽︀] => &varsupsetneqq
[⊲] => ⊲
[в] => в
[⊢] => ⊢
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion ext/standard/tests/strings/htmlentities_html5.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit e2fc6b5

Please sign in to comment.