diff --git a/include/tidyenum.h b/include/tidyenum.h
index d21e1ca..e38a63e 100644
--- a/include/tidyenum.h
+++ b/include/tidyenum.h
@@ -192,7 +192,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) \
@@ -210,19 +209,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) \
@@ -240,7 +233,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) \
@@ -275,19 +267,22 @@ extern "C" {
FN(FOUND_STYLE_IN_BODY)
-/** 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) \
@@ -323,7 +318,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) \
@@ -377,11 +372,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) \
@@ -402,10 +397,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)
@@ -629,6 +624,7 @@ typedef enum
TidySkipNested, /**< Skip nested tags in script and style CDATA */
TidySortAttributes, /**< Sort attributes */
TidyStrictTagsAttr, /**< Ensure tags and attributes match output HTML version */
+ TidyStyleTags, /**< Move style to head */
TidyTabSize, /**< Expand tabs to n spaces */
TidyUpperCaseAttrs, /**< Output attributes in upper not lower case */
TidyUpperCaseTags, /**< Output tags in upper not lower case */
@@ -650,7 +646,6 @@ typedef enum
TidyXmlPIs, /**< If set to yes PIs must end with ?> */
TidyXmlSpace, /**< If set to yes adds xml:space attr as needed */
TidyXmlTags, /**< Treat input as XML */
- TidyStyleTags, /**< Move sytle to head */
N_TIDY_OPTIONS /**< Must be last */
} TidyOptionId;
diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po
index c6b36e5..a20d980 100644
--- a/localize/translations/language_en_gb.po
+++ b/localize/translations/language_en_gb.po
@@ -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 " 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
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 "
-msgstr ""
-
#, c-format
msgctxt "NESTED_EMPHASIS"
msgid "nested emphasis %s"
@@ -2587,6 +2548,11 @@ msgctxt "UNEXPECTED_ENDTAG"
msgid "unexpected "
msgstr ""
+#, c-format
+msgctxt "UNEXPECTED_ENDTAG_ERR"
+msgid "unexpected "
+msgstr ""
+
msgctxt "MOVED_STYLE_TO_HEAD"
msgid "moved