===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.39
retrieving revision 1.47
diff -u -p -r1.39 -r1.47
--- mandoc/libmdoc.h	2010/05/08 07:30:19	1.39
+++ mandoc/libmdoc.h	2010/05/15 16:24:37	1.47
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.39 2010/05/08 07:30:19 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.47 2010/05/15 16:24:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,9 +28,12 @@ struct	mdoc {
 	void		 *data;
 	struct mdoc_cb	  cb;
 	int		  flags;
-#define	MDOC_HALT	 (1 << 0)	/* Error in parse. Halt. */
-#define	MDOC_LITERAL	 (1 << 1)	/* In a literal scope. */
-#define	MDOC_PBODY	 (1 << 2)	/* In the document body. */
+#define	MDOC_HALT	 (1 << 0) /* error in parse: halt */
+#define	MDOC_LITERAL	 (1 << 1) /* in a literal scope */
+#define	MDOC_PBODY	 (1 << 2) /* in the document body */
+#define	MDOC_NEWLINE	 (1 << 3) /* first macro/text in a line */
+#define	MDOC_PHRASELIT	 (1 << 4) /* literal within a partila phrase */
+#define	MDOC_PPHRASE	 (1 << 5) /* within a partial phrase */
 	int		  pflags;
 	enum mdoc_next	  next;
 	struct mdoc_node *last;
@@ -78,7 +81,6 @@ enum	merr {
 	EPROLOOO,
 	EPROLREP,
 	EBADMSEC,
-	EBADSEC,
 	EFONT,
 	EBADDATE,
 	ENUMFMT,
@@ -118,7 +120,8 @@ enum	margserr {
 	ARGS_PUNCT,
 	ARGS_QWORD,
 	ARGS_PHRASE,
-	ARGS_PPHRASE
+	ARGS_PPHRASE,
+	ARGS_PEND
 };
 
 enum	margverr {
@@ -128,6 +131,13 @@ enum	margverr {
 	ARGV_WORD
 };
 
+enum	mdelim {
+	DELIM_NONE = 0,
+	DELIM_OPEN,
+	DELIM_MIDDLE,
+	DELIM_CLOSE
+};
+
 extern	const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
@@ -158,10 +168,10 @@ int		  mdoc_body_alloc(struct mdoc *, int, int, enum m
 void		  mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void		  mdoc_hash_init(void);
 enum mdoct	  mdoc_hash_find(const char *);
-int		  mdoc_iscdelim(char);
-int		  mdoc_isdelim(const char *);
+enum mdelim	  mdoc_iscdelim(char);
+enum mdelim	  mdoc_isdelim(const char *);
 size_t		  mdoc_isescape(const char *);
-enum	mdoc_sec  mdoc_atosec(const char *);
+enum	mdoc_sec  mdoc_str2sec(const char *);
 time_t		  mdoc_atotime(const char *);
 size_t		  mdoc_macro2len(enum mdoct);
 const char	 *mdoc_a2att(const char *);
@@ -184,9 +194,9 @@ enum margserr	  mdoc_args(struct mdoc *, int,
 			int *, char *, enum mdoct, char **);
 enum margserr	  mdoc_zargs(struct mdoc *, int, 
 			int *, char *, int, char **);
-#define	ARGS_DELIM	(1 << 1)	/* See args(). */
-#define	ARGS_TABSEP	(1 << 2)	/* See args(). */
-#define	ARGS_NOWARN	(1 << 3)	/* See args(). */
+#define	ARGS_DELIM	(1 << 1)
+#define	ARGS_TABSEP	(1 << 2)
+#define	ARGS_NOWARN	(1 << 3)
 
 int		  mdoc_macroend(struct mdoc *);