aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roff.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2021-08-10 12:55:03 +0000
committerIngo Schwarze <schwarze@openbsd.org>2021-08-10 12:55:03 +0000
commit2c155e88b6e2ca5d3f75e9b16fcff86b8059f886 (patch)
tree7a6b42adef0485bb1febdd1c821de1046e7c1bfb /roff.c
parentae3479c0b3b054123f6cd2e229271f9435c958de (diff)
downloadmandoc-2c155e88b6e2ca5d3f75e9b16fcff86b8059f886.tar.gz
mandoc-2c155e88b6e2ca5d3f75e9b16fcff86b8059f886.zip
Support two-character font names (BI, CW, CR, CB, CI)
in the tbl(7) layout font modifier. Get rid of the TBL_CELL_BOLD and TBL_CELL_ITALIC flags and use the usual ESCAPE_FONT* enum mandoc_esc members from mandoc.h instead, which simplifies and unifies some code. While here, also support CB and CI in roff(7) \f escape sequences and in roff(7) .ft requests for all output modes. Using those is certainly not recommended because portability is limited even with groff, but supporting them makes some existing third-party manual pages look better, in particular in HTML output mode. Bug-compatible with groff as far as i'm aware, except that i consider font names starting with the '\n' (ASCII 0x0a line feed) character so insane that i decided to not support them. Missing feature reported by nabijaczleweli dot xyz in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992002. I used none of the code from the initial patch submitted by nabijaczleweli, but some of their ideas. Final patch tested by them, too.
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/roff.c b/roff.c
index ed4f31b6..de75a260 100644
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/* $Id: roff.c,v 1.377 2021/06/27 17:57:55 schwarze Exp $ */
+/* $Id: roff.c,v 1.378 2021/08/10 12:55:04 schwarze Exp $ */
/*
* Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -3667,7 +3667,9 @@ roff_char(ROFF_ARGS)
case ESCAPE_FONTITALIC:
case ESCAPE_FONTBOLD:
case ESCAPE_FONTBI:
- case ESCAPE_FONTCW:
+ case ESCAPE_FONTCR:
+ case ESCAPE_FONTCB:
+ case ESCAPE_FONTCI:
case ESCAPE_FONTPREV:
font++;
break;