diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2021-08-10 12:55:03 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2021-08-10 12:55:03 +0000 |
| commit | 2c155e88b6e2ca5d3f75e9b16fcff86b8059f886 (patch) | |
| tree | 7a6b42adef0485bb1febdd1c821de1046e7c1bfb /tbl_html.c | |
| parent | ae3479c0b3b054123f6cd2e229271f9435c958de (diff) | |
| download | mandoc-2c155e88b6e2ca5d3f75e9b16fcff86b8059f886.tar.gz mandoc-2c155e88b6e2ca5d3f75e9b16fcff86b8059f886.tar.zst 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 'tbl_html.c')
| -rw-r--r-- | tbl_html.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_html.c,v 1.35 2021/05/16 23:18:35 schwarze Exp $ */ +/* $Id: tbl_html.c,v 1.36 2021/08/10 12:55:04 schwarze Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014,2015,2017,2018,2021 Ingo Schwarze <schwarze@openbsd.org> @@ -243,10 +243,7 @@ print_tbl(struct html *h, const struct tbl_span *sp) "border-right-style", rborder); if (dp->string != NULL) { save_font = h->metac; - if (dp->layout->flags & TBL_CELL_BOLD) - html_setfont(h, ESCAPE_FONTBOLD); - else if (dp->layout->flags & TBL_CELL_ITALIC) - html_setfont(h, ESCAPE_FONTITALIC); + html_setfont(h, dp->layout->font); if (dp->layout->pos == TBL_CELL_LONG) print_text(h, "\\[u2003]"); /* em space */ print_text(h, dp->string); |