From 56cfcaa84d0b04041aeeec950bddb179297ebd2d Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sun, 2 Jan 2011 10:10:57 +0000 Subject: Churn to get parts of 'struct tbl' visible from mandoc.h: rename the existing 'struct tbl' as 'struct tbl_node', then move all option stuff into a 'struct tbl' in mandoc.h. This conflicted with a structure in chars.c, which was renamed. --- tbl_data.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tbl_data.c') diff --git a/tbl_data.c b/tbl_data.c index cc264eb4..560c7bf8 100644 --- a/tbl_data.c +++ b/tbl_data.c @@ -1,4 +1,4 @@ -/* $Id: tbl_data.c,v 1.7 2011/01/01 22:27:08 kristaps Exp $ */ +/* $Id: tbl_data.c,v 1.8 2011/01/02 10:10:57 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -24,11 +24,11 @@ #include "libmandoc.h" #include "libroff.h" -static void data(struct tbl *, struct tbl_span *, +static void data(struct tbl_node *, struct tbl_span *, int, const char *, int *); void -data(struct tbl *tbl, struct tbl_span *dp, +data(struct tbl_node *tbl, struct tbl_span *dp, int ln, const char *p, int *pos) { struct tbl_dat *dat; @@ -62,7 +62,7 @@ data(struct tbl *tbl, struct tbl_span *dp, dp->last = dp->first = dat; sv = *pos; - while (p[*pos] && p[*pos] != tbl->tab) + while (p[*pos] && p[*pos] != tbl->opts.tab) (*pos)++; dat->string = mandoc_malloc(*pos - sv + 1); @@ -85,7 +85,7 @@ data(struct tbl *tbl, struct tbl_span *dp, } int -tbl_data(struct tbl *tbl, int ln, const char *p) +tbl_data(struct tbl_node *tbl, int ln, const char *p) { struct tbl_span *dp; struct tbl_row *rp; -- cgit v1.2.3