===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/libman.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/mandoc/libman.h	2010/05/16 00:54:03	1.19
--- src/usr.bin/mandoc/libman.h	2010/05/23 22:45:00	1.20
***************
*** 1,4 ****
! /*	$Id: libman.h,v 1.19 2010/05/16 00:54:03 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: libman.h,v 1.20 2010/05/23 22:45:00 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 26,32 ****
  
  struct	man {
  	void		*data;
! 	struct man_cb	 cb;
  	int		 pflags; /* parse flags (see man.h) */
  	int		 flags; /* parse flags */
  #define	MAN_HALT	(1 << 0) /* badness happened: die */
--- 26,32 ----
  
  struct	man {
  	void		*data;
! 	mandocmsg	 msg;
  	int		 pflags; /* parse flags (see man.h) */
  	int		 flags; /* parse flags */
  #define	MAN_HALT	(1 << 0) /* badness happened: die */
***************
*** 42,71 ****
  	struct man_meta	 meta;
  };
  
- enum	merr {
- 	WNPRINT = 0,
- 	WDATE,
- 	WLNSCOPE,
- 	WLNSCOPE2,
- 	WTSPACE,
- 	WTQUOTE,
- 	WNODATA,
- 	WNOTITLE,
- 	WESCAPE,
- 	WNUMFMT,
- 	WHEADARGS,
- 	WBODYARGS,
- 	WNHEADARGS,
- 	WMACROFORM,
- 	WEXITSCOPE,
- 	WNOSCOPE,
- 	WOLITERAL,
- 	WNLITERAL,
- 	WTITLECASE,
- 	WBADCOMMENT,
- 	WERRMAX
- };
- 
  #define	MACRO_PROT_ARGS	  struct man *m, enum mant tok, int line, \
  			  int ppos, int *pos, char *buf
  
--- 42,47 ----
***************
*** 83,97 ****
  
  __BEGIN_DECLS
  
! #define		  man_perr(m, l, p, t) \
! 		  man_err((m), (l), (p), 1, (t))
! #define		  man_pwarn(m, l, p, t) \
! 		  man_err((m), (l), (p), 0, (t))
! #define		  man_nerr(m, n, t) \
! 		  man_err((m), (n)->line, (n)->pos, 1, (t))
! #define		  man_nwarn(m, n, t) \
! 		  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);
--- 59,68 ----
  
  __BEGIN_DECLS
  
! #define		  man_pmsg(m, l, p, t) \
! 		  (*(m)->msg)((t), (m)->data, (l), (p), NULL)
! #define		  man_nmsg(m, n, t) \
! 		  (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
  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);
***************
*** 106,121 ****
  #define	ARGS_EOLN	(0)
  #define	ARGS_WORD	(1)
  #define	ARGS_QWORD	(1)
! int		  man_err(struct man *, int, int, int, enum merr);
! int		  man_vwarn(struct man *, int, int, const char *, ...);
! int		  man_verr(struct man *, int, int, const char *, ...);
  int		  man_valid_post(struct man *);
  int		  man_valid_pre(struct man *, const struct man_node *);
  int		  man_action_post(struct man *);
  int		  man_action_pre(struct man *, struct man_node *);
  int		  man_unscope(struct man *, 
! 			const struct man_node *, enum merr);
! int		  man_brace_close(struct man *, int, int);
  
  __END_DECLS
  
--- 77,90 ----
  #define	ARGS_EOLN	(0)
  #define	ARGS_WORD	(1)
  #define	ARGS_QWORD	(1)
! int		  man_vmsg(struct man *, enum mandocerr,
! 			int, int, const char *, ...);
  int		  man_valid_post(struct man *);
  int		  man_valid_pre(struct man *, const struct man_node *);
  int		  man_action_post(struct man *);
  int		  man_action_pre(struct man *, struct man_node *);
  int		  man_unscope(struct man *, 
! 			const struct man_node *, enum mandocerr);
  
  __END_DECLS