diff options
author | Yuri Pankov <yuri.pankov@nexenta.com> | 2016-07-29 15:19:48 +0300 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2016-08-17 17:00:11 -0400 |
commit | 371584c2eae4cf827fd406ba26c14f021adaaa70 (patch) | |
tree | 42632bedb51ee7aa4c71b3480230cf2bc0789281 /usr/src/cmd/mandoc/tbl_layout.c | |
parent | 7a8b8fd18ff115f0caa89183db5373afb568b630 (diff) | |
download | illumos-gate-371584c2eae4cf827fd406ba26c14f021adaaa70.tar.gz |
7243 update mdocml to 1.13.4
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/mandoc/tbl_layout.c')
-rw-r--r-- | usr/src/cmd/mandoc/tbl_layout.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/mandoc/tbl_layout.c b/usr/src/cmd/mandoc/tbl_layout.c index ed9acc9c0a..c0eafbddbf 100644 --- a/usr/src/cmd/mandoc/tbl_layout.c +++ b/usr/src/cmd/mandoc/tbl_layout.c @@ -1,4 +1,4 @@ -/* $Id: tbl_layout.c,v 1.38 2015/02/10 11:03:13 schwarze Exp $ */ +/* $Id: tbl_layout.c,v 1.41 2015/10/12 00:08:16 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -115,7 +115,6 @@ mod: ln, *pos, "m"); goto mod; case 'p': - /* FALLTHROUGH */ case 'v': if (p[*pos] == '-' || p[*pos] == '+') (*pos)++; @@ -168,17 +167,14 @@ mod: switch (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: @@ -308,6 +304,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos) rp->next->first == NULL) { free(rp->next); rp->next = NULL; + tbl->last_row = rp; } } return; @@ -354,5 +351,5 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) if (tbl->opts.cols <= p->col) tbl->opts.cols = p->col + 1; - return(p); + return p; } |