htacg · hills · Feb 21, 2025 · Feb 21, 2025
diff --git a/include/tidyenum.h b/include/tidyenum.h
@@ -235,7 +235,6 @@ extern "C" {
     FN(MISSING_SEMICOLON)             \
     FN(MISSING_STARTTAG)              \
     FN(MISSING_TITLE_ELEMENT)         \
-    FN(MOVED_STYLE_TO_HEAD)           \
     FN(NESTED_EMPHASIS)               \
     FN(NESTED_QUOTATION)              \
     FN(NEWLINE_IN_URI)                \

diff --git a/localize/translations/language_de.po b/localize/translations/language_de.po
@@ -3014,10 +3014,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr "füge fehlendes 'title' Element ein"
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr "habe <style> Tag in den Kopfbereich (<head>) verschoben! Setzen Sie fix-style-tags: no, um dies zu vermeiden."
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_en_gb.po b/localize/translations/language_en_gb.po
@@ -2572,10 +2572,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr ""
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_es.po b/localize/translations/language_es.po
@@ -2516,10 +2516,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr ""
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_es_mx.po b/localize/translations/language_es_mx.po
@@ -2511,10 +2511,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr ""
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_fr.po b/localize/translations/language_fr.po
@@ -2955,10 +2955,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr "ajout d'un élément 'title' manquant"
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_pt_br.po b/localize/translations/language_pt_br.po
@@ -3042,10 +3042,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr "inserindo elemento faltante 'title'"
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr "tag <style> movida para <head>! fix-style-tags: no para evitar."
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/language_zh_cn.po b/localize/translations/language_zh_cn.po
@@ -2505,10 +2505,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr ""
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/localize/translations/tidy.pot b/localize/translations/tidy.pot
@@ -2507,10 +2507,6 @@ msgctxt "MISSING_TITLE_ELEMENT"
 msgid "inserting missing 'title' element"
 msgstr ""
 
-msgctxt "MOVED_STYLE_TO_HEAD"
-msgid "moved <style> tag to <head>! fix-style-tags: no to avoid."
-msgstr ""
-
 #, c-format
 msgctxt "NESTED_EMPHASIS"
 msgid "nested emphasis %s"

diff --git a/regression_testing/cases/access-expects/case-6_1_1_2.html b/regression_testing/cases/access-expects/case-6_1_1_2.html
@@ -3,13 +3,12 @@
 <html lang="en">
 <head>
 <title>aert1.0/6.1.1</title>
-
+</head>
+<body>
 <style>
 <!--
 p {text-align:justify}
 -->
 </style>
-</head>
-<body>
 </body>
 </html>
diff --git a/regression_testing/cases/access-expects/case-6_1_1_2.txt b/regression_testing/cases/access-expects/case-6_1_1_2.txt
@@ -1,5 +1,5 @@
 line 7 column 1 - Access: [6.1.1.2]: style sheets require testing (style element).
-line 7 column 1 - Warning: moved <style> tag to <head>! fix-style-tags: no to avoid.
+line 7 column 1 - Warning: found <style> tag in <body>! fix-style-tags: yes to move.
 Tidy found 1 warning and 0 errors!
 
 For further advice on how to make your pages accessible

diff --git a/regression_testing/cases/github-cases/case-730.conf b/regression_testing/cases/github-cases/case-730.conf
@@ -0,0 +1 @@
+fix-style-tags: yes
diff --git a/regression_testing/cases/github-cases/[email protected] b/regression_testing/cases/github-cases/[email protected]
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<title>Issue 730</title>
+<body>
+<h1>Heading</h1>
+<style>
+body {
+  color: red
+}
+</style>
+<p>Paragraph</p>
+</body>
+</html>
diff --git a/regression_testing/cases/github-expects/case-730.html b/regression_testing/cases/github-expects/case-730.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Issue 730</title>
+
+<style>
+body {
+  color: red
+}
+</style>
+</head>
+<body>
+<h1>Heading</h1>
+<p>Paragraph</p>
+</body>
+</html>
diff --git a/regression_testing/cases/github-expects/case-730.txt b/regression_testing/cases/github-expects/case-730.txt
@@ -0,0 +1,13 @@
+Info: Document content looks like HTML5
+No warnings or errors were found.
+
+About HTML Tidy: https://github.com/htacg/tidy-html5
+Bug reports and comments: https://github.com/htacg/tidy-html5/issues
+Official mailing list: https://lists.w3.org/Archives/Public/public-htacg/
+Latest HTML specification: https://html.spec.whatwg.org/multipage/
+Validate your HTML documents: https://validator.w3.org/nu/
+Lobby your company to join the W3C: https://www.w3.org/Consortium
+
+Do you speak a language other than English, or a different variant of 
+English? Consider helping us to localize HTML Tidy. For details please see 
+https://github.com/htacg/tidy-html5/blob/master/README/LOCALIZE.md
diff --git a/src/clean.c b/src/clean.c
@@ -2775,7 +2775,6 @@ static void StyleToHead(TidyDocImpl* doc, Node *head, Node *node, Bool fix, int
             {
                 TY_(RemoveNode)(node); /* unhook style node from body */
                 TY_(InsertNodeAtEnd)(head, node);   /* add to end of head */
-                TY_(Report)(doc, node, head, MOVED_STYLE_TO_HEAD); /* report move */
             }
             else
             {

diff --git a/src/config.c b/src/config.c
@@ -253,7 +253,7 @@ static const TidyOptionImpl option_defs[] =
     { TidySkipNested,              MR, "skip-nested",                 BL, yes,             ParsePickList,     &boolPicks          }, /* 1642186 - Issue #65 */
     { TidySortAttributes,          PP, "sort-attributes",             IN, TidySortAttrNone,ParsePickList,     &sorterPicks        },
     { TidyStrictTagsAttr,          MR, "strict-tags-attributes",      BL, no,              ParsePickList,     &boolPicks          }, /* 20160209 - Issue #350 */
-    { TidyStyleTags,               MR, "fix-style-tags",              BL, yes,             ParsePickList,     &boolPicks          },
+    { TidyStyleTags,               MR, "fix-style-tags",              BL, no,              ParsePickList,     &boolPicks          },
     { TidyTabSize,                 PP, "tab-size",                    IN, 8,               ParseInt,          NULL                },
     { TidyUpperCaseAttrs,          MR, "uppercase-attributes",        IN, TidyUppercaseNo, ParsePickList,     &attributeCasePicks },
     { TidyUpperCaseTags,           MR, "uppercase-tags",              BL, no,              ParsePickList,     &boolPicks          },

diff --git a/src/language_de.h b/src/language_de.h
@@ -842,7 +842,6 @@ static languageDefinition language_de = { whichPluralForm_de, {
     { MISSING_SEMICOLON,                             0, "Entität \"%s\" endet nicht mit ';'"                                                                              },
     { MISSING_STARTTAG,                              0, "fehlendes <%s>"                                                                                                  },
     { MISSING_TITLE_ELEMENT,                         0, "füge fehlendes 'title' Element ein"                                                                              },
-    { MOVED_STYLE_TO_HEAD,                           0, "habe <style> Tag in den Kopfbereich (<head>) verschoben! Setzen Sie fix-style-tags: no, um dies zu vermeiden."   },
     { NESTED_EMPHASIS,                               0, "verschachtelte Hervorhebung %s"                                                                                  },
     { NESTED_QUOTATION,                              0, "verschachtelte q Elemente, möglicher Tippfehler"                                                                 },
     { NEWLINE_IN_URI,                                0, "%s verwerfe Zeilenumbruch im URI-Verweis"                                                                        },

diff --git a/src/language_en.h b/src/language_en.h
@@ -2013,7 +2013,6 @@ static languageDefinition language_en = { whichPluralForm_en, {
     { MISSING_SEMICOLON,            0,   "entity \"%s\" doesn't end in ';'"                                        },
     { MISSING_STARTTAG,             0,   "missing <%s>"                                                            },
     { MISSING_TITLE_ELEMENT,        0,   "inserting missing 'title' element"                                       },
-    { MOVED_STYLE_TO_HEAD,          0,   "moved <style> tag to <head>! fix-style-tags: no to avoid."               },
     { NESTED_EMPHASIS,              0,   "nested emphasis %s"                                                      },
     { NESTED_QUOTATION,             0,   "nested q elements, possible typo."                                       },
     { NEWLINE_IN_URI,               0,   "%s discarding newline in URI reference"                                  },

diff --git a/src/language_pt_br.h b/src/language_pt_br.h
@@ -922,7 +922,6 @@ static languageDefinition language_pt_br = { whichPluralForm_pt_br, {
     { MISSING_SEMICOLON,                             0, "entidade \"%s\" não termina em ';'"                                                              },
     { MISSING_STARTTAG,                              0, "faltando <%s>"                                                                                   },
     { MISSING_TITLE_ELEMENT,                         0, "inserindo elemento faltante 'title'"                                                             },
-    { MOVED_STYLE_TO_HEAD,                           0, "tag <style> movida para <head>! fix-style-tags: no para evitar."                                 },
     { NESTED_EMPHASIS,                               0, "ênfase aninhada %s"                                                                              },
     { NESTED_QUOTATION,                              0, "elementos q aninhados, possível erro de escrita."                                                },
     { NEWLINE_IN_URI,                                0, "%s descartando nova linha na referência de URI"                                                  },

diff --git a/src/message.c b/src/message.c
@@ -324,7 +324,6 @@ static struct _dispatchTable {
     { MISSING_SEMICOLON,            TidyWarning,     formatStandard          },
     { MISSING_STARTTAG,             TidyWarning,     formatStandard          },
     { MISSING_TITLE_ELEMENT,        TidyWarning,     formatStandard          },
-    { MOVED_STYLE_TO_HEAD,          TidyWarning,     formatStandard          },
     { NESTED_EMPHASIS,              TidyWarning,     formatStandard          },
     { NESTED_QUOTATION,             TidyWarning,     formatStandard          },
     { NEWLINE_IN_URI,               TidyWarning,     formatAttributeReport   },
@@ -826,7 +825,6 @@ TidyMessageImpl *formatStandard(TidyDocImpl* doc, Node *element, Node *node, uin
         case ELEMENT_NOT_EMPTY:
         case FOUND_STYLE_IN_BODY:
         case ILLEGAL_NESTING:
-        case MOVED_STYLE_TO_HEAD:
         case TRIM_EMPTY_ELEMENT:
         case UNEXPECTED_END_OF_FILE:
             return TY_(tidyMessageCreateWithNode)(doc, rpt, code, level, elemdesc );
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     TY_(RemoveNode)(node); /* unhook style node from body */
                     TY_(InsertNodeAtEnd)(head, node);   /* add to end of head */
-                    TY_(Report)(doc, node, head, MOVED_STYLE_TO_HEAD); /* report move */
                 }
                 else
                 {
@@ Expand Down @@