emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop-500' of github.com:htacg/tidy-html5 into develop-500

Browse source
This commit is contained in:
Geoff R. McLane 2015-02-12 13:32:55 +01:00
parent ebc8dce0aa 071407bc24
commit b14e3a3a1d
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/parser.c
View file

@ -3921,7 +3921,10 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
if (TY_(nodeIsElement)(node)) if (TY_(nodeIsElement)(node))
{ {
if ( TY_(nodeHasCM)(node, CM_INLINE) && !TY_(nodeHasCM)(node, CM_MIXED) ) /* [i_a]2 add CM_MIXED */ /* Issue #20 - merging from Ger Hobbelt fork put back CM_MIXED, which had been
removed to fix this issue - reverting to fix 880221e
*/
if ( TY_(nodeHasCM)(node, CM_INLINE) )
{ {
/* HTML4 strict doesn't allow inline content here */ /* HTML4 strict doesn't allow inline content here */
/* but HTML2 does allow img elements as children of body */ /* but HTML2 does allow img elements as children of body */

4
src/pprint.c
View file

@ -1985,6 +1985,10 @@ void TY_(PPrintTree)( TidyDocImpl* doc, uint mode, uint indent, Node *node )
else if ( TY_(nodeCMIsEmpty)(node) || else if ( TY_(nodeCMIsEmpty)(node) ||
(node->type == StartEndTag && !xhtml) ) (node->type == StartEndTag && !xhtml) )
{ {
/* Issue #8 - flush to new line?
maybe use if ( TY_(nodeHasCM)(node, CM_BLOCK) ) instead
or remove the CM_INLINE from the tag
*/
if ( ! TY_(nodeHasCM)(node, CM_INLINE) ) if ( ! TY_(nodeHasCM)(node, CM_INLINE) )
PCondFlushLine( doc, indent ); PCondFlushLine( doc, indent );

2
version.txt
View file

@ -1 +1 @@
4.9.13 4.9.14