===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/libman.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/mandoc/libman.h	2009/12/22 23:58:00	1.11
--- src/usr.bin/mandoc/libman.h	2010/03/25 23:23:01	1.12
***************
*** 1,4 ****
! /*	$Id: libman.h,v 1.11 2009/12/22 23:58:00 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: libman.h,v 1.12 2010/03/25 23:23:01 schwarze Exp $ */
  /*
   * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 30,38 ****
  	int		 pflags;
  	int		 flags;
  #define	MAN_HALT	(1 << 0)
! #define	MAN_ELINE	(1 << 1) 	/* Next-line element scope. */
! #define	MAN_BLINE	(1 << 2) 	/* Next-line block scope. */
! #define	MAN_LITERAL	(1 << 3)	/* Literal input. */
  	enum man_next	 next;
  	struct man_node	*last;
  	struct man_node	*first;
--- 30,39 ----
  	int		 pflags;
  	int		 flags;
  #define	MAN_HALT	(1 << 0)
! #define	MAN_ELINE	(1 << 1) /* Next-line element scope. */
! #define	MAN_BLINE	(1 << 2) /* Next-line block scope. */
! #define	MAN_ILINE	(1 << 3) /* Ignored in next-line scope. */
! #define	MAN_LITERAL	(1 << 4) /* Literal input. */
  	enum man_next	 next;
  	struct man_node	*last;
  	struct man_node	*first;
***************
*** 44,49 ****
--- 45,51 ----
  	WMSEC,
  	WDATE,
  	WLNSCOPE,
+ 	WLNSCOPE2,
  	WTSPACE,
  	WTQUOTE,
  	WNODATA,
***************
*** 70,75 ****
--- 72,78 ----
  #define	MAN_SCOPED	 (1 << 0)
  #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(). */
  };
  
  extern	const struct man_macro *const man_macros;
***************
*** 92,97 ****
--- 95,101 ----
  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 *);