===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -c -r1.32 -r1.33
*** src/usr.bin/mandoc/man.h	2010/12/27 23:57:13	1.32
--- src/usr.bin/mandoc/man.h	2011/01/04 22:28:17	1.33
***************
*** 1,6 ****
! /*	$Id: man.h,v 1.32 2010/12/27 23:57:13 schwarze Exp $ */
  /*
!  * Copyright (c) 2009, 2010 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
--- 1,6 ----
! /*	$Id: man.h,v 1.33 2011/01/04 22:28:17 schwarze Exp $ */
  /*
!  * 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,60 ****
  	MAN_PD,
  	MAN_AT,
  	MAN_in,
- 	MAN_TS,
- 	MAN_TE,
  	MAN_ft,
  	MAN_MAX
  };
--- 53,58 ----
***************
*** 68,74 ****
  	MAN_ROOT,
  	MAN_BLOCK,
  	MAN_HEAD,
! 	MAN_BODY
  };
  
  /* 
--- 66,73 ----
  	MAN_ROOT,
  	MAN_BLOCK,
  	MAN_HEAD,
! 	MAN_BODY,
! 	MAN_TBL
  };
  
  /* 
***************
*** 83,92 ****
  	char		*source; /* `TH' source (e.g., GNU) */
  };
  
- union man_data {
- 	struct tbl	*TS;
- };
- 
  /* 
   * Single node in tree-linked AST. 
   */
--- 82,87 ----
***************
*** 106,112 ****
  	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;
  };
  
  /*
--- 101,107 ----
  	char		*string; /* TEXT node argument */
  	struct man_node	*head; /* BLOCK node HEAD ptr */
  	struct man_node	*body; /* BLOCK node BODY ptr */
! 	const struct tbl_span *span; /* TBL */
  };
  
  /*
***************
*** 124,129 ****
--- 119,126 ----
  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 *);