summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2020-02-27 22:26:27 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2020-02-27 22:26:27 +0000
commit7da3ec5f54d0bb0ff48d7b41845a07e075c9e280 (patch)
treea81e9f30aea995b0b0fb33f1ef99a28aef47fc78
parent28f2e442b6b9d76909c198cc329a4c650e3dd4da (diff)
The HTML standard does not allow self-closing syntax for non-void elements.
Consequently, write an explicit end tag for <mark> elements.
-rw-r--r--usr.bin/mandoc/html.c6
-rw-r--r--usr.bin/mandoc/mdoc_html.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mandoc/html.c b/usr.bin/mandoc/html.c
index 9c0e7a71cc6..102daabf3d9 100644
--- a/usr.bin/mandoc/html.c
+++ b/usr.bin/mandoc/html.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: html.c,v 1.133 2020/01/19 17:59:01 schwarze Exp $ */
+/* $OpenBSD: html.c,v 1.134 2020/02/27 22:26:26 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -86,7 +86,7 @@ static const struct htmldata htmltags[TAG_MAX] = {
{"span", HTML_INPHRASE | HTML_TOPHRASE},
{"var", HTML_INPHRASE | HTML_TOPHRASE},
{"br", HTML_INPHRASE | HTML_NOSTACK | HTML_NLALL},
- {"mark", HTML_INPHRASE | HTML_NOSTACK },
+ {"mark", HTML_INPHRASE },
{"math", HTML_INPHRASE | HTML_NLALL | HTML_INDENT},
{"mrow", 0},
{"mi", 0},
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index cb0c6a82748..2dfc43a2123 100644
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdoc_html.c,v 1.209 2020/02/27 01:25:57 schwarze Exp $ */
+/* $OpenBSD: mdoc_html.c,v 1.210 2020/02/27 22:26:26 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
@@ -729,7 +729,7 @@ mdoc_tg_pre(MDOC_ARGS)
char *id;
if ((id = html_make_id(n, 1)) != NULL)
- print_otag(h, TAG_MARK, "i", id);
+ print_tagq(h, print_otag(h, TAG_MARK, "i", id));
return 0;
}