===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.110
retrieving revision 1.115
diff -u -p -r1.110 -r1.115
--- mandoc/roff.c	2010/12/28 10:59:07	1.110
+++ mandoc/roff.c	2011/01/01 15:45:18	1.115
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.110 2010/12/28 10:59:07 kristaps Exp $ */
+/*	$Id: roff.c,v 1.115 2011/01/01 15:45:18 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -59,6 +59,7 @@ enum	rofft {
 	ROFF_tr,
 	ROFF_TS,
 	ROFF_TE,
+	ROFF_T_,
 	ROFF_cblock,
 	ROFF_ccond, /* FIXME: remove this. */
 	ROFF_USERDEF,
@@ -85,7 +86,9 @@ struct	roff {
 	struct regset	*regs; /* read/writable registers */
 	struct roffstr	*first_string; /* user-defined strings & macros */
 	const char	*current_string; /* value of last called user macro */
-	struct tbl	*tbl;
+	struct tbl	*first_tbl; /* first table parsed */
+	struct tbl	*last_tbl; /* last table parsed */
+	struct tbl	*tbl; /* current table being parsed */
 };
 
 struct	roffnode {
@@ -143,6 +146,7 @@ static	void		 roff_setstr(struct roff *,
 static	enum rofferr	 roff_so(ROFF_ARGS);
 static	enum rofferr	 roff_TE(ROFF_ARGS);
 static	enum rofferr	 roff_TS(ROFF_ARGS);
+static	enum rofferr	 roff_T_(ROFF_ARGS);
 static	enum rofferr	 roff_userdef(ROFF_ARGS);
 
 /* See roff_hash_find() */
@@ -175,6 +179,7 @@ static	struct roffmac	 roffs[ROFF_MAX] = {
 	{ "tr", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "TS", roff_TS, NULL, NULL, 0, NULL },
 	{ "TE", roff_TE, NULL, NULL, 0, NULL },
+	{ "T&", roff_T_, NULL, NULL, 0, NULL },
 	{ ".", roff_cblock, NULL, NULL, 0, NULL },
 	{ "\\}", roff_ccond, NULL, NULL, 0, NULL },
 	{ NULL, roff_userdef, NULL, NULL, 0, NULL },
@@ -296,12 +301,16 @@ roffnode_push(struct roff *r, enum rofft tok, const ch
 static void
 roff_free1(struct roff *r)
 {
+	struct tbl	*t;
 
-	if (r->tbl) {
-		tbl_free(r->tbl);
-		r->tbl = NULL;
+	while (r->first_tbl) {
+		t = r->first_tbl;
+		r->first_tbl = t->next;
+		tbl_free(t);
 	}
 
+	r->first_tbl = r->last_tbl = r->tbl = NULL;
+
 	while (r->last)
 		roffnode_pop(r);
 
@@ -1115,7 +1124,7 @@ roff_TE(ROFF_ARGS)
 	if (NULL == r->tbl)
 		(*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL);
 	else
-		tbl_free(r->tbl);
+		tbl_end(r->tbl);
 
 	r->tbl = NULL;
 	return(ROFF_IGN);
@@ -1123,15 +1132,36 @@ roff_TE(ROFF_ARGS)
 
 /* ARGSUSED */
 static enum rofferr
+roff_T_(ROFF_ARGS)
+{
+
+	if (NULL == r->tbl)
+		(*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL);
+	else
+		tbl_restart(r->tbl);
+
+	return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
 roff_TS(ROFF_ARGS)
 {
+	struct tbl	*t;
 
 	if (r->tbl) {
 		(*r->msg)(MANDOCERR_SCOPEBROKEN, r->data, ln, ppos, NULL);
-		tbl_reset(r->tbl);
-	} else
-		r->tbl = tbl_alloc();
+		tbl_end(r->tbl);
+	}
 
+	t = tbl_alloc(ppos, ln, r->data, r->msg);
+
+	if (r->last_tbl)
+		r->last_tbl->next = t;
+	else
+		r->first_tbl = r->last_tbl = t;
+
+	r->tbl = r->last_tbl = t;
 	return(ROFF_IGN);
 }
 
@@ -1348,4 +1378,11 @@ roff_freestr(struct roff *r)
 	}
 
 	r->first_string = NULL;
+}
+
+const struct tbl_span *
+roff_span(const struct roff *r)
+{
+	
+	return(r->tbl ? tbl_span(r->tbl) : NULL);
 }