===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- mandoc/libman.h	2010/03/24 20:10:53	1.27
+++ mandoc/libman.h	2010/03/29 10:10:35	1.30
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.27 2010/03/24 20:10:53 kristaps Exp $ */
+/*	$Id: libman.h,v 1.30 2010/03/29 10:10:35 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,14 +27,17 @@ enum	man_next {
 struct	man {
 	void		*data;
 	struct man_cb	 cb;
-	int		 pflags;
-	int		 flags;
-#define	MAN_HALT	(1 << 0)
+	int		 pflags; /* parse flags (see man.h) */
+	int		 svflags; /* flags saved during roff blocks */
+	int		 flags; /* parse flags */
+#define	MAN_HALT	(1 << 0) /* badness happened: die */
 #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. */
+#define	MAN_BPLINE	(1 << 5)
 	enum man_next	 next;
+	enum man_next	 svnext;
 	struct man_node	*last;
 	struct man_node	*first;
 	struct man_meta	 meta;
@@ -61,6 +64,8 @@ enum	merr {
 	WOLITERAL,
 	WNLITERAL,
 	WROFFNEST,
+	WROFFSCOPE,
+	WTITLECASE,
 	WERRMAX
 };
 
@@ -111,7 +116,8 @@ 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 *);
+int		  man_unscope(struct man *, 
+			const struct man_node *, enum merr);
 
 __END_DECLS