===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.63
retrieving revision 1.68
diff -u -p -r1.63 -r1.68
--- mandoc/mdoc.h	2009/07/12 20:24:24	1.63
+++ mandoc/mdoc.h	2009/08/20 13:22:48	1.68
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.h,v 1.63 2009/07/12 20:24:24 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.68 2009/08/20 13:22:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -147,7 +147,9 @@
 #define	MDOC_En	 	 115
 #define	MDOC_Dx	 	 116
 #define	MDOC__Q	 	 117
-#define	MDOC_MAX	 118
+#define MDOC_br		 118
+#define MDOC_sp		 119
+#define	MDOC_MAX	 120
 
 /* What follows is a list of ALL possible macro arguments. */
 
@@ -198,8 +200,9 @@ enum	mdoc_sec {
 	SEC_SYNOPSIS,
 	SEC_DESCRIPTION,
 	SEC_IMPLEMENTATION,
+	/* FIXME: EXIT STATUS */
 	SEC_RETURN_VALUES,
-	SEC_ENVIRONMENT,
+	SEC_ENVIRONMENT, 
 	SEC_FILES,
 	SEC_EXAMPLES,
 	SEC_DIAGNOSTICS,
@@ -211,6 +214,7 @@ enum	mdoc_sec {
 	SEC_AUTHORS,
 	SEC_CAVEATS,
 	SEC_BUGS,
+	/* FIXME: SECURITY CONSIDERATIONS */
 	SEC_CUSTOM		/* User-defined. */
 };
 
@@ -256,7 +260,6 @@ struct	mdoc_node {
 	enum mdoc_type	  type;
 	enum mdoc_sec	  sec;
 
-	/* FIXME: union/struct this with #defines. */
 	struct mdoc_arg	 *args; 	/* BLOCK/ELEM */
 	struct mdoc_node *head;		/* BLOCK */
 	struct mdoc_node *body;		/* BLOCK */
@@ -270,7 +273,7 @@ struct	mdoc_node {
 #define	MDOC_IGN_CHARS	 (1 << 3) /* Ignore disallowed chars. */
 
 /* Call-backs for parse messages. */
-/* FIXME: unify somehow with man_cb. */
+
 struct	mdoc_cb {
 	int	(*mdoc_err)(void *, int, int, const char *);
 	int	(*mdoc_warn)(void *, int, int, const char *);
@@ -294,9 +297,6 @@ int	 	  mdoc_parseln(struct mdoc *, int, char *buf);
 const struct mdoc_node *mdoc_node(const struct mdoc *);
 const struct mdoc_meta *mdoc_meta(const struct mdoc *);
 int		  mdoc_endparse(struct mdoc *);
-
-const char	 *mdoc_a2lib(const char *);
-const char	 *mdoc_a2st(const char *);
 
 __END_DECLS