Merge branch 'master' of github.com:htacg/tidy-html5

This commit is contained in:
Geoff McLane 2016-02-18 13:58:23 +01:00
commit 8c13d270ed
3 changed files with 12 additions and 3 deletions

View file

@ -230,6 +230,7 @@ static const tidyLocaleMapItem localeMappings[] = {
* users always have a static value available for use. * users always have a static value available for use.
*/ */
static const tidyErrorFilterKeyItem tidyErrorFilterKeysStruct[] = { static const tidyErrorFilterKeyItem tidyErrorFilterKeysStruct[] = {
/* This blocks of codes comes from `tidyErrorCodes` enum. */
{ "CODES_TIDY_ERROR_FIRST", CODES_TIDY_ERROR_FIRST }, { "CODES_TIDY_ERROR_FIRST", CODES_TIDY_ERROR_FIRST },
{ "MISSING_SEMICOLON", MISSING_SEMICOLON }, { "MISSING_SEMICOLON", MISSING_SEMICOLON },
{ "MISSING_SEMICOLON_NCR", MISSING_SEMICOLON_NCR }, { "MISSING_SEMICOLON_NCR", MISSING_SEMICOLON_NCR },
@ -327,6 +328,7 @@ static const tidyErrorFilterKeyItem tidyErrorFilterKeysStruct[] = {
{ "INVALID_NCR", INVALID_NCR }, { "INVALID_NCR", INVALID_NCR },
{ "CODES_TIDY_ERROR_LAST", CODES_TIDY_ERROR_LAST }, { "CODES_TIDY_ERROR_LAST", CODES_TIDY_ERROR_LAST },
#if SUPPORT_ACCESSIBILITY_CHECKS #if SUPPORT_ACCESSIBILITY_CHECKS
/* This blocks of codes comes from `accessErrorCodes` enum. */
{ "FIRST_ACCESS_ERR", FIRST_ACCESS_ERR }, { "FIRST_ACCESS_ERR", FIRST_ACCESS_ERR },
{ "IMG_MISSING_ALT", IMG_MISSING_ALT }, { "IMG_MISSING_ALT", IMG_MISSING_ALT },
{ "IMG_ALT_SUSPICIOUS_FILENAME", IMG_ALT_SUSPICIOUS_FILENAME }, { "IMG_ALT_SUSPICIOUS_FILENAME", IMG_ALT_SUSPICIOUS_FILENAME },
@ -461,6 +463,13 @@ static const tidyErrorFilterKeyItem tidyErrorFilterKeysStruct[] = {
{ "SKIPOVER_ASCII_ART", SKIPOVER_ASCII_ART }, { "SKIPOVER_ASCII_ART", SKIPOVER_ASCII_ART },
{ "LAST_ACCESS_ERR", LAST_ACCESS_ERR }, { "LAST_ACCESS_ERR", LAST_ACCESS_ERR },
#endif #endif
/* This blocks of codes comes from `tidyMessagesMisc` enum. */
{ "STRING_UNKNOWN_OPTION", STRING_UNKNOWN_OPTION },
{ "STRING_MISSING_MALFORMED", STRING_MISSING_MALFORMED },
{ "STRING_DOCTYPE_GIVEN", STRING_DOCTYPE_GIVEN },
{ "STRING_HTML_PROPRIETARY", STRING_HTML_PROPRIETARY },
{ "STRING_CONTENT_LOOKS", STRING_CONTENT_LOOKS },
{ "STRING_NO_SYSID", STRING_NO_SYSID },
{ NULL, 0 }, { NULL, 0 },
}; };

View file

@ -1706,7 +1706,7 @@ static languageDefinition language_en = { whichPluralForm_en, {
"Can be used to modify behavior of the <code>clean</code> option when set " "Can be used to modify behavior of the <code>clean</code> option when set "
"to <var>yes</var>. " "to <var>yes</var>. "
"<br/>" "<br/>"
"If set to <var>yes</var> when <code>clean</code>, " "If set to <var>yes</var> when using <code>clean</code>, "
"<code>&amp;emdash;</code>, <code>&amp;rdquo;</code>, and other named " "<code>&amp;emdash;</code>, <code>&amp;rdquo;</code>, and other named "
"character entities are downgraded to their closest ASCII equivalents. " "character entities are downgraded to their closest ASCII equivalents. "
}, },

View file

@ -1,3 +1,3 @@
5.1.40 5.1.41
2016.02.17 2016.02.18