Issue #20 - revert to 880221e fix this issue

Geoff McLane · Geoff McLane · commit 279c29bf8d7a · 2015-02-10T15:28:56.000+01:00
diff --git a/src/parser.c b/src/parser.c
@@ -3921,7 +3921,10 @@ void TY_(ParseBody)(TidyDocImpl* doc, Node *body, GetTokenMode mode)
 
         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 */
                 /* but HTML2 does allow img elements as children of body */

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