===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.17
retrieving revision 1.22
diff -u -p -r1.17 -r1.22
--- mandoc/libmdoc.h	2009/07/12 20:30:35	1.17
+++ mandoc/libmdoc.h	2009/07/29 08:46:06	1.22
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.17 2009/07/12 20:30:35 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.22 2009/07/29 08:46:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -43,13 +43,10 @@ struct	mdoc {
 
 enum	merr {
 	ETAILWS = 0,
-	ECOLEMPTY,
-	EARGVPARM,
 	EQUOTPARM,
 	EQUOTTERM,
 	EMALLOC,
 	EARGVAL,	
-	ENOCALL,
 	EBODYPROL,
 	EPROLBODY,
 	ETEXTPROL,
@@ -90,13 +87,13 @@ enum	merr {
 	ENOWIDTH,
 	EUTSNAME,
 	EOBS,
-	EMACPARM,
 	EIMPBRK,
 	EIGNE,
 	EOPEN,
 	EQUOTPHR,
 	ENOCTX,
 	ESPACE,
+	ELIB,
 	MERRMAX
 };
 
@@ -154,6 +151,7 @@ time_t		  mdoc_atotime(const char *);
 
 size_t		  mdoc_macro2len(int);
 const char	 *mdoc_a2att(const char *);
+const char	 *mdoc_a2lib(const char *);
 const char	 *mdoc_a2st(const char *);
 const char	 *mdoc_a2arch(const char *);
 const char	 *mdoc_a2vol(const char *);
@@ -173,6 +171,8 @@ int		  mdoc_argv(struct mdoc *, int, int,
 void		  mdoc_argv_free(struct mdoc_arg *);
 int		  mdoc_args(struct mdoc *, int,
 			int *, char *, int, char **);
+int		  mdoc_zargs(struct mdoc *, int, 
+			int *, char *, char **);
 #define	ARGS_ERROR	(-1)
 #define	ARGS_EOLN	(0)
 #define	ARGS_WORD	(1)