aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/man_html.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-04-30 15:53:00 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-04-30 15:53:00 +0000
commitc97489f192655f4c659019bb01065f81365849a8 (patch)
tree92e8ddd081535061b5d3374eaac3057d8208a61f /man_html.c
parentdbfda8d8adf1a93a24085f7949afa4203b57ee2b (diff)
downloadmandoc-c97489f192655f4c659019bb01065f81365849a8.tar.gz
mandoc-c97489f192655f4c659019bb01065f81365849a8.tar.zst
mandoc-c97489f192655f4c659019bb01065f81365849a8.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 'man_html.c')
-rw-r--r--man_html.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/man_html.c b/man_html.c
index 994a208a..c0a429c5 100644
--- a/man_html.c
+++ b/man_html.c
@@ -1,4 +1,4 @@
-/* $Id: man_html.c,v 1.173 2019/03/02 16:30:53 schwarze Exp $ */
+/* $Id: man_html.c,v 1.174 2019/04/30 15:53:00 schwarze Exp $ */
/*
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -203,9 +203,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;
}
/*