===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -c -r1.30 -r1.31
*** src/usr.bin/mandoc/mdoc.h	2010/06/29 17:10:29	1.30
--- src/usr.bin/mandoc/mdoc.h	2010/07/13 01:09:13	1.31
***************
*** 1,6 ****
! /*	$Id: mdoc.h,v 1.30 2010/06/29 17:10:29 schwarze Exp $ */
  /*
!  * Copyright (c) 2008, 2009 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: mdoc.h,v 1.31 2010/07/13 01:09:13 schwarze Exp $ */
  /*
!  * Copyright (c) 2008, 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
***************
*** 252,258 ****
  enum	mdoc_endbody {
  	ENDBODY_NOT = 0,
  	ENDBODY_SPACE,
! 	ENDBODY_NOSPACE,
  };
  
  enum	mdoc_list {
--- 252,258 ----
  enum	mdoc_endbody {
  	ENDBODY_NOT = 0,
  	ENDBODY_SPACE,
! 	ENDBODY_NOSPACE
  };
  
  enum	mdoc_list {
***************
*** 279,284 ****
--- 279,297 ----
  	DISP_literal
  };
  
+ enum	mdoc_auth {
+ 	AUTH__NONE = 0,
+ 	AUTH_split,
+ 	AUTH_nosplit
+ };
+ 
+ enum	mdoc_font {
+ 	FONT__NONE = 0,
+ 	FONT_Em,
+ 	FONT_Li,
+ 	FONT_Sy
+ };
+ 
  struct	mdoc_bd {
  	const char	 *offs; /* -offset */
  	enum mdoc_disp	  type; /* -ragged, etc. */
***************
*** 290,297 ****
--- 303,320 ----
  	const char	 *offs; /* -offset */
  	enum mdoc_list	  type; /* -tag, -enum, etc. */
  	int		  comp; /* -compact */
+ 	size_t		  ncols; /* -column arg count */
+ 	const char	**cols; /* -column val ptr */
  };
  
+ struct	mdoc_bf {
+ 	enum mdoc_font	  font; /* font */
+ };
+ 
+ struct	mdoc_an {
+ 	enum mdoc_auth	  auth; /* -split, etc. */
+ };
+ 
  /* Node in AST. */
  struct	mdoc_node {
  	struct mdoc_node *parent; /* parent AST node */
***************
*** 321,328 ****
  	enum mdoc_endbody end;		/* BODY */
  
  	union {
! 		struct mdoc_bl Bl;
! 		struct mdoc_bd Bd;
  	} data;
  };
  
--- 344,353 ----
  	enum mdoc_endbody end;		/* BODY */
  
  	union {
! 		struct mdoc_an  An;
! 		struct mdoc_bd *Bd;
! 		struct mdoc_bf *Bf;
! 		struct mdoc_bl *Bl;
  	} data;
  };