artulab
projects / openbsd / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3eb9765)
Put the HTML comment containing the Copyright header (if any)
authorschwarze <schwarze@openbsd.org>
Mon, 4 Jul 2022 14:37:14 +0000 (14:37 +0000)
committerschwarze <schwarze@openbsd.org>
Mon, 4 Jul 2022 14:37:14 +0000 (14:37 +0000)
between the <head> and the <body> rather than before the <head>
because the <meta charset="utf-8"/> element ought to be within
the first 1024 bytes of the HTML code.
Issue found with validator.w3.org.

usr.bin/mandoc/man_html.c patch | blob | history
usr.bin/mandoc/mdoc_html.c patch | blob | history

diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index 82d09ae..a8fbe6c 100644 (file)
--- a/usr.bin/mandoc/man_html.c
+++ b/usr.bin/mandoc/man_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man_html.c,v 1.133 2022/07/03 14:28:27 schwarze Exp $ */
+/* $OpenBSD: man_html.c,v 1.134 2022/07/04 14:37:14 schwarze Exp $ */
 /*
  * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -121,11 +121,11 @@ html_man(void *arg, const struct roff_meta *man)
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
-               if (n != NULL && n->type == ROFFT_COMMENT)
-                       print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
                print_man_head(man, h);
                print_tagq(h, t);
+               if (n != NULL && n->type == ROFFT_COMMENT)
+                       print_gen_comment(h, n);
                print_otag(h, TAG_BODY, "");
        }
 
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index 683c17e..dca0635 100644 (file)
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_html.c,v 1.220 2022/07/03 14:28:27 schwarze Exp $ */
+/* $OpenBSD: mdoc_html.c,v 1.221 2022/07/04 14:37:14 schwarze Exp $ */
 /*
  * Copyright (c) 2014-2022 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -291,11 +291,11 @@ html_mdoc(void *arg, const struct roff_meta *mdoc)
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
-               if (n != NULL && n->type == ROFFT_COMMENT)
-                       print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
                print_mdoc_head(mdoc, h);
                print_tagq(h, t);
+               if (n != NULL && n->type == ROFFT_COMMENT)
+                       print_gen_comment(h, n);
                print_otag(h, TAG_BODY, "");
        }
 
OpenBSD src
by Ahmet Artu Yildirim