diff options
| author |   schwarze <schwarze@openbsd.org> | 2019-04-30 15:52:42 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2019-04-30 15:52:42 +0000 |
| commit | cefe897421c083ac43eb7ff12a99198529abd174 (patch) | |
| tree | 965395f7aa67d55f325864dfefe624c390eddbf4 /usr.bin/mandoc/man_html.c | |
| parent | tc_setclock: always call tc_windup() before leaving windup_mtx. (diff) | |
| download | wireguard-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/man_html.c')
| -rw-r--r-- | usr.bin/mandoc/man_html.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index 7ce331ecb7e..5c51897edd5 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.126 2019/03/02 16:29:49 schwarze Exp $ */ +/* $OpenBSD: man_html.c,v 1.127 2019/04/30 15:52:42 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> @@ -201,9 +201,9 @@ print_man_node(MAN_ARGS) * Close out scope of font prior to opening a macro * scope. */ - if (HTMLFONT_NONE != h->metac) { + if (h->metac != ESCAPE_FONTROMAN) { h->metal = h->metac; - h->metac = HTMLFONT_NONE; + h->metac = ESCAPE_FONTROMAN; } /* |