diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-09-18 15:54:49 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-09-18 15:54:49 +0000 |
| commit | 0337c5ac54faf91532e88026ce56435641d4f390 (patch) | |
| tree | a7b9b2d7dc8c18b343e6a8fa8a5bf30f50056946 /usr.bin/mandoc/tbl_layout.c | |
| parent | 7ef814e80d0c9c0a54668956096f0618bbf932e9 (diff) | |
sync to version 1.11.7 from kristaps@
main new feature: support the roff(7) .tr request
plus various bugfixes and some refactoring
regressions are so minor that it's better to get this in
and fix them in the tree
Diffstat (limited to 'usr.bin/mandoc/tbl_layout.c')
| -rw-r--r-- | usr.bin/mandoc/tbl_layout.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.bin/mandoc/tbl_layout.c b/usr.bin/mandoc/tbl_layout.c index 2d1989fa4e8..679b223faba 100644 --- a/usr.bin/mandoc/tbl_layout.c +++ b/usr.bin/mandoc/tbl_layout.c @@ -1,4 +1,4 @@ -/* $Id: tbl_layout.c,v 1.9 2011/05/29 21:22:18 schwarze Exp $ */ +/* $Id: tbl_layout.c,v 1.10 2011/09/18 15:54:48 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -169,6 +169,8 @@ mod: goto mod; case ('f'): break; + case ('r'): + /* FALLTHROUGH */ case ('b'): /* FALLTHROUGH */ case ('i'): @@ -181,12 +183,20 @@ mod: } switch (tolower((unsigned char)p[(*pos)++])) { + case ('3'): + /* FALLTHROUGH */ case ('b'): cp->flags |= TBL_CELL_BOLD; goto mod; + case ('2'): + /* FALLTHROUGH */ case ('i'): cp->flags |= TBL_CELL_ITALIC; goto mod; + case ('1'): + /* FALLTHROUGH */ + case ('r'): + goto mod; default: break; } |