diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-28 15:03:45 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-01-28 15:03:45 +0000 |
commit | 7793230177d864fb80c0c572a2b896f3ecb7df10 (patch) | |
tree | 9200fdac5fa9fae03f349e62032d6041b10d54d3 /tbl_data.c | |
parent | c49d930f6dcda366d67ac4b3bad9cc05ac3bc954 (diff) | |
download | mandoc-7793230177d864fb80c0c572a2b896f3ecb7df10.tar.gz mandoc-7793230177d864fb80c0c572a2b896f3ecb7df10.tar.zst mandoc-7793230177d864fb80c0c572a2b896f3ecb7df10.zip |
For now, it can't be helped that mandoc tbl(7) ignores high-level macros,
but stop throwing away their arguments. This fixes information loss in a
handful of Xenocara manuals, at the price of a small amount of formatting
noise creeping through.
Diffstat (limited to 'tbl_data.c')
-rw-r--r-- | tbl_data.c | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */ +/* $Id: tbl_data.c,v 1.35 2015/01/28 15:03:45 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -138,13 +138,10 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp, } int -tbl_cdata(struct tbl_node *tbl, int ln, const char *p) +tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_dat *dat; size_t sz; - int pos; - - pos = 0; dat = tbl->last_span->last; @@ -204,11 +201,10 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp) } void -tbl_data(struct tbl_node *tbl, int ln, const char *p) +tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) { struct tbl_span *dp; struct tbl_row *rp; - int pos; /* * Choose a layout row: take the one following the last parsed @@ -259,7 +255,6 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p) dp->pos = TBL_SPAN_DATA; - pos = 0; while ('\0' != p[pos]) getdata(tbl, dp, ln, p, &pos); } |