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

Issue #338 - Deal with two other spurious access warnings

Browse source
This commit is contained in:
Geoff McLane 2017-05-04 17:36:39 +02:00
parent 8b2f92f625
commit d142527a8e
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/access.c
View file

@ -2761,6 +2761,10 @@ static Bool CheckMetaData( TidyDocImpl* doc, Node* node, Bool HasMetaData )
TY_(ReportAccessError)( doc, node, REMOVE_AUTO_REDIRECT); TY_(ReportAccessError)( doc, node, REMOVE_AUTO_REDIRECT);
} }
} }
if (TY_(IsHTML5Mode)(doc) && attrIsCHARSET(av) && hasValue(av))
{
ContainsAttr = yes;
}
} }
if ( HasContent || HasHttpEquiv ) if ( HasContent || HasHttpEquiv )
@ -2840,9 +2844,17 @@ static void CheckDocType( TidyDocImpl* doc )
if (DTnode && DTnode->end != 0) if (DTnode && DTnode->end != 0)
{ {
ctmbstr word = textFromOneNode( doc, DTnode); ctmbstr word = textFromOneNode( doc, DTnode);
if ((strstr (word, "HTML PUBLIC") == NULL) && if (TY_(IsHTML5Mode)(doc))
(strstr (word, "html PUBLIC") == NULL)) {
DTnode = NULL; if ((strstr(word, "HTML") == NULL) &&
(strstr(word, "html") == NULL))
DTnode = NULL;
}
else {
if ((strstr(word, "HTML PUBLIC") == NULL) &&
(strstr(word, "html PUBLIC") == NULL))
DTnode = NULL;
}
} }
if (!DTnode) if (!DTnode)
TY_(ReportAccessError)( doc, &doc->root, DOCTYPE_MISSING); TY_(ReportAccessError)( doc, &doc->root, DOCTYPE_MISSING);