summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/roff_html.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2019-04-30 15:52:42 +0000
committerschwarze <schwarze@openbsd.org>2019-04-30 15:52:42 +0000
commitcefe897421c083ac43eb7ff12a99198529abd174 (patch)
tree965395f7aa67d55f325864dfefe624c390eddbf4 /usr.bin/mandoc/roff_html.c
parenttc_setclock: always call tc_windup() before leaving windup_mtx. (diff)
downloadwireguard-openbsd-cefe897421c083ac43eb7ff12a99198529abd174.tar.xz
wireguard-openbsd-cefe897421c083ac43eb7ff12a99198529abd174.zip
In HTML output, allow switching the desired font for subsequent
text without printing an opening tag right away, and use that in the .ft request handler. While here, garbage collect redundant enum htmlfont and reduce code duplication in print_text(). Fixing an assertion failure reported by Michael <Stapelberg at Debian> in pmRegisterDerived(3) from libpcp3-dev.
Diffstat (limited to 'usr.bin/mandoc/roff_html.c')
-rw-r--r--usr.bin/mandoc/roff_html.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/mandoc/roff_html.c b/usr.bin/mandoc/roff_html.c
index f2f7258245b..ed9639a3aeb 100644
--- a/usr.bin/mandoc/roff_html.c
+++ b/usr.bin/mandoc/roff_html.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: roff_html.c,v 1.19 2019/01/07 06:51:37 schwarze Exp $ */
+/* $OpenBSD: roff_html.c,v 1.20 2019/04/30 15:52:42 schwarze Exp $ */
/*
* Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -94,7 +94,7 @@ roff_html_pre_ft(ROFF_HTML_ARGS)
const char *cp;
cp = n->child->string;
- print_metaf(h, mandoc_font(cp, (int)strlen(cp)));
+ html_setfont(h, mandoc_font(cp, (int)strlen(cp)));
}
static void