===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.2
retrieving revision 1.34
diff -u -p -r1.2 -r1.34
--- mandoc/tbl.c	2010/12/28 10:55:24	1.2
+++ mandoc/tbl.c	2015/01/27 05:21:45	1.34
@@ -1,6 +1,7 @@
-/*	$Id: tbl.c,v 1.2 2010/12/28 10:55:24 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@kth.se>
+ * 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,81 +15,180 @@
  * 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>
 #include <string.h>
 #include <time.h>
 
 #include "mandoc.h"
-#include "roff.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
-enum	tbl_part {
-	TBL_PART_OPTS, /* in options (first line) */
-	TBL_PART_LAYOUT, /* describing layout */
-	TBL_PART_DATA  /* creating data rows */
-};
 
+enum rofferr
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
+{
+	const char	*cp;
+	int		 active;
 
-struct	tbl {
-	enum tbl_part	 part;
-};
+	/*
+	 * In the options section, proceed to the layout section
+	 * after a semicolon, or right away if there is no semicolon.
+	 * Ignore semicolons in arguments.
+	 */
 
-static	void		 tbl_init(struct tbl *);
-static	void		 tbl_clear(struct tbl *);
+	if (tbl->part == TBL_PART_OPTS) {
+		tbl->part = TBL_PART_LAYOUT;
+		active = 1;
+		for (cp = p; *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);
+			if (*(p = cp + 1) == '\0')
+				return(ROFF_IGN);
+		}
+	}
 
-static void
-tbl_clear(struct tbl *tbl)
-{
+	/* Process the other section types.  */
 
+	switch (tbl->part) {
+	case TBL_PART_LAYOUT:
+		tbl_layout(tbl, ln, p);
+		return(ROFF_IGN);
+	case TBL_PART_CDATA:
+		return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+	default:
+		break;
+	}
+
+	tbl_data(tbl, ln, p);
+	return(ROFF_TBL);
 }
 
-static void
-tbl_init(struct tbl *tbl)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)
 {
+	struct tbl_node	*tbl;
 
+	tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+	tbl->line = line;
+	tbl->pos = pos;
+	tbl->parse = parse;
 	tbl->part = TBL_PART_OPTS;
+	tbl->opts.tab = '\t';
+	tbl->opts.decimal = '.';
+	return(tbl);
 }
 
-enum rofferr
-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+void
+tbl_free(struct tbl_node *tbl)
 {
-	int		 len;
-	const char	*cp;
+	struct tbl_row	*rp;
+	struct tbl_cell	*cp;
+	struct tbl_span	*sp;
+	struct tbl_dat	*dp;
+	struct tbl_head	*hp;
 
-	cp = &p[offs];
-	len = (int)strlen(cp);
+	while (NULL != (rp = tbl->first_row)) {
+		tbl->first_row = rp->next;
+		while (rp->first) {
+			cp = rp->first;
+			rp->first = cp->next;
+			free(cp);
+		}
+		free(rp);
+	}
 
-	if (len && TBL_PART_OPTS == tbl->part)
-		if (';' != cp[len - 1])
-			tbl->part = TBL_PART_LAYOUT;
-	
-	return(ROFF_CONT);
+	while (NULL != (sp = tbl->first_span)) {
+		tbl->first_span = sp->next;
+		while (sp->first) {
+			dp = sp->first;
+			sp->first = dp->next;
+			if (dp->string)
+				free(dp->string);
+			free(dp);
+		}
+		free(sp);
+	}
+
+	while (NULL != (hp = tbl->first_head)) {
+		tbl->first_head = hp->next;
+		free(hp);
+	}
+
+	free(tbl);
 }
 
-struct tbl *
-tbl_alloc(void)
+void
+tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
-	struct tbl	*p;
+	if (TBL_PART_CDATA == tbl->part)
+		mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+		    tbl->line, tbl->pos, NULL);
 
-	p = mandoc_malloc(sizeof(struct tbl));
-	tbl_init(p);
-	return(p);
+	tbl->part = TBL_PART_LAYOUT;
+	tbl->line = line;
+	tbl->pos = pos;
+
+	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+		mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+		    tbl->line, tbl->pos, NULL);
 }
 
-void
-tbl_free(struct tbl *p)
+const struct tbl_span *
+tbl_span(struct tbl_node *tbl)
 {
+	struct tbl_span	 *span;
 
-	tbl_clear(p);
-	free(p);
+	assert(tbl);
+	span = tbl->current_span ? tbl->current_span->next
+				 : tbl->first_span;
+	if (span)
+		tbl->current_span = span;
+	return(span);
 }
 
 void
-tbl_reset(struct tbl *tbl)
+tbl_end(struct tbl_node **tblp)
 {
+	struct tbl_node	*tbl;
+	struct tbl_span *sp;
 
-	tbl_clear(tbl);
-	tbl_init(tbl);
+	tbl = *tblp;
+	*tblp = NULL;
+
+	sp = tbl->first_span;
+	while (sp != NULL && sp->first == NULL)
+		sp = sp->next;
+	if (sp == NULL)
+		mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+		    tbl->line, tbl->pos, NULL);
+
+	if (tbl->last_span)
+		tbl->last_span->flags |= TBL_SPAN_LAST;
+
+	if (TBL_PART_CDATA == tbl->part)
+		mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+		    tbl->line, tbl->pos, NULL);
 }