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

Merge in TidyAttr_XML_LANG change.

Browse source
This commit is contained in:
Michael[tm] Smith 2012-03-16 20:55:59 +09:00
parent 3a9a794d8b
commit 3ed33a1823
5 changed files with 247 additions and 222 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quickref.html
View file

@ -8,7 +8,7 @@
<body> <body>
<h1 id="top">Quick Reference</h1> <h1 id="top">Quick Reference</h1>
<h2>HTML Tidy Configuration Options</h2> <h2>HTML Tidy Configuration Options</h2>
<p>Version: <a href="https://github.com/w3c/tidy-html5/tree/bf1c2f6">https://github.com/w3c/tidy-html5/tree/bf1c2f6</a></p> <p>Version: <a href="https://github.com/w3c/tidy-html5/tree/5c4d2e5">https://github.com/w3c/tidy-html5/tree/5c4d2e5</a></p>
<p> <p>
<a class="h3" href="#MarkupHeader">HTML, XHTML, XML</a> <a class="h3" href="#MarkupHeader">HTML, XHTML, XML</a>
<br /> <br />

457
src/attrdict.c
View file

File diff suppressed because it is too large Load diff

6
src/attrs.c
View file

@ -260,7 +260,7 @@ static const Attribute attribute_defs [] =
{ TidyAttr_SDASUFF, "sdasuff", CH_PCDATA }, /* SDATA attribute in HTML 2.0 */ { TidyAttr_SDASUFF, "sdasuff", CH_PCDATA }, /* SDATA attribute in HTML 2.0 */
{ TidyAttr_URN, "urn", CH_PCDATA }, /* for <a>, never implemented */ { TidyAttr_URN, "urn", CH_PCDATA }, /* for <a>, never implemented */
/* "HTML5" */ /* HTML5 */
{ TidyAttr_ASYNC, "async", CH_PCDATA }, { TidyAttr_ASYNC, "async", CH_PCDATA },
{ TidyAttr_AUTOCOMPLETE, "autocomplete", CH_PCDATA }, { TidyAttr_AUTOCOMPLETE, "autocomplete", CH_PCDATA },
{ TidyAttr_AUTOFOCUS, "autofocus", CH_PCDATA }, { TidyAttr_AUTOFOCUS, "autofocus", CH_PCDATA },
@ -369,7 +369,7 @@ static uint AttributeVersions(Node* node, AttVal* attval)
{ {
uint i; uint i;
/* "HTML5" data-* attributes */ /* HTML5 data-* attributes */
if (attval && attval->attribute) if (attval && attval->attribute)
if (TY_(tmbstrncmp)(attval->attribute, "data-", 5) == 0) if (TY_(tmbstrncmp)(attval->attribute, "data-", 5) == 0)
return (XH50 | HT50); return (XH50 | HT50);
@ -1175,7 +1175,7 @@ const Attribute* TY_(CheckAttribute)( TidyDocImpl* doc, Node *node, AttVal *attv
if ( attribute != NULL ) if ( attribute != NULL )
{ {
if (AttributeVersions(node, attval) & VERS_XML) if (attrIsXML_LANG(attval) || attrIsXML_SPACE(attval))
{ {
doc->lexer->isvoyager = yes; doc->lexer->isvoyager = yes;
if (!cfgBool(doc, TidyHtmlOut)) if (!cfgBool(doc, TidyHtmlOut))

2
src/tags.c
View file

@ -279,7 +279,7 @@ static const Dict tag_defs[] =
{ TidyTag_SPACER, "spacer", VERS_NETSCAPE, NULL, (CM_INLINE|CM_EMPTY), TY_(ParseEmpty), NULL }, { TidyTag_SPACER, "spacer", VERS_NETSCAPE, NULL, (CM_INLINE|CM_EMPTY), TY_(ParseEmpty), NULL },
{ TidyTag_WBR, "wbr", VERS_PROPRIETARY, NULL, (CM_INLINE|CM_EMPTY), TY_(ParseEmpty), NULL }, { TidyTag_WBR, "wbr", VERS_PROPRIETARY, NULL, (CM_INLINE|CM_EMPTY), TY_(ParseEmpty), NULL },
/* "HTML5" */ /* HTML5 */
{ TidyTag_ARTICLE, "article", VERS_ELEM_ARTICLE, &TY_(W3CAttrsFor_ARTICLE)[0], (CM_BLOCK), TY_(ParseBlock), NULL }, { TidyTag_ARTICLE, "article", VERS_ELEM_ARTICLE, &TY_(W3CAttrsFor_ARTICLE)[0], (CM_BLOCK), TY_(ParseBlock), NULL },
{ TidyTag_ASIDE, "aside", VERS_ELEM_ASIDE, &TY_(W3CAttrsFor_ASIDE)[0], (CM_BLOCK), TY_(ParseBlock), NULL }, { TidyTag_ASIDE, "aside", VERS_ELEM_ASIDE, &TY_(W3CAttrsFor_ASIDE)[0], (CM_BLOCK), TY_(ParseBlock), NULL },
{ TidyTag_AUDIO, "audio", VERS_ELEM_AUDIO, &TY_(W3CAttrsFor_AUDIO)[0], (CM_BLOCK|CM_INLINE), TY_(ParseBlock), NULL }, { TidyTag_AUDIO, "audio", VERS_ELEM_AUDIO, &TY_(W3CAttrsFor_AUDIO)[0], (CM_BLOCK|CM_INLINE), TY_(ParseBlock), NULL },

2
src/version.h
View file

@ -1 +1 @@
static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/5c4d2e5"; static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/3a9a794";