===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.80
retrieving revision 1.83
diff -u -p -r1.80 -r1.83
--- mandoc/libman.h	2017/04/24 23:06:17	1.80
+++ mandoc/libman.h	2018/08/26 16:21:23	1.83
@@ -1,7 +1,7 @@
-/*	$Id: libman.h,v 1.80 2017/04/24 23:06:17 schwarze Exp $ */
+/*	$Id: libman.h,v 1.83 2018/08/26 16:21:23 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2018 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
@@ -26,16 +26,16 @@
 struct	man_macro {
 	void		(*fp)(MACRO_PROT_ARGS);
 	int		  flags;
-#define	MAN_SCOPED	 (1 << 0)  /* Optional next-line scope. */
-#define	MAN_NSCOPED	 (1 << 1)  /* Allowed in next-line element scope. */
-#define	MAN_BSCOPE	 (1 << 2)  /* Break next-line block scope. */
-#define	MAN_JOIN	 (1 << 3)  /* Join arguments together. */
+#define	MAN_BSCOPED	 (1 << 0)  /* Optional next-line block scope. */
+#define	MAN_ESCOPED	 (1 << 1)  /* Optional next-line element scope. */
+#define	MAN_NSCOPED	 (1 << 2)  /* Allowed in next-line element scope. */
+#define	MAN_XSCOPE	 (1 << 3)  /* Exit next-line block scope. */
+#define	MAN_JOIN	 (1 << 4)  /* Join arguments together. */
 };
 
-extern	const struct man_macro *const man_macros;
+const struct man_macro *man_macro(enum roff_tok);
 
-
-enum roff_tok	  man_hash_find(const char *);
+void		  man_descope(struct roff_man *, int, int, char *);
 void		  man_node_validate(struct roff_man *);
 void		  man_state(struct roff_man *, struct roff_node *);
 void		  man_unscope(struct roff_man *, const struct roff_node *);