===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/libman.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/mandoc/libman.h	2010/03/25 23:23:01	1.12
--- src/usr.bin/mandoc/libman.h	2010/03/26 01:22:05	1.13
***************
*** 1,4 ****
! /*	$Id: libman.h,v 1.12 2010/03/25 23:23:01 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: libman.h,v 1.13 2010/03/26 01:22:05 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 60,69 ****
  	WNOSCOPE,
  	WOLITERAL,
  	WNLITERAL,
  	WERRMAX
  };
  
! #define	MACRO_PROT_ARGS	  struct man *m, int tok, int line, \
  			  int ppos, int *pos, char *buf
  
  struct	man_macro {
--- 60,70 ----
  	WNOSCOPE,
  	WOLITERAL,
  	WNLITERAL,
+ 	WROFFNEST,
  	WERRMAX
  };
  
! #define	MACRO_PROT_ARGS	  struct man *m, enum mant tok, int line, \
  			  int ppos, int *pos, char *buf
  
  struct	man_macro {
***************
*** 73,78 ****
--- 74,80 ----
  #define	MAN_EXPLICIT	 (1 << 1)	/* See blk_imp(). */
  #define	MAN_FSCOPED	 (1 << 2)	/* See blk_imp(). */
  #define	MAN_NSCOPED	 (1 << 3)	/* See in_line_eoln(). */
+ #define	MAN_NOCLOSE	 (1 << 4)	/* See blk_exp(). */
  };
  
  extern	const struct man_macro *const man_macros;
***************
*** 89,103 ****
  		  man_err((m), (n)->line, (n)->pos, 0, (t))
  
  int		  man_word_alloc(struct man *, int, int, const char *);
! int		  man_block_alloc(struct man *, int, int, int);
! int		  man_head_alloc(struct man *, int, int, int);
! int		  man_body_alloc(struct man *, int, int, int);
! int		  man_elem_alloc(struct man *, int, int, int);
! void		  man_node_free(struct man_node *);
! void		  man_node_freelist(struct man_node *);
! void		  man_node_unlink(struct man *, struct man_node *);
  void		  man_hash_init(void);
! int		  man_hash_find(const char *);
  int		  man_macroend(struct man *);
  int		  man_args(struct man *, int, int *, char *, char **);
  #define	ARGS_ERROR	(-1)
--- 91,103 ----
  		  man_err((m), (n)->line, (n)->pos, 0, (t))
  
  int		  man_word_alloc(struct man *, int, int, const char *);
! int		  man_block_alloc(struct man *, int, int, enum mant);
! int		  man_head_alloc(struct man *, int, int, enum mant);
! int		  man_body_alloc(struct man *, int, int, enum mant);
! int		  man_elem_alloc(struct man *, int, int, enum mant);
! void		  man_node_delete(struct man *, struct man_node *);
  void		  man_hash_init(void);
! enum	mant	  man_hash_find(const char *);
  int		  man_macroend(struct man *);
  int		  man_args(struct man *, int, int *, char *, char **);
  #define	ARGS_ERROR	(-1)