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

Address merge conflicts.

Browse source
This commit is contained in:
Jim Derry 2017-08-31 13:15:28 -04:00
parent 1562c42c2e 2c82cfa23b
commit e5a05ae5a8
18 changed files with 376 additions and 800 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
include/tidyenum.h
View file

@ -193,7 +193,6 @@ extern "C" {
FN(UNEXPECTED_GT) \
FN(UNEXPECTED_QUOTEMARK) \
FN(WHITE_IN_URI) \
FN(XML_ATTRIBUTE_VALUE) \
FN(XML_ID_SYNTAX) \
/* ReportEncodingError */ \
FN(INVALID_NCR) \
@ -211,19 +210,13 @@ extern "C" {
FN(UNKNOWN_ENTITY) \
/* ReportError */ \
FN(BAD_CDATA_CONTENT) \
FN(BAD_COMMENT_CHARS) \
FN(BAD_XML_COMMENT) \
FN(CANT_BE_NESTED) \
FN(CONTENT_AFTER_BODY) \
FN(DISCARDING_UNEXPECTED) \
FN(DOCTYPE_AFTER_TAGS) \
FN(DTYPE_NOT_UPPER_CASE) \
FN(ELEMENT_VERS_MISMATCH_ERROR) \
FN(ELEMENT_VERS_MISMATCH_WARN) \
FN(ENCODING_IO_CONFLICT) \
FN(ILLEGAL_NESTING) \
FN(INCONSISTENT_NAMESPACE) \
FN(INCONSISTENT_VERSION) \
FN(INSERTING_TAG) \
FN(MALFORMED_COMMENT) \
FN(MALFORMED_DOCTYPE) \
@ -241,7 +234,6 @@ extern "C" {
FN(TAG_NOT_ALLOWED_IN) \
FN(TOO_MANY_ELEMENTS_IN) \
FN(TOO_MANY_ELEMENTS) \
FN(UNESCAPED_ELEMENT) \
FN(USING_BR_INPLACE_OF) \
/* ReportFatal */ \
FN(DUPLICATE_FRAMESET) \
@ -261,7 +253,6 @@ extern "C" {
FN(BAD_SURROGATE_TAIL) \
/* ReportWarning */ \
FN(BAD_SUMMARY_HTML5) \
FN(COERCE_TO_ENDTAG_WARN) \
FN(NESTED_EMPHASIS) \
FN(NESTED_QUOTATION) \
FN(OBSOLETE_ELEMENT) \
@ -274,22 +265,26 @@ extern "C" {
FN(FOUND_STYLE_IN_BODY) \
FN(MOVED_STYLE_TO_HEAD) \
FN(UNEXPECTED_END_OF_FILE) \
FN(UNEXPECTED_ENDTAG)
FN(UNEXPECTED_ENDTAG) \
FN(UNEXPECTED_ENDTAG_ERR)
/** These are report messages added by Tidy's accessibility module. */
/** These are report messages added by Tidy's accessibility module.
** Note that commented out items don't have checks for them at this time,
** and it was probably intended that some test would eventually be written.
*/
#define FOREACH_ACCESS_MSG(FN) \
/** [1.1.1.1] */ FN(IMG_MISSING_ALT) \
/** [1.1.1.2] */ FN(IMG_ALT_SUSPICIOUS_FILENAME) \
/** [1.1.1.3] */ FN(IMG_ALT_SUSPICIOUS_FILE_SIZE) \
/** [1.1.1.4] */ FN(IMG_ALT_SUSPICIOUS_PLACEHOLDER) \
/** [1.1.1.10] */ FN(IMG_ALT_SUSPICIOUS_TOO_LONG) \
/** [1.1.1.11] */ FN(IMG_MISSING_ALT_BULLET) \
/** [1.1.1.12] */ FN(IMG_MISSING_ALT_H_RULE) \
/** [1.1.1.11] */ /* FN(IMG_MISSING_ALT_BULLET) */ \
/** [1.1.1.12] */ /* FN(IMG_MISSING_ALT_H_RULE) */ \
/** [1.1.2.1] */ FN(IMG_MISSING_LONGDESC_DLINK) \
/** [1.1.2.2] */ FN(IMG_MISSING_DLINK) \
/** [1.1.2.3] */ FN(IMG_MISSING_LONGDESC) \
/** [1.1.2.5] */ FN(LONGDESC_NOT_REQUIRED) \
/** [1.1.2.5] */ /* FN(LONGDESC_NOT_REQUIRED) */ \
/** [1.1.3.1] */ FN(IMG_BUTTON_MISSING_ALT) \
/** [1.1.4.1] */ FN(APPLET_MISSING_ALT) \
/** [1.1.5.1] */ FN(OBJECT_MISSING_ALT) \
@ -325,7 +320,7 @@ extern "C" {
/** [3.6.1.1] */ FN(LIST_USAGE_INVALID_UL) \
/** [3.6.1.2] */ FN(LIST_USAGE_INVALID_OL) \
/** [3.6.1.4] */ FN(LIST_USAGE_INVALID_LI) \
/** [4.1.1.1] */ FN(INDICATE_CHANGES_IN_LANGUAGE) \
/** [4.1.1.1] */ /* FN(INDICATE_CHANGES_IN_LANGUAGE) */ \
/** [4.3.1.1] */ FN(LANGUAGE_NOT_IDENTIFIED) \
/** [4.3.1.1] */ FN(LANGUAGE_INVALID) \
/** [5.1.2.1] */ FN(DATA_TABLE_MISSING_HEADERS) \
@ -379,11 +374,11 @@ extern "C" {
/** [9.3.1.6] */ FN(SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE) \
/** [10.1.1.1] */ FN(NEW_WINDOWS_REQUIRE_WARNING_NEW) \
/** [10.1.1.2] */ FN(NEW_WINDOWS_REQUIRE_WARNING_BLANK) \
/** [10.2.1.1] */ FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT) \
/** [10.2.1.2] */ FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT) \
/** [10.4.1.1] */ FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT) \
/** [10.4.1.2] */ FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL) \
/** [10.4.1.3] */ FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES) \
/** [10.2.1.1] */ /* FN(LABEL_NEEDS_REPOSITIONING_BEFORE_INPUT) */ \
/** [10.2.1.2] */ /* FN(LABEL_NEEDS_REPOSITIONING_AFTER_INPUT) */ \
/** [10.4.1.1] */ /* FN(FORM_CONTROL_REQUIRES_DEFAULT_TEXT) */ \
/** [10.4.1.2] */ /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL) */ \
/** [10.4.1.3] */ /* FN(FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES) */ \
/** [11.2.1.1] */ FN(REPLACE_DEPRECATED_HTML_APPLET) \
/** [11.2.1.2] */ FN(REPLACE_DEPRECATED_HTML_BASEFONT) \
/** [11.2.1.3] */ FN(REPLACE_DEPRECATED_HTML_CENTER) \
@ -404,10 +399,10 @@ extern "C" {
/** [13.1.1.2] */ FN(LINK_TEXT_MISSING) \
/** [13.1.1.3] */ FN(LINK_TEXT_TOO_LONG) \
/** [13.1.1.4] */ FN(LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE) \
/** [13.1.1.5] */ FN(LINK_TEXT_NOT_MEANINGFUL_MORE) \
/** [13.1.1.6] */ FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS) \
/** [13.1.1.5] */ /* FN(LINK_TEXT_NOT_MEANINGFUL_MORE) */ \
/** [13.1.1.6] */ /* FN(LINK_TEXT_NOT_MEANINGFUL_FOLLOW_THIS) */ \
/** [13.2.1.1] */ FN(METADATA_MISSING) \
/** [13.2.1.2] */ FN(METADATA_MISSING_LINK) \
/** [13.2.1.2] */ /* FN(METADATA_MISSING_LINK) */ \
/** [13.2.1.3] */ FN(METADATA_MISSING_REDIRECT_AUTOREFRESH) \
/** [13.10.1.1] */ FN(SKIPOVER_ASCII_ART)

62
localize/translations/language_en_gb.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"PO-Revision-Date: 2017-08-28 10:04:30\n"
"PO-Revision-Date: 2017-08-31 12:54:04\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2265,11 +2265,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr ""
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr ""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2332,14 +2327,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr ""
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr ""
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr ""
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2358,10 +2345,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr ""
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr ""
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2372,23 +2355,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr ""
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr ""
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr ""
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr ""
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr ""
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2469,11 +2440,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr ""
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr ""
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2539,11 +2505,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr ""
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr ""
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2587,6 +2548,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr ""
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr ""
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -2767,10 +2733,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr ""
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr ""
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr ""
@ -2983,18 +2945,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr ""
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr ""
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr ""

62
localize/translations/language_es.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"PO-Revision-Date: 2017-08-28 10:04:30\n"
"PO-Revision-Date: 2017-08-31 12:54:04\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2209,11 +2209,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr ""
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr ""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2276,14 +2271,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr ""
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr ""
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr ""
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2302,10 +2289,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr ""
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr ""
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2316,23 +2299,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr ""
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr ""
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr ""
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr ""
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr ""
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2413,11 +2384,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr ""
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr ""
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2483,11 +2449,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr ""
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr ""
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2531,6 +2492,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr ""
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr ""
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -2711,10 +2677,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr ""
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr ""
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr ""
@ -2927,18 +2889,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr ""
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr ""
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr ""

62
localize/translations/language_es_mx.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"PO-Revision-Date: 2017-08-28 10:04:30\n"
"PO-Revision-Date: 2017-08-31 12:54:04\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2204,11 +2204,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr ""
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr ""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2271,14 +2266,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr ""
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr ""
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr ""
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2297,10 +2284,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr ""
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr ""
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2311,23 +2294,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr ""
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr ""
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr ""
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr ""
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr ""
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2408,11 +2379,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr ""
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr ""
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2478,11 +2444,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr ""
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr ""
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2526,6 +2487,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr ""
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr ""
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -2706,10 +2672,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr ""
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr ""
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr ""
@ -2922,18 +2884,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr ""
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr ""
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr ""

62
localize/translations/language_fr.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"PO-Revision-Date: 2017-08-28 10:04:31\n"
"PO-Revision-Date: 2017-08-31 12:54:04\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2645,11 +2645,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr "%s rejet des espaces dans la référence URI"
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr "%s a un attribut XML \"%s\""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2712,14 +2707,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr "'<' + '/' + lettres non permises ici"
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr "attendu -- ou >"
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr "les commentaires XML ne peuvent pas contenir --"
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2738,10 +2725,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr "<!DOCTYPE> n'est pas autorisée après les éléments"
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr "SYSTEM, PUBLIC, W3C, DTD, EN doivent être en majuscules"
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2752,23 +2735,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr "%s élément non disponible dans %s"
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr "Encodage de sortie non fonctionnel avec la sortie standard"
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr "%s ne doit pas être imbriqué"
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr "l'espace de nom HTML ne correspond pas au contenu"
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr "La déclaration DOCTYPE HTML ne correspond pas au contenu"
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2849,11 +2820,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr "trop d'éléments %s"
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr "%s non échappé dans le contenu pre"
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2923,11 +2889,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr "L'attribut summary sur l'élément %s est obsolète avec HTML5"
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr "<%s> est probablement destiné à </%s>"
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2971,6 +2932,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr "</%s> inattendu"
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr "</%s> inattendu"
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -3153,10 +3119,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr "[3.6.1.4]: usage non valide de liste <li>."
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr "[4.1.1.1]: indique des changements dans le langage."
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr "[4.3.1.1]: langage non identifié."
@ -3369,18 +3331,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr "[10.1.1.2]: les nouvelles fenêtres nécessitent un avertissement (_blank)."
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr "[10.4.1.1]: les contrôles de formulaires nécessitent un texte par défaut."
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr "[10.4.1.2]: texte par défaut du contrôle de formulaire non valide (null)."
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr "[10.4.1.3]: texte par défaut du contrôle de formulaire non valide (espaces)."
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr "[11.2.1.1]: remplacer l'élément HTML déprécié <applet>."

62
localize/translations/language_zh_cn.po
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"PO-Revision-Date: 2017-08-28 10:04:31\n"
"PO-Revision-Date: 2017-08-31 12:54:05\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2198,11 +2198,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr ""
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr ""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2265,14 +2260,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr ""
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr ""
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr ""
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2291,10 +2278,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr ""
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr ""
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2305,23 +2288,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr ""
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr ""
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr ""
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr ""
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr ""
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2402,11 +2373,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr ""
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr ""
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2472,11 +2438,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr ""
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr ""
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2520,6 +2481,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr ""
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr ""
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -2700,10 +2666,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr ""
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr ""
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr ""
@ -2916,18 +2878,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr ""
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr ""
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr ""

62
localize/translations/tidy.pot
View file

@ -5,7 +5,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: HTML Tidy poconvert.rb\n"
"Project-Id-Version: \n"
"POT-Creation-Date: 2017-08-28 10:04:30\n"
"POT-Creation-Date: 2017-08-31 12:54:04\n"
"Last-Translator: jderry\n"
"Language-Team: \n"
@ -2200,11 +2200,6 @@ msgctxt "WHITE_IN_URI"
msgid "%s discarding whitespace in URI reference"
msgstr ""
#, c-format
msgctxt "XML_ATTRIBUTE_VALUE"
msgid "%s has XML attribute \"%s\""
msgstr ""
#, c-format
msgctxt "XML_ID_SYNTAX"
msgid "%s ID \"%s\" uses XML ID syntax"
@ -2267,14 +2262,6 @@ msgctxt "BAD_CDATA_CONTENT"
msgid "'<' + '/' + letter not allowed here"
msgstr ""
msgctxt "BAD_COMMENT_CHARS"
msgid "expecting -- or >"
msgstr ""
msgctxt "BAD_XML_COMMENT"
msgid "XML comments can't contain --"
msgstr ""
#, c-format
msgctxt "CANT_BE_NESTED"
msgid "%s can't be nested"
@ -2293,10 +2280,6 @@ msgctxt "DOCTYPE_AFTER_TAGS"
msgid "<!DOCTYPE> isn't allowed after elements"
msgstr ""
msgctxt "DTYPE_NOT_UPPER_CASE"
msgid "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case"
msgstr ""
#, c-format
msgctxt "ELEMENT_VERS_MISMATCH_ERROR"
msgid "%s element not available in %s"
@ -2307,23 +2290,11 @@ msgctxt "ELEMENT_VERS_MISMATCH_WARN"
msgid "%s element not available in %s"
msgstr ""
msgctxt "ENCODING_IO_CONFLICT"
msgid "Output encoding does not work with standard output"
msgstr ""
#, c-format
msgctxt "ILLEGAL_NESTING"
msgid "%s shouldn't be nested"
msgstr ""
msgctxt "INCONSISTENT_NAMESPACE"
msgid "HTML namespace doesn't match content"
msgstr ""
msgctxt "INCONSISTENT_VERSION"
msgid "HTML DOCTYPE doesn't match content"
msgstr ""
#, c-format
msgctxt "INSERTING_TAG"
msgid "inserting implicit <%s>"
@ -2404,11 +2375,6 @@ msgctxt "TOO_MANY_ELEMENTS"
msgid "too many %s elements"
msgstr ""
#, c-format
msgctxt "UNESCAPED_ELEMENT"
msgid "unescaped %s in pre content"
msgstr ""
#, c-format
msgctxt "USING_BR_INPLACE_OF"
msgid "using <br> in place of %s"
@ -2474,11 +2440,6 @@ msgctxt "BAD_SUMMARY_HTML5"
msgid "The summary attribute on the %s element is obsolete in HTML5"
msgstr ""
#, c-format
msgctxt "COERCE_TO_ENDTAG_WARN"
msgid "<%s> is probably intended as </%s>"
msgstr ""
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@ -2522,6 +2483,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected </%s>"
msgstr ""
#, c-format
msgctxt "UNEXPECTED_ENDTAG_ERR"
msgid "unexpected </%s>"
msgstr ""
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
msgstr ""
@ -2702,10 +2668,6 @@ msgctxt "LIST_USAGE_INVALID_LI"
msgid "[3.6.1.4]: list usage invalid <li>."
msgstr ""
msgctxt "INDICATE_CHANGES_IN_LANGUAGE"
msgid "[4.1.1.1]: indicate changes in language."
msgstr ""
msgctxt "LANGUAGE_NOT_IDENTIFIED"
msgid "[4.3.1.1]: language not identified."
msgstr ""
@ -2918,18 +2880,6 @@ msgctxt "NEW_WINDOWS_REQUIRE_WARNING_BLANK"
msgid "[10.1.1.2]: new windows require warning (_blank)."
msgstr ""
msgctxt "FORM_CONTROL_REQUIRES_DEFAULT_TEXT"
msgid "[10.4.1.1]: form control requires default text."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL"
msgid "[10.4.1.2]: form control default text invalid (null)."
msgstr ""
msgctxt "FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES"
msgid "[10.4.1.3]: form control default text invalid (spaces)."
msgstr ""
msgctxt "REPLACE_DEPRECATED_HTML_APPLET"
msgid "[11.2.1.1]: replace deprecated html <applet>."
msgstr ""

15
src/access.c
View file

@ -3312,21 +3312,6 @@ void TY_(AccessibilityChecks)( TidyDocImpl* doc )
/* Check to see if any list elements are found within the document */
CheckForListElements( doc, &doc->root );
/* Checks for natural language change */
/* Must contain more than 3 words of text in the document
**
** CPR - Not sure what intent is here, but this
** routine has nothing to do with changes in language.
** It seems like a bad idea to emit this message for
** every document with _more_ than 3 words!
if ( WordCount(doc, &doc->root) > 3 )
{
TY_(ReportAccessWarning)( doc, node, INDICATE_CHANGES_IN_LANGUAGE);
}
*/
/* Recursively apply all remaining checks to
** each node in document.
*/

20
src/clean.c
View file

@ -1986,7 +1986,7 @@ void TY_(CleanWord2000)( TidyDocImpl* doc, Node *node)
* meaning this result would not ordinarily be displayed.
*/
Node* next;
TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT);
TY_(ReportNotice)(doc, NULL, node, PROPRIETARY_ELEMENT);
DiscardContainer( doc, node, &next );
node = next;
continue;
@ -2358,7 +2358,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
if (charsetFound || !charsetAttr->value)
{
prevNode = currentNode->prev;
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
continue;
@ -2395,7 +2395,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
if (!httpEquivAttr->value)
{
prevNode = currentNode->prev;
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
continue;
@ -2412,7 +2412,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
#if 0 /* 0000000000000000000000000000000000000000000000000 */
prevNode = currentNode->prev;
/* maybe need better message here */
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
#endif /* 000000000000000000000000000000000000000000000000 */
@ -2423,13 +2423,13 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
in void TY_(VerifyHTTPEquiv)(TidyDocImpl* doc, Node *head)
lcontent = TY_(tmbstrtolower)(contentAttr->value);
*/
if (TY_(tmbstrcasecmp)(contentAttr->value, charsetString.bp) == 0)
if (TY_(tmbstrcasecmp)(contentAttr->value, (ctmbstr)charsetString.bp) == 0)
{
/* we already found one, so remove the rest. */
if (charsetFound)
{
prevNode = currentNode->prev;
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
continue;
@ -2442,7 +2442,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
if (charsetFound)
{
prevNode = currentNode->prev;
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
}
@ -2469,7 +2469,7 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
{
/* printf("WARN ABOUT HTTP EQUIV AND CHARSET ATTR! \n"); */
prevNode = currentNode->prev;
TY_(ReportError)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(ReportNotice)(doc, head, currentNode, DISCARDING_UNEXPECTED);
TY_(DiscardElement)(doc, currentNode);
currentNode = prevNode;
}
@ -2489,14 +2489,14 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
default:
tidyBufInit(&buf);
tidyBufAppend(&buf, "text/html; ", 11);
tidyBufAppend(&buf, charsetString.bp, TY_(tmbstrlen)(charsetString.bp));
tidyBufAppend(&buf, charsetString.bp, TY_(tmbstrlen)((ctmbstr)charsetString.bp));
tidyBufAppend(&buf, "\0", 1); /* zero terminate the buffer */
TY_(AddAttribute)(doc, metaTag, "http-equiv", "Content-Type"); /* add 'http-equiv' const. */
TY_(AddAttribute)(doc, metaTag, "content", (char*)buf.bp); /* add 'content="<enc>"' */
tidyBufFree(&buf);
}
TY_(InsertNodeAtStart)(head, metaTag);
TY_(ReportError)(doc, metaTag, head, ADDED_MISSING_CHARSET); /* actually just 'Info:' */
TY_(ReportNotice)(doc, metaTag, head, ADDED_MISSING_CHARSET); /* actually just 'Info:' */
}
tidyBufFree(&charsetString);
return yes;

18
src/language_en.h
View file

@ -1851,7 +1851,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ UNEXPECTED_GT, 0, "%s missing '>' for end of tag" }, /* ReportAttrError */
{ UNEXPECTED_QUOTEMARK, 0, "%s unexpected or duplicate quote mark" }, /* ReportAttrError */
{ WHITE_IN_URI, 0, "%s discarding whitespace in URI reference" }, /* ReportAttrError */
{ XML_ATTRIBUTE_VALUE, 0, "%s has XML attribute \"%s\"" }, /* ReportAttrError */
{ XML_ID_SYNTAX, 0, "%s ID \"%s\" uses XML ID syntax" }, /* ReportAttrError */
{ INVALID_NCR, 0, "%s invalid numeric character reference %s" }, /* ReportEncodingError */
@ -1869,19 +1868,13 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ UNKNOWN_ENTITY, 0, "unescaped & or unknown entity \"%s\"" }, /* ReportEntityError */
{ BAD_CDATA_CONTENT, 0, "'<' + '/' + letter not allowed here" }, /* ReportError */
{ BAD_COMMENT_CHARS, 0, "expecting -- or >" }, /* ReportError */
{ BAD_XML_COMMENT, 0, "XML comments can't contain --" }, /* ReportError */
{ CANT_BE_NESTED, 0, "%s can't be nested" }, /* ReportError */
{ CONTENT_AFTER_BODY, 0, "content occurs after end of body" }, /* ReportError */
{ DISCARDING_UNEXPECTED, 0, "discarding unexpected %s" }, /* ReportError */
{ DOCTYPE_AFTER_TAGS, 0, "<!DOCTYPE> isn't allowed after elements" }, /* ReportError */
{ DTYPE_NOT_UPPER_CASE, 0, "SYSTEM, PUBLIC, W3C, DTD, EN must be upper case" }, /* ReportError */
{ ELEMENT_VERS_MISMATCH_ERROR, 0, "%s element not available in %s" }, /* ReportError */
{ ELEMENT_VERS_MISMATCH_WARN, 0, "%s element not available in %s" }, /* ReportError */
{ ENCODING_IO_CONFLICT, 0, "Output encoding does not work with standard output" }, /* ReportError */
{ ILLEGAL_NESTING, 0, "%s shouldn't be nested" }, /* ReportError */
{ INCONSISTENT_NAMESPACE, 0, "HTML namespace doesn't match content" }, /* ReportError */
{ INCONSISTENT_VERSION, 0, "HTML DOCTYPE doesn't match content" }, /* ReportError */
{ INSERTING_TAG, 0, "inserting implicit <%s>" }, /* ReportError */
{ MALFORMED_COMMENT, 0, "adjacent hyphens within comment" }, /* ReportError */
{ MALFORMED_DOCTYPE, 0, "discarding malformed <!DOCTYPE>" }, /* ReportError */
@ -1899,7 +1892,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ TAG_NOT_ALLOWED_IN, 0, "%s isn't allowed in <%s> elements" }, /* ReportError */
{ TOO_MANY_ELEMENTS_IN, 0, "too many %s elements in <%s>" }, /* ReportError */
{ TOO_MANY_ELEMENTS, 0, "too many %s elements" }, /* ReportError */
{ UNESCAPED_ELEMENT, 0, "unescaped %s in pre content" }, /* ReportError */
{ USING_BR_INPLACE_OF, 0, "using <br> in place of %s" }, /* ReportError */
{ DUPLICATE_FRAMESET, 0, "repeated FRAMESET element" }, /* ReportFatal */
@ -1919,17 +1911,17 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ BAD_SURROGATE_TAIL, 0, "Leading (High) surrogate pair U+%04X, with no trailing (Low) entity, replaced with U+FFFD." }, /* ReportSurrogateError */
{ BAD_SUMMARY_HTML5, 0, "The summary attribute on the %s element is obsolete in HTML5" }, /* ReportWarning */
{ COERCE_TO_ENDTAG_WARN, 0, "<%s> is probably intended as </%s>" }, /* ReportWarning */
{ NESTED_EMPHASIS, 0, "nested emphasis %s" }, /* ReportWarning */
{ NESTED_QUOTATION, 0, "nested q elements, possible typo." }, /* ReportWarning */
{ OBSOLETE_ELEMENT, 0, "replacing obsolete element %s with %s" }, /* ReportWarning */
{ REMOVED_HTML5, 0, "%s element removed from HTML5" }, /* ReportWarning */
{ XML_DECLARATION_DETECTED, 0, "An XML declaration was detected. Did you mean to use input-xml?" }, /* ReportWarning */
{ COERCE_TO_ENDTAG, 0, "<%s> is probably intended as </%s>" }, /* ReportError, ReportWarning */
{ COERCE_TO_ENDTAG, 0, "<%s> is probably intended as </%s>" }, /* ReportWarning */
{ ELEMENT_NOT_EMPTY, 0, "%s element not empty or not closed" }, /* ReportError, ReportAttrError */
{ UNEXPECTED_END_OF_FILE, 0, "unexpected end of file %s" }, /* ReportError, ReportAttrError */
{ UNEXPECTED_ENDTAG, 0, "unexpected </%s>" }, /* ReportError, ReportFatal */
{ UNEXPECTED_ENDTAG, 0, "unexpected </%s>" }, /* ReportWarning */
{ UNEXPECTED_ENDTAG_ERR, 0, "unexpected </%s>" }, /* ReportError */
{ MOVED_STYLE_TO_HEAD, 0, "moved <style> tag to <head>! fix-style-tags: no to avoid." }, /* ReportWarning */
{ FOUND_STYLE_IN_BODY, 0, "found <style> tag in <body>! fix-style-tags: yes to move." }, /* ReportWarning */
@ -1983,7 +1975,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ LIST_USAGE_INVALID_UL, 0, "[3.6.1.1]: list usage invalid <ul>." },
{ LIST_USAGE_INVALID_OL, 0, "[3.6.1.2]: list usage invalid <ol>." },
{ LIST_USAGE_INVALID_LI, 0, "[3.6.1.4]: list usage invalid <li>." },
{ INDICATE_CHANGES_IN_LANGUAGE, 0, "[4.1.1.1]: indicate changes in language." },
{ LANGUAGE_NOT_IDENTIFIED, 0, "[4.3.1.1]: language not identified." },
{ LANGUAGE_INVALID, 0, "[4.3.1.2]: language attribute invalid." },
{ DATA_TABLE_MISSING_HEADERS, 0, "[5.1.2.1]: data <table> missing row/column headers (all)." },
@ -2037,9 +2028,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
{ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE, 0, "[9.3.1.6]: <script> not keyboard accessible (onMouseMove)." },
{ NEW_WINDOWS_REQUIRE_WARNING_NEW, 0, "[10.1.1.1]: new windows require warning (_new)." },
{ NEW_WINDOWS_REQUIRE_WARNING_BLANK, 0, "[10.1.1.2]: new windows require warning (_blank)." },
{ FORM_CONTROL_REQUIRES_DEFAULT_TEXT, 0, "[10.4.1.1]: form control requires default text." },
{ FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL, 0, "[10.4.1.2]: form control default text invalid (null)." },
{ FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES, 0, "[10.4.1.3]: form control default text invalid (spaces)." },
{ REPLACE_DEPRECATED_HTML_APPLET, 0, "[11.2.1.1]: replace deprecated html <applet>." },
{ REPLACE_DEPRECATED_HTML_BASEFONT, 0, "[11.2.1.2]: replace deprecated html <basefont>." },
{ REPLACE_DEPRECATED_HTML_CENTER, 0, "[11.2.1.3]: replace deprecated html <center>." },

14
src/language_fr.h
View file

@ -809,7 +809,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ UNEXPECTED_GT, 0, "%s symbole '>' manquant pour la fin de balise" },
{ UNEXPECTED_QUOTEMARK, 0, "%s guillemet double inattendu ou dupliqué" },
{ WHITE_IN_URI, 0, "%s rejet des espaces dans la référence URI" },
{ XML_ATTRIBUTE_VALUE, 0, "%s a un attribut XML \"%s\"" },
{ XML_ID_SYNTAX, 0, "%s ID « %s » utilise la syntaxe XML ID" },
{ INVALID_NCR, 0, "%s référence de caractère numérique non valide %s" },
{ INVALID_SGML_CHARS, 0, "%s code de caractère non valide %s" },
@ -823,19 +822,13 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ UNESCAPED_AMPERSAND, 0, "symbole & non échappé qui devrait être écrit &amp;" },
{ UNKNOWN_ENTITY, 0, "symbole & non échappé ou entité inconnue « %s »" },
{ BAD_CDATA_CONTENT, 0, "'<' + '/' + lettres non permises ici" },
{ BAD_COMMENT_CHARS, 0, "attendu -- ou >" },
{ BAD_XML_COMMENT, 0, "les commentaires XML ne peuvent pas contenir --" },
{ CANT_BE_NESTED, 0, "%s ne peut pas être imbriqué" },
{ CONTENT_AFTER_BODY, 0, "contenu trouvé après la fin de body" },
{ DISCARDING_UNEXPECTED, 0, "inhibition de valeur inattendue %s" },
{ DOCTYPE_AFTER_TAGS, 0, "<!DOCTYPE> n'est pas autorisée après les éléments" },
{ DTYPE_NOT_UPPER_CASE, 0, "SYSTEM, PUBLIC, W3C, DTD, EN doivent être en majuscules" },
{ ELEMENT_VERS_MISMATCH_ERROR, 0, "%s élément non disponible dans %s" },
{ ELEMENT_VERS_MISMATCH_WARN, 0, "%s élément non disponible dans %s" },
{ ENCODING_IO_CONFLICT, 0, "Encodage de sortie non fonctionnel avec la sortie standard" },
{ ILLEGAL_NESTING, 0, "%s ne doit pas être imbriqué" },
{ INCONSISTENT_NAMESPACE, 0, "l'espace de nom HTML ne correspond pas au contenu" },
{ INCONSISTENT_VERSION, 0, "La déclaration DOCTYPE HTML ne correspond pas au contenu" },
{ INSERTING_TAG, 0, "insertion implicite de <%s>" },
{ MALFORMED_COMMENT, 0, "tirets adjacents dans un commentaire" },
{ MALFORMED_DOCTYPE, 0, "inhibition de la <!DOCTYPE> mal formée" },
@ -853,7 +846,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ TAG_NOT_ALLOWED_IN, 0, "%s n'est pas permis dans les éléments <%s>" },
{ TOO_MANY_ELEMENTS_IN, 0, "trop d'éléments %s dans <%s>" },
{ TOO_MANY_ELEMENTS, 0, "trop d'éléments %s" },
{ UNESCAPED_ELEMENT, 0, "%s non échappé dans le contenu pre" },
{ USING_BR_INPLACE_OF, 0, "utilisation de <br> à la place de %s" },
{ DUPLICATE_FRAMESET, 0, "élément répété FRAMESET" },
{ SUSPECTED_MISSING_QUOTE, 0, "absence de guillemet pour la valeur d'attribut" },
@ -874,7 +866,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
"+FFFD."
},
{ BAD_SUMMARY_HTML5, 0, "L'attribut summary sur l'élément %s est obsolète avec HTML5" },
{ COERCE_TO_ENDTAG_WARN, 0, "<%s> est probablement destiné à </%s>" },
{ NESTED_EMPHASIS, 0, "accentuation imbriquée %s" },
{ NESTED_QUOTATION, 0, "éléments \"q\" imbriqués, erreur typographique possible" },
{ OBSOLETE_ELEMENT, 0, "remplacement de l'élément obsolète %s par %s" },
@ -884,6 +875,7 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ ELEMENT_NOT_EMPTY, 0, "%s élément non vide ou non fermé" },
{ UNEXPECTED_END_OF_FILE, 0, "fin de fichier inattendue %s" },
{ UNEXPECTED_ENDTAG, 0, "</%s> inattendu" },
{ UNEXPECTED_ENDTAG_ERR, 0, "</%s> inattendu" },
#if SUPPORT_ACCESSIBILITY_CHECKS
{ IMG_MISSING_ALT, 0, "[1.1.1.1]: <img> texte manquant 'alt'." },
@ -932,7 +924,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ LIST_USAGE_INVALID_UL, 0, "[3.6.1.1]: Usage non valide de liste <ul>." },
{ LIST_USAGE_INVALID_OL, 0, "[3.6.1.2]: usage non valide de liste <ol>." },
{ LIST_USAGE_INVALID_LI, 0, "[3.6.1.4]: usage non valide de liste <li>." },
{ INDICATE_CHANGES_IN_LANGUAGE, 0, "[4.1.1.1]: indique des changements dans le langage." },
{ LANGUAGE_NOT_IDENTIFIED, 0, "[4.3.1.1]: langage non identifié." },
{ LANGUAGE_INVALID, 0, "[4.3.1.2]: attribut de langage non valide." },
{ DATA_TABLE_MISSING_HEADERS, 0, "[5.1.2.1]: data <table> absence d'entêtes rangée/colonne (tous)." },
@ -986,9 +977,6 @@ static languageDefinition language_fr = { whichPluralForm_fr, {
{ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE, 0, "[9.3.1.6]: <script> non accessible par le clavier (onMouseMove)." },
{ NEW_WINDOWS_REQUIRE_WARNING_NEW, 0, "[10.1.1.1]: les nouvelles fenêtres nécessitent un avertissement (_new)." },
{ NEW_WINDOWS_REQUIRE_WARNING_BLANK, 0, "[10.1.1.2]: les nouvelles fenêtres nécessitent un avertissement (_blank)." },
{ FORM_CONTROL_REQUIRES_DEFAULT_TEXT, 0, "[10.4.1.1]: les contrôles de formulaires nécessitent un texte par défaut." },
{ FORM_CONTROL_DEFAULT_TEXT_INVALID_NULL, 0, "[10.4.1.2]: texte par défaut du contrôle de formulaire non valide (null)." },
{ FORM_CONTROL_DEFAULT_TEXT_INVALID_SPACES, 0, "[10.4.1.3]: texte par défaut du contrôle de formulaire non valide (espaces)." },
{ REPLACE_DEPRECATED_HTML_APPLET, 0, "[11.2.1.1]: remplacer l'élément HTML déprécié <applet>." },
{ REPLACE_DEPRECATED_HTML_BASEFONT, 0, "[11.2.1.2]: remplacer l'élément HTML déprécié <basefont>." },
{ REPLACE_DEPRECATED_HTML_CENTER, 0, "[11.2.1.3]: remplacer l'élément HTML déprécié <center>." },

22
src/lexer.c
View file

@ -2454,7 +2454,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
if ((TY_(IsJavaScript)(container)) && cfgBool(doc, TidyEscapeScripts))
{
/* Issue #281 - only warn if adding the escape! */
TY_(ReportError)(doc, NULL, NULL, BAD_CDATA_CONTENT);
TY_(ReportNotice)(doc, NULL, NULL, BAD_CDATA_CONTENT);
for (i = lexer->lexsize; i > start-1; --i)
lexer->lexbuf[i] = lexer->lexbuf[i-1];
@ -2472,7 +2472,7 @@ static Node *GetCDATA( TidyDocImpl* doc, Node *container )
lexer->txtend = lexer->lexsize;
if (c == EndOfStream)
TY_(ReportError)(doc, container, NULL, MISSING_ENDTAG_FOR );
TY_(ReportNotice)(doc, container, NULL, MISSING_ENDTAG_FOR );
/* this was disabled for some reason... */
#if 0
@ -2764,7 +2764,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
continue;
}
TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
}
else if (c == 'd' || c == 'D')
{
@ -3013,9 +3013,9 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
for older HTML, because it's not truly supported
by the standard, although Tidy will allow it. */
if ( (doc->lexer->doctype & VERS_HTML5) > 0 && TY_(elementIsAutonomousCustomFormat)( lexer->token->element ) )
TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
TY_(ReportNotice)( doc, NULL, lexer->token, UNKNOWN_ELEMENT_LOOKS_CUSTOM );
else
TY_(ReportFatal)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
TY_(ReportNotice)( doc, NULL, lexer->token, UNKNOWN_ELEMENT );
}
}
else if ( !cfgBool(doc, TidyXmlTags) )
@ -3048,7 +3048,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
if (c == '>')
{
if (badcomment)
TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
/* do not store closing -- in lexbuf */
lexer->lexsize -= 2;
@ -3163,7 +3163,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
if (c == EndOfStream)
{
TY_(ReportError)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
TY_(ReportNotice)(doc, NULL, NULL, UNEXPECTED_END_OF_FILE );
TY_(UngetChar)(c, doc->docIn);
continue;
}
@ -3474,7 +3474,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
else if (lexer->state == LEX_COMMENT) /* comment */
{
if (c == EndOfStream)
TY_(ReportError)(doc, NULL, NULL, MALFORMED_COMMENT );
TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_COMMENT );
lexer->txtend = lexer->lexsize;
lexer->lexbuf[lexer->lexsize] = '\0';
@ -4111,7 +4111,7 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
!(TY_(IsUrl)(doc, name) && TY_(tmbstrncmp)(lexer->lexbuf+start, "javascript:", 11) == 0) &&
!(TY_(tmbstrncmp)(lexer->lexbuf+start, "<xml ", 5) == 0)
)
TY_(ReportFatal)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE );
TY_(ReportNotice)( doc, NULL, NULL, SUSPECTED_MISSING_QUOTE );
}
len = lexer->lexsize - start;
@ -4383,7 +4383,7 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
if (!node->element || !IsValidXMLElemName(node->element))
{
TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_DOCTYPE);
TY_(FreeNode)(doc, node);
return NULL;
}
@ -4469,7 +4469,7 @@ static Node *ParseDocTypeDecl(TidyDocImpl* doc)
}
/* document type declaration not finished */
TY_(ReportError)(doc, NULL, NULL, MALFORMED_DOCTYPE);
TY_(ReportNotice)(doc, NULL, NULL, MALFORMED_DOCTYPE);
TY_(FreeNode)(doc, node);
return NULL;
}

275
src/message.c
View file

@ -167,6 +167,12 @@ static void messageOut( TidyMessageImpl *message )
go = go & (cfgBool(doc, TidyShowInfo) == yes);
}
/* If suppressing TidyWarning on Reports, suppress them. */
if ( message->level == TidyWarning )
{
go = go & (cfgBool(doc, TidyShowWarnings) == yes);
}
/* If we're TidyQuiet and handling TidyDialogue, then suppress. */
if ( cfgBool(doc, TidyQuiet) )
{
@ -209,18 +215,50 @@ static void messageOut( TidyMessageImpl *message )
void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
{
TidyMessageImpl *message = NULL;
TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */
Node* rpt = ( element ? element : node );
char nodedesc[256] = { 0 };
char elemdesc[256] = { 0 };
uint versionEmitted, declared, version;
ctmbstr extra_string = NULL;
ctmbstr tagtype;
TagToString(node, nodedesc, sizeof(nodedesc));
switch (code)
{
case INSERTING_TAG:
case MISSING_STARTTAG:
case TOO_MANY_ELEMENTS:
case UNEXPECTED_ENDTAG:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element );
break;
case CANT_BE_NESTED:
case NOFRAMES_CONTENT:
case PROPRIETARY_ELEMENT:
case USING_BR_INPLACE_OF:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
break;
case ELEMENT_NOT_EMPTY:
case FOUND_STYLE_IN_BODY:
case ILLEGAL_NESTING:
case MOVED_STYLE_TO_HEAD:
case TRIM_EMPTY_ELEMENT:
TagToString(element, elemdesc, sizeof(nodedesc));
message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
case UNEXPECTED_END_OF_FILE:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc);
break;
case BAD_CDATA_CONTENT:
case CONTENT_AFTER_BODY:
case DOCTYPE_AFTER_TAGS:
case MALFORMED_COMMENT:
case MALFORMED_DOCTYPE:
case MISSING_TITLE_ELEMENT:
case NESTED_QUOTATION:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
break;
case REPLACING_ELEMENT:
@ -228,9 +266,50 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
break;
case OBSOLETE_ELEMENT:
case REPLACING_UNEX_ELEMENT:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
break;
case MISSING_ENDTAG_FOR:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element );
break;
case MISSING_ENDTAG_BEFORE:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element, nodedesc );
break;
case BAD_SUMMARY_HTML5:
case NESTED_EMPHASIS:
case REMOVED_HTML5:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, nodedesc );
break;
case COERCE_TO_ENDTAG:
case NON_MATCHING_ENDTAG:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
break;
case MISSING_DOCTYPE:
case SPACE_PRECEDING_XMLDECL:
case XML_DECLARATION_DETECTED:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
break;
case ELEMENT_VERS_MISMATCH_WARN:
versionEmitted = doc->lexer->versionEmitted;
declared = doc->lexer->doctype;
version = versionEmitted == 0 ? declared : versionEmitted;
extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
if (!extra_string)
extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
break;
case CUSTOM_TAG_DETECTED:
TagToString(element, elemdesc, sizeof(elemdesc));
switch ( cfg( doc, TidyUseCustomTags ) )
{
case TidyCustomBlocklevel:
@ -249,92 +328,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
}
message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype );
break;
case MOVED_STYLE_TO_HEAD:
case FOUND_STYLE_IN_BODY:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc);
break;
}
messageOut( message );
}
void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
{
TidyMessageImpl *message = NULL;
Node* rpt = (element ? element : node);
char nodedesc[256] = { 0 };
char elemdesc[256] = { 0 };
TagToString(node, nodedesc, sizeof(nodedesc));
switch (code)
{
case NESTED_QUOTATION:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
break;
case OBSOLETE_ELEMENT:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
break;
case NESTED_EMPHASIS:
case REMOVED_HTML5:
case BAD_SUMMARY_HTML5:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, nodedesc );
break;
case COERCE_TO_ENDTAG_WARN:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
break;
case XML_DECLARATION_DETECTED:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
break;
}
messageOut( message );
}
void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
{
TidyMessageImpl *message = NULL;
TidyMessageImpl *message2 = NULL; /* extra, when TidyShowWarnings */
char nodedesc[ 256 ] = {0};
char elemdesc[ 256 ] = {0};
Node* rpt = ( element ? element : node );
uint versionEmitted, declared, version;
ctmbstr extra_string = NULL;
TagToString(node, nodedesc, sizeof(nodedesc));
switch ( code )
{
case MISSING_STARTTAG:
case UNEXPECTED_ENDTAG:
case TOO_MANY_ELEMENTS:
case INSERTING_TAG:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element );
break;
case USING_BR_INPLACE_OF:
case CANT_BE_NESTED:
case PROPRIETARY_ELEMENT:
case UNESCAPED_ELEMENT:
case NOFRAMES_CONTENT:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc );
break;
case ELEMENT_VERS_MISMATCH_WARN:
versionEmitted = doc->lexer->versionEmitted;
declared = doc->lexer->doctype;
version = versionEmitted == 0 ? declared : versionEmitted;
extra_string = TY_(HTMLVersionNameFromCode)(version, 0);
if (!extra_string)
extra_string = tidyLocalizedString(STRING_HTML_PROPRIETARY);
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, extra_string );
break;
case ELEMENT_VERS_MISMATCH_ERROR:
versionEmitted = doc->lexer->versionEmitted;
@ -346,54 +339,11 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, extra_string );
break;
case MISSING_TITLE_ELEMENT:
case INCONSISTENT_VERSION:
case MALFORMED_DOCTYPE:
case CONTENT_AFTER_BODY:
case MALFORMED_COMMENT:
case BAD_COMMENT_CHARS:
case BAD_XML_COMMENT:
case BAD_CDATA_CONTENT:
case INCONSISTENT_NAMESPACE:
case DOCTYPE_AFTER_TAGS:
case DTYPE_NOT_UPPER_CASE:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning );
break;
case COERCE_TO_ENDTAG:
case NON_MATCHING_ENDTAG:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, node->element, node->element );
break;
case UNEXPECTED_ENDTAG_IN:
case TOO_MANY_ELEMENTS_IN:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, node->element, node->element );
message2 = TY_(tidyMessageCreateWithNode)(doc, node, PREVIOUS_LOCATION, TidyInfo, element->element );
break;
case ENCODING_IO_CONFLICT:
case MISSING_DOCTYPE:
case SPACE_PRECEDING_XMLDECL:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning );
break;
case TRIM_EMPTY_ELEMENT:
case ILLEGAL_NESTING:
case UNEXPECTED_END_OF_FILE:
case ELEMENT_NOT_EMPTY:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyWarning, elemdesc );
break;
case MISSING_ENDTAG_FOR:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element );
break;
case MISSING_ENDTAG_BEFORE:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, element->element, nodedesc );
break;
case DISCARDING_UNEXPECTED:
/* Force error if in a bad form, or
Issue #166 - repeated <main> element
@ -405,40 +355,13 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, element->element );
message2 = TY_(tidyMessageCreateWithNode)(doc, element, PREVIOUS_LOCATION, TidyInfo, element->element );
break;
case REPLACING_UNEX_ELEMENT:
TagToString(element, elemdesc, sizeof(elemdesc));
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyWarning, elemdesc, nodedesc );
break;
case REMOVED_HTML5:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError, nodedesc );
break;
case ADDED_MISSING_CHARSET:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyInfo, nodedesc);
break;
}
messageOut( message );
/* Although the callback is always executed for message2, it's only
added to the output sink TidyShowWarnings is enabled. */
if (cfgBool( doc, TidyShowWarnings ))
messageOut( message2 );
}
void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
{
TidyMessageImpl *message = NULL;
char nodedesc[ 256 ] = {0};
Node* rpt = ( element ? element : node );
switch ( code )
{
case SUSPECTED_MISSING_QUOTE:
case DUPLICATE_FRAMESET:
case SUSPECTED_MISSING_QUOTE:
message = TY_(tidyMessageCreateWithNode)(doc, rpt, code, TidyError );
break;
@ -452,12 +375,13 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element, element->element );
break;
case UNEXPECTED_ENDTAG: /* generated by XML docs */
case UNEXPECTED_ENDTAG_ERR: /* generated by XML docs */
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, node->element );
break;
}
}
messageOut( message );
messageOut( message2 );
}
@ -497,10 +421,9 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
switch (code)
{
case MISSING_ATTR_VALUE:
case XML_ATTRIBUTE_VALUE:
case PROPRIETARY_ATTRIBUTE:
case JOINING_ATTRIBUTE:
case MISSING_ATTR_VALUE:
case PROPRIETARY_ATTRIBUTE:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name );
break;
@ -526,35 +449,35 @@ void TY_(ReportAttrError)(TidyDocImpl* doc, Node *node, AttVal *av, uint code)
case BAD_ATTRIBUTE_VALUE:
case BAD_ATTRIBUTE_VALUE_REPLACED:
case INVALID_ATTRIBUTE:
case INSERTING_AUTO_ATTRIBUTE:
case INVALID_ATTRIBUTE:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, name, value );
break;
case ATTRIBUTE_VALUE_REPLACED:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyInfo, tagdesc, name, value);
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyInfo, tagdesc, name, value );
break;
case UNEXPECTED_QUOTEMARK:
case MISSING_QUOTEMARK:
case ID_NAME_MISMATCH:
case BACKSLASH_IN_URI:
case ESCAPED_ILLEGAL_URI:
case FIXED_BACKSLASH:
case ID_NAME_MISMATCH:
case ILLEGAL_URI_CODEPOINT:
case ILLEGAL_URI_REFERENCE:
case ESCAPED_ILLEGAL_URI:
case NEWLINE_IN_URI:
case WHITE_IN_URI:
case UNEXPECTED_GT:
case INVALID_XML_ID:
case MISSING_QUOTEMARK:
case NEWLINE_IN_URI:
case UNEXPECTED_EQUALSIGN:
case UNEXPECTED_GT:
case UNEXPECTED_QUOTEMARK:
case WHITE_IN_URI:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc );
break;
case XML_ID_SYNTAX:
case PROPRIETARY_ATTR_VALUE:
case ANCHOR_NOT_UNIQUE:
case ATTR_VALUE_NOT_LCASE:
case PROPRIETARY_ATTR_VALUE:
case XML_ID_SYNTAX:
message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, tagdesc, value );
break;

3
src/message.h
View file

@ -49,9 +49,6 @@ ctmbstr TY_(tidyLibraryVersion)(void);
void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code);
void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code);
void TY_(ReportError)(TidyDocImpl* doc, Node* element, Node* node, uint code);
void TY_(ReportFatal)(TidyDocImpl* doc, Node* element, Node* node, uint code);
/** @} */

362
src/parser.c
View file

File diff suppressed because it is too large Load diff

2
src/tags.c
View file

@ -990,7 +990,7 @@ void CheckTABLE( TidyDocImpl* doc, Node *node )
if (HasSummary && isHTML5)
{
/* #210 - has summary, and is HTML5, then report obsolete */
TY_(ReportWarning)(doc, node, node, BAD_SUMMARY_HTML5);
TY_(ReportNotice)(doc, node, node, BAD_SUMMARY_HTML5);
}
else if (!HasSummary && !isHTML5)
{

28
src/tidylib.c
View file

@ -1640,7 +1640,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
TY_(CoerceNode)(doc, node, TidyTag_ABBR, warn, no);
} else {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
} else
if ( nodeIsAPPLET(node) ) {
@ -1651,7 +1651,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
TY_(CoerceNode)(doc, node, TidyTag_OBJECT, warn, no);
} else {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
} else
if ( nodeIsBASEFONT(node) ) {
@ -1664,7 +1664,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
* - For now just report a warning
*/
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
} else
if ( nodeIsBIG(node) ) {
/* big: CSS equivalent 'font-size:larger'
@ -1686,7 +1686,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
} else {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
} else
if ( nodeIsCENTER(node) ) {
@ -1697,7 +1697,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
* see: static Bool Center2Div( TidyDocImpl* doc, Node *node, Node **pnode)
*/
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
} else
if ( nodeIsDIR(node) ) {
/* dir: replace by <ul>
@ -1705,7 +1705,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
* Should this be CHANGED???
*/
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
} else
if ( nodeIsFONT(node) ) {
/* Tidy already handles this -
@ -1714,13 +1714,13 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
* done in Bool Font2Span( TidyDocImpl* doc, Node *node, Node **pnode ) (I think?)
*/
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
} else
if (( nodesIsFRAME(node) ) || ( nodeIsFRAMESET(node) ) || ( nodeIsNOFRAMES(node) )) {
/* YOW: What to do here?????? Maybe <iframe>????
*/
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
} else
if ( nodeIsSTRIKE(node) ) {
/* strike: CSS equivalent 'text-decoration:line-through'
@ -1731,7 +1731,7 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
} else {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
} else
if ( nodeIsTT(node) ) {
@ -1745,14 +1745,14 @@ void TY_(CheckHTML5)( TidyDocImpl* doc, Node* node )
TY_(CoerceNode)(doc, node, TidyTag_SPAN, warn, no);
} else {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
} else
if (TY_(nodeIsElement)(node)) {
if (node->tag) {
if ( (!(node->tag->versions & VERS_HTML5) && !(node->tag->versions & VERS_PROPRIETARY)) || (inRemovedInfo(node->tag->id)) ) {
if ( !already_strict )
TY_(ReportWarning)(doc, node, node, REMOVED_HTML5);
TY_(ReportNotice)(doc, node, node, REMOVED_HTML5);
}
}
}
@ -1805,7 +1805,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
/* Version mismatches take priority. */
if ( check_versions && !(node->tag->versions & version) )
{
TY_(ReportError)(doc, NULL, node, tagReportType );
TY_(ReportNotice)(doc, NULL, node, tagReportType );
}
/* If it's not mismatched, it could still be proprietary. */
else if ( node->tag->versions & VERS_PROPRIETARY )
@ -1825,7 +1825,7 @@ void TY_(CheckHTMLTagsAttribsVersions)( TidyDocImpl* doc, Node* node )
if ( (htmlIs5 && !tagLooksCustom) || !htmlIs5 )
{
TY_(ReportError)(doc, NULL, node, PROPRIETARY_ELEMENT );
TY_(ReportNotice)(doc, NULL, node, PROPRIETARY_ELEMENT );
}
if ( nodeIsLAYER(node) )
@ -2136,7 +2136,7 @@ int tidyDocCleanAndRepair( TidyDocImpl* doc )
if ( !doc->lexer->isvoyager && doc->xmlDetected )
{
TY_(ReportWarning)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
TY_(ReportNotice)(doc, NULL, TY_(FindXmlDecl)(doc), XML_DECLARATION_DETECTED );
}
}

4
version.txt
View file

@ -1,2 +1,2 @@
5.5.34
2017.08.28
5.5.36
2017.08.31