===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.16
retrieving revision 1.40
diff -u -p -r1.16 -r1.40
--- mandoc/tbl.c	2011/01/01 23:00:46	1.16
+++ mandoc/tbl.c	2015/10/06 18:32:20	1.40
@@ -1,6 +1,7 @@
-/*	$Id: tbl.c,v 1.16 2011/01/01 23:00:46 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.40 2015/10/06 18:32:20 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2015 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
@@ -14,6 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,83 +26,92 @@
 #include <time.h>
 
 #include "mandoc.h"
-#include "roff.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	void	 tbl_calc(struct tbl *);
-static	void	 tbl_calc_data(struct tbl *, struct tbl_dat *);
-static	void	 tbl_calc_data_literal(struct tbl_dat *);
-static	void	 tbl_calc_data_number(struct tbl *, struct tbl_dat *);
-static	void	 tbl_calc_data_spanner(struct tbl_dat *);
 
 enum rofferr
-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
-	int		 len;
 	const char	*cp;
+	int		 active;
 
-	cp = &p[offs];
-	len = (int)strlen(cp);
-
 	/*
-	 * If we're in the options section and we don't have a
-	 * terminating semicolon, assume we've moved directly into the
-	 * layout section.  No need to report a warning: this is,
-	 * apparently, standard behaviour.
+	 * In the options section, proceed to the layout section
+	 * after a semicolon, or right away if there is no semicolon.
+	 * Ignore semicolons in arguments.
 	 */
 
-	if (TBL_PART_OPTS == tbl->part && len)
-		if (';' != cp[len - 1])
-			tbl->part = TBL_PART_LAYOUT;
+	if (tbl->part == TBL_PART_OPTS) {
+		tbl->part = TBL_PART_LAYOUT;
+		active = 1;
+		for (cp = p + pos; *cp != '\0'; cp++) {
+			switch (*cp) {
+			case '(':
+				active = 0;
+				continue;
+			case ')':
+				active = 1;
+				continue;
+			case ';':
+				if (active)
+					break;
+				continue;
+			default:
+				continue;
+			}
+			break;
+		}
+		if (*cp == ';') {
+			tbl_option(tbl, ln, p, &pos);
+			if (p[pos] == '\0')
+				return ROFF_IGN;
+		}
+	}
 
-	/* Now process each logical section of the table.  */
+	/* Process the other section types.  */
 
 	switch (tbl->part) {
-	case (TBL_PART_OPTS):
-		return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-	case (TBL_PART_LAYOUT):
-		return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-	case (TBL_PART_DATA):
+	case TBL_PART_LAYOUT:
+		tbl_layout(tbl, ln, p, pos);
+		return ROFF_IGN;
+	case TBL_PART_CDATA:
+		return tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN;
+	default:
 		break;
 	}
 
-	/*
-	 * This only returns zero if the line is empty, so we ignore it
-	 * and continue on.
-	 */
-	return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+	tbl_data(tbl, ln, p, pos);
+	return ROFF_TBL;
 }
 
-struct tbl *
-tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)
 {
-	struct tbl	*p;
+	struct tbl_node	*tbl;
 
-	p = mandoc_calloc(1, sizeof(struct tbl));
-	p->line = line;
-	p->pos = pos;
-	p->data = data;
-	p->msg = msg;
-	p->part = TBL_PART_OPTS;
-	p->tab = '\t';
-	p->linesize = 12;
-	p->decimal = '.';
-	return(p);
+	tbl = mandoc_calloc(1, sizeof(*tbl));
+	tbl->line = line;
+	tbl->pos = pos;
+	tbl->parse = parse;
+	tbl->part = TBL_PART_OPTS;
+	tbl->opts.tab = '\t';
+	tbl->opts.decimal = '.';
+	return tbl;
 }
 
 void
-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *tbl)
 {
 	struct tbl_row	*rp;
 	struct tbl_cell	*cp;
 	struct tbl_span	*sp;
 	struct tbl_dat	*dp;
-	struct tbl_head	*hp;
 
-	while (NULL != (rp = p->first_row)) {
-		p->first_row = rp->next;
-		while (rp->first) {
+	while ((rp = tbl->first_row) != NULL) {
+		tbl->first_row = rp->next;
+		while (rp->first != NULL) {
 			cp = rp->first;
 			rp->first = cp->next;
 			free(cp);
@@ -105,210 +119,65 @@ tbl_free(struct tbl *p)
 		free(rp);
 	}
 
-	while (NULL != (sp = p->first_span)) {
-		p->first_span = sp->next;
-		while (sp->first) {
+	while ((sp = tbl->first_span) != NULL) {
+		tbl->first_span = sp->next;
+		while (sp->first != NULL) {
 			dp = sp->first;
 			sp->first = dp->next;
-			if (dp->string)
-				free(dp->string);
+			free(dp->string);
 			free(dp);
 		}
 		free(sp);
 	}
 
-	while (NULL != (hp = p->first_head)) {
-		p->first_head = hp->next;
-		free(hp);
-	}
-
-	free(p);
+	free(tbl);
 }
 
 void
-tbl_restart(int line, int pos, struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
+	if (tbl->part == TBL_PART_CDATA)
+		mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
+		    line, pos, "T&");
 
 	tbl->part = TBL_PART_LAYOUT;
 	tbl->line = line;
 	tbl->pos = pos;
-
-	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-		TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
 }
 
 const struct tbl_span *
-tbl_span(const struct tbl *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
-tbl_end(struct tbl *tbl)
+int
+tbl_end(struct tbl_node **tblp)
 {
+	struct tbl_node	*tbl;
+	struct tbl_span *sp;
 
-	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-		TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
-	else
-		tbl_calc(tbl);
-}
+	tbl = *tblp;
+	*tblp = NULL;
 
-static void
-tbl_calc(struct tbl *tbl)
-{
-	struct tbl_span	*sp;
-	struct tbl_dat	*dp;
-	struct tbl_head	*hp;
+	if (tbl->part == TBL_PART_CDATA)
+		mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
+		    tbl->line, tbl->pos, "TE");
 
-	/* Calculate width as the max of column cells' widths. */
-
-	for (sp = tbl->first_span; sp; sp = sp->next) {
-		switch (sp->pos) {
-		case (TBL_DATA_HORIZ):
-			/* FALLTHROUGH */
-		case (TBL_DATA_DHORIZ):
-			continue;
-		default:
-			break;
-		}
-		for (dp = sp->first; dp; dp = dp->next)
-			tbl_calc_data(tbl, dp);
+	sp = tbl->first_span;
+	while (sp != NULL && sp->first == NULL)
+		sp = sp->next;
+	if (sp == NULL) {
+		mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->parse,
+		    tbl->line, tbl->pos, NULL);
+		return 0;
 	}
-
-	/* Calculate width as the simple spanner value. */
-
-	for (hp = tbl->first_head; hp; hp = hp->next) 
-		switch (hp->pos) {
-		case (TBL_HEAD_VERT):
-			hp->width = 1;
-			break;
-		case (TBL_HEAD_DVERT):
-			hp->width = 2;
-			break;
-		default:
-			break;
-		}
+	return 1;
 }
-
-static void
-tbl_calc_data(struct tbl *tbl, struct tbl_dat *data)
-{
-
-	/*
-	 * This is the case with overrunning cells... 
-	 */
-	if (NULL == data->layout)
-		return;
-
-	/* Branch down into data sub-types. */
-
-	switch (data->layout->pos) {
-	case (TBL_CELL_HORIZ):
-		/* FALLTHROUGH */
-	case (TBL_CELL_DHORIZ):
-		tbl_calc_data_spanner(data);
-		break;
-	case (TBL_CELL_LONG):
-		/* FALLTHROUGH */
-	case (TBL_CELL_CENTRE):
-		/* FALLTHROUGH */
-	case (TBL_CELL_LEFT):
-		/* FALLTHROUGH */
-	case (TBL_CELL_RIGHT):
-		tbl_calc_data_literal(data);
-		break;
-	case (TBL_CELL_NUMBER):
-		tbl_calc_data_number(tbl, data);
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
-	}
-}
-
-static void
-tbl_calc_data_spanner(struct tbl_dat *data)
-{
-
-	/* N.B., these are horiz spanners (not vert) so always 1. */
-	data->layout->head->width = 1;
-}
-
-static void
-tbl_calc_data_number(struct tbl *tbl, struct tbl_dat *data)
-{
-	int 		 sz, d;
-	char		*dp, pnt;
-
-	/*
-	 * First calculate number width and decimal place (last + 1 for
-	 * no-decimal numbers).  If the stored decimal is subsequent
-	 * ours, make our size longer by that difference
-	 * (right-"shifting"); similarly, if ours is subsequent the
-	 * stored, then extend the stored size by the difference.
-	 * Finally, re-assign the stored values.
-	 */
-
-	/* TODO: use spacing modifier. */
-
-	assert(data->string);
-	sz = (int)strlen(data->string);
-	pnt = tbl->decimal;
-
-	if (NULL == (dp = strchr(data->string, pnt)))
-		d = sz + 1;
-	else
-		d = (int)(dp - data->string) + 1;
-
-	sz += 2;
-
-	if (data->layout->head->decimal > d) {
-		sz += data->layout->head->decimal - d;
-		d = data->layout->head->decimal;
-	} else
-		data->layout->head->width += 
-			d - data->layout->head->decimal;
-
-	if (sz > data->layout->head->width)
-		data->layout->head->width = sz;
-	if (d > data->layout->head->decimal)
-		data->layout->head->decimal = d;
-}
-
-static void
-tbl_calc_data_literal(struct tbl_dat *data)
-{
-	int		 sz, bufsz;
-
-	/* 
-	 * Calculate our width and use the spacing, with a minimum
-	 * spacing dictated by position (centre, e.g,. gets a space on
-	 * either side, while right/left get a single adjacent space).
-	 */
-
-	assert(data->string);
-	sz = (int)strlen(data->string);
-
-	switch (data->layout->pos) {
-	case (TBL_CELL_LONG):
-		/* FALLTHROUGH */
-	case (TBL_CELL_CENTRE):
-		bufsz = 2;
-		break;
-	default:
-		bufsz = 1;
-		break;
-	}
-
-	if (data->layout->spacing)
-		bufsz = bufsz > data->layout->spacing ? 
-			bufsz : data->layout->spacing;
-
-	sz += bufsz;
-	if (data->layout->head->width < sz)
-		data->layout->head->width = sz;
-}
-
-