diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-01-25 12:24:27 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-01-25 12:24:27 +0000 |
commit | 32a9bf7c9c5c910fca0662b906f06e82c319abd1 (patch) | |
tree | 9db24b8aa60aaaf06331dd686fc8a895d999430a /usr.bin/mandoc/tbl.c | |
parent | d28021deaf5243aaa36dd43b57c97cfab9a4b1a9 (diff) |
Since tbl_data() can now produce multiple spans, let parsebuf()
generate man(7) or mdoc(7) nodes for all these spans,
not only for the last one.
Restores the horizontal lines in the cpu(4/hppa) tables.
ok kristaps@
Diffstat (limited to 'usr.bin/mandoc/tbl.c')
-rw-r--r-- | usr.bin/mandoc/tbl.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.bin/mandoc/tbl.c b/usr.bin/mandoc/tbl.c index 56369368098..c91b4bee7c0 100644 --- a/usr.bin/mandoc/tbl.c +++ b/usr.bin/mandoc/tbl.c @@ -1,6 +1,7 @@ -/* $Id: tbl.c,v 1.4 2011/01/04 22:28:17 schwarze Exp $ */ +/* $Id: tbl.c,v 1.5 2011/01/25 12:24:26 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -136,11 +137,16 @@ tbl_restart(int line, int pos, struct tbl_node *tbl) } const struct tbl_span * -tbl_span(const struct tbl_node *tbl) +tbl_span(struct tbl_node *tbl) { + struct tbl_span *span; assert(tbl); - return(tbl->last_span); + span = tbl->current_span ? tbl->current_span->next + : tbl->first_span; + if (span) + tbl->current_span = span; + return(span); } void |