===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/libmdoc.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -r1.80 -r1.81
*** src/usr.bin/mandoc/libmdoc.h	2017/02/16 02:59:42	1.80
--- src/usr.bin/mandoc/libmdoc.h	2017/04/24 23:06:09	1.81
***************
*** 1,7 ****
! /*	$OpenBSD: libmdoc.h,v 1.80 2017/02/16 02:59:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /*	$OpenBSD: libmdoc.h,v 1.81 2017/04/24 23:06:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 17,23 ****
   */
  
  #define	MACRO_PROT_ARGS	struct roff_man *mdoc, \
! 			int tok, \
  			int line, \
  			int ppos, \
  			int *pos, \
--- 17,23 ----
   */
  
  #define	MACRO_PROT_ARGS	struct roff_man *mdoc, \
! 			enum roff_tok tok, \
  			int line, \
  			int ppos, \
  			int *pos, \
***************
*** 65,87 ****
  
  void		  mdoc_macro(MACRO_PROT_ARGS);
  void		  mdoc_elem_alloc(struct roff_man *, int, int,
! 			int, struct mdoc_arg *);
  struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,
! 			int, struct mdoc_arg *);
! void		  mdoc_tail_alloc(struct roff_man *, int, int, int);
! struct roff_node *mdoc_endbody_alloc(struct roff_man *, int, int, int,
! 			struct roff_node *);
  void		  mdoc_node_relink(struct roff_man *, struct roff_node *);
  void		  mdoc_node_validate(struct roff_man *);
  void		  mdoc_state(struct roff_man *, struct roff_node *);
  void		  mdoc_state_reset(struct roff_man *);
! int		  mdoc_hash_find(const char *);
  const char	 *mdoc_a2arch(const char *);
  const char	 *mdoc_a2att(const char *);
  enum roff_sec	  mdoc_a2sec(const char *);
  const char	 *mdoc_a2st(const char *);
! void		  mdoc_argv(struct roff_man *, int, int,
  			struct mdoc_arg **, int *, char *);
  enum margserr	  mdoc_args(struct roff_man *, int,
! 			int *, char *, int, char **);
  enum mdelim	  mdoc_isdelim(const char *);
--- 65,88 ----
  
  void		  mdoc_macro(MACRO_PROT_ARGS);
  void		  mdoc_elem_alloc(struct roff_man *, int, int,
! 			enum roff_tok, struct mdoc_arg *);
  struct roff_node *mdoc_block_alloc(struct roff_man *, int, int,
! 			enum roff_tok, struct mdoc_arg *);
! void		  mdoc_tail_alloc(struct roff_man *, int, int,
! 			enum roff_tok);
! struct roff_node *mdoc_endbody_alloc(struct roff_man *, int, int,
! 			enum roff_tok, struct roff_node *);
  void		  mdoc_node_relink(struct roff_man *, struct roff_node *);
  void		  mdoc_node_validate(struct roff_man *);
  void		  mdoc_state(struct roff_man *, struct roff_node *);
  void		  mdoc_state_reset(struct roff_man *);
! enum roff_tok	  mdoc_hash_find(const char *);
  const char	 *mdoc_a2arch(const char *);
  const char	 *mdoc_a2att(const char *);
  enum roff_sec	  mdoc_a2sec(const char *);
  const char	 *mdoc_a2st(const char *);
! void		  mdoc_argv(struct roff_man *, int, enum roff_tok,
  			struct mdoc_arg **, int *, char *);
  enum margserr	  mdoc_args(struct roff_man *, int,
! 			int *, char *, enum roff_tok, char **);
  enum mdelim	  mdoc_isdelim(const char *);