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

Issue #167 - further fixes for HTML5 mode

Browse source
This commit is contained in:
Geoff McLane 2015-03-06 19:13:06 +01:00
parent 389ce17814
commit c0cad3aeba
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/lexer.c
View file

@ -166,6 +166,8 @@ int TY_(HTMLVersion)(TidyDocImpl* doc)
if (xhtml && dtver == VERS_UNKNOWN) return XH50; if (xhtml && dtver == VERS_UNKNOWN) return XH50;
if (dtver == VERS_UNKNOWN) return HT50; if (dtver == VERS_UNKNOWN) return HT50;
/* Issue #167 - if NOT XHTML, and doctype is default VERS_HTML5, then return HT50 */
if (!xhtml && (dtver == VERS_HTML5)) return HT50;
for (i = 0; W3C_Doctypes[i].name; ++i) for (i = 0; W3C_Doctypes[i].name; ++i)
{ {
@ -1747,6 +1749,13 @@ Bool TY_(FixDocType)( TidyDocImpl* doc )
uint guessed = VERS_UNKNOWN; uint guessed = VERS_UNKNOWN;
Bool hadSI = no; Bool hadSI = no;
/* Issue #167 - found doctype, and doctype is default VERS_HTML5, set VERS_HTML5 and return yes */
if (doctype && (dtmode == TidyDoctypeAuto) &&
(lexer->doctype == VERS_HTML5) )
{
lexer->versionEmitted = lexer->doctype;
return yes;
}
if (dtmode == TidyDoctypeAuto && if (dtmode == TidyDoctypeAuto &&
lexer->versions & lexer->doctype && lexer->versions & lexer->doctype &&
!(VERS_XHTML & lexer->doctype && !lexer->isvoyager) !(VERS_XHTML & lexer->doctype && !lexer->isvoyager)