Merge kristaps@' cleaner tbl integration, removing mine;

there are still a few bugs, but fixing these will be easier in tree.

1 files changed, 7 insertions, 10 deletions

diff --git a/usr.bin/mandoc/man.h b/usr.bin/mandoc/man.h
index 7daa88a4153..f459db294f3 100644
--- a/usr.bin/mandoc/man.h
+++ b/usr.bin/mandoc/man.h
@@ -1,6 +1,6 @@
-/*	$Id: man.h,v 1.32 2010/12/27 23:57:13 schwarze Exp $ */
+/*	$Id: man.h,v 1.33 2011/01/04 22:28:17 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -53,8 +53,6 @@ enum	mant {
 	MAN_PD,
 	MAN_AT,
 	MAN_in,
-	MAN_TS,
-	MAN_TE,
 	MAN_ft,
 	MAN_MAX
 };
@@ -68,7 +66,8 @@ enum	man_type {
 	MAN_ROOT,
 	MAN_BLOCK,
 	MAN_HEAD,
-	MAN_BODY
+	MAN_BODY,
+	MAN_TBL
 };
 
 /* 
@@ -83,10 +82,6 @@ struct	man_meta {
 	char		*source; /* `TH' source (e.g., GNU) */
 };
 
-union man_data {
-	struct tbl	*TS;
-};
-
 /* 
  * Single node in tree-linked AST. 
  */
@@ -106,7 +101,7 @@ struct	man_node {
 	char		*string; /* TEXT node argument */
 	struct man_node	*head; /* BLOCK node HEAD ptr */
 	struct man_node	*body; /* BLOCK node BODY ptr */
-	union man_data	 data;
+	const struct tbl_span *span; /* TBL */
 };
 
 /*
@@ -124,6 +119,8 @@ struct	man	 *man_alloc(struct regset *, void *, mandocmsg);
 void		  man_reset(struct man *);
 int	 	  man_parseln(struct man *, int, char *, int);
 int		  man_endparse(struct man *);
+int		  man_addspan(struct man *,
+			const struct tbl_span *);
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);