summaryrefslogtreecommitdiff
path: root/usr.bin/mandoc
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2017-01-21 01:20:30 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2017-01-21 01:20:30 +0000
commit15dda777936c48d0b0607b01b09ddd379d179496 (patch)
tree046663aab4c70e552a38828fb2fa44aa407d9e8b /usr.bin/mandoc
parent917a874a254cd34e21f8a2e7738e4106dcd6482c (diff)
clean up the remaining class attributes
Diffstat (limited to 'usr.bin/mandoc')
-rw-r--r--usr.bin/mandoc/cgi.c23
-rw-r--r--usr.bin/mandoc/man_html.c8
-rw-r--r--usr.bin/mandoc/mdoc_html.c16
3 files changed, 21 insertions, 26 deletions
diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index 98ccc2c6e74..7d52dcc1204 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgi.c,v 1.82 2017/01/19 13:55:49 schwarze Exp $ */
+/* $OpenBSD: cgi.c,v 1.83 2017/01/21 01:20:29 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@usta.de>
@@ -492,9 +492,9 @@ pg_index(const struct req *req)
resp_searchform(req, FOCUS_QUERY);
printf("<p>\n"
"This web interface is documented in the\n"
- "<a href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n"
+ "<a class=\"Xr\" href=\"/%s%sman.cgi.8\">man.cgi(8)</a>\n"
"manual, and the\n"
- "<a href=\"/%s%sapropos.1\">apropos(1)</a>\n"
+ "<a class=\"Xr\" href=\"/%s%sapropos.1\">apropos(1)</a>\n"
"manual explains the query syntax.\n"
"</p>\n",
scriptname, *scriptname == '\0' ? "" : "/",
@@ -574,26 +574,21 @@ pg_searchres(const struct req *req, struct manpage *r, size_t sz)
req->q.equal || sz == 1 ? FOCUS_NONE : FOCUS_QUERY);
if (sz > 1) {
- puts("<div class=\"results\">");
- puts("<table>");
-
+ puts("<table class=\"results\">");
for (i = 0; i < sz; i++) {
printf(" <tr>\n"
- " <td class=\"title\">"
- "<a href=\"/%s%s%s/%s",
+ " <td>"
+ "<a class=\"Xr\" href=\"/%s%s%s/%s\">",
scriptname, *scriptname == '\0' ? "" : "/",
req->q.manpath, r[i].file);
- printf("\">");
html_print(r[i].names);
printf("</a></td>\n"
- " <td class=\"desc\">");
+ " <td><span class=\"Nd\">");
html_print(r[i].output);
- puts("</td>\n"
+ puts("</span></td>\n"
" </tr>");
}
-
- puts("</table>\n"
- "</div>");
+ puts("</table>");
}
/*
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c
index 9837e787b2f..180bb96a382 100644
--- a/usr.bin/mandoc/man_html.c
+++ b/usr.bin/mandoc/man_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man_html.c,v 1.81 2017/01/20 23:50:59 schwarze Exp $ */
+/* $OpenBSD: man_html.c,v 1.82 2017/01/21 01:20:29 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -453,16 +453,16 @@ man_IP_pre(MAN_ARGS)
const struct roff_node *nn;
if (n->type == ROFFT_BODY) {
- print_otag(h, TAG_DD, "");
+ print_otag(h, TAG_DD, "c", "It-tag");
return 1;
} else if (n->type != ROFFT_HEAD) {
- print_otag(h, TAG_DL, "");
+ print_otag(h, TAG_DL, "c", "Bl-tag");
return 1;
}
/* FIXME: width specification. */
- print_otag(h, TAG_DT, "");
+ print_otag(h, TAG_DT, "c", "It-tag");
/* For IP, only print the first header element. */
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index 360208f0583..549f01ca070 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.133 2017/01/20 23:50:59 schwarze Exp $ */
+/* $OpenBSD: mdoc_html.c,v 1.134 2017/01/21 01:20:29 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -572,7 +572,7 @@ mdoc_nd_pre(MDOC_ARGS)
/* XXX: this tag in theory can contain block elements. */
print_text(h, "\\(em");
- print_otag(h, TAG_SPAN, "c", "desc");
+ print_otag(h, TAG_SPAN, "c", "Nd");
return 1;
}
@@ -661,7 +661,7 @@ mdoc_ar_pre(MDOC_ARGS)
static int
mdoc_xx_pre(MDOC_ARGS)
{
- print_otag(h, TAG_SPAN, "c", "unix");
+ print_otag(h, TAG_SPAN, "c", "Ux");
return 1;
}
@@ -868,7 +868,7 @@ mdoc_ex_pre(MDOC_ARGS)
static int
mdoc_em_pre(MDOC_ARGS)
{
- print_otag(h, TAG_SPAN, "c", "emph");
+ print_otag(h, TAG_I, "c", "Em");
return 1;
}
@@ -1437,9 +1437,9 @@ mdoc_bf_pre(MDOC_ARGS)
return 1;
if (FONT_Em == n->norm->Bf.font)
- cattr = "emph";
+ cattr = "Em";
else if (FONT_Sy == n->norm->Bf.font)
- cattr = "symb";
+ cattr = "Sy";
else if (FONT_Li == n->norm->Bf.font)
cattr = "Li";
else
@@ -1493,7 +1493,7 @@ mdoc_rs_pre(MDOC_ARGS)
static int
mdoc_no_pre(MDOC_ARGS)
{
- print_otag(h, TAG_SPAN, "c", "none");
+ print_otag(h, TAG_SPAN, "c", "No");
return 1;
}
@@ -1507,7 +1507,7 @@ mdoc_li_pre(MDOC_ARGS)
static int
mdoc_sy_pre(MDOC_ARGS)
{
- print_otag(h, TAG_SPAN, "c", "symb");
+ print_otag(h, TAG_B, "c", "Sy");
return 1;
}