=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.13 retrieving revision 1.25 diff -u -p -r1.13 -r1.25 --- mandoc/libmdoc.h 2009/07/06 13:04:52 1.13 +++ mandoc/libmdoc.h 2009/08/20 08:59:12 1.25 @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.25 2009/08/20 08:59:12 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -42,17 +42,13 @@ struct mdoc { }; enum merr { - ETAILWS, - ECOLEMPTY, - EARGVPARM, + ETAILWS = 0, EQUOTPARM, EQUOTTERM, EMALLOC, EARGVAL, - ENOCALL, EBODYPROL, EPROLBODY, - ESPACE, ETEXTPROL, ENOBLANK, ETOOLONG, @@ -66,8 +62,9 @@ enum merr { ELISTTYPE, EDISPTYPE, EMULTIDISP, - ESECNAME, EMULTILIST, + ESECNAME, + ENAMESECINC, EARGREP, EBOOL, ECOLMIS, @@ -77,30 +74,29 @@ enum merr { ESECOOO, ESECREP, EBADSTAND, - ENAMESECINC, ENOMULTILINE, EMULTILINE, ENOLINE, EPROLOOO, EPROLREP, EBADMSEC, + EBADSEC, EFONT, EBADDATE, + ENUMFMT, ENOWIDTH, - EBADSEC, EUTSNAME, - ENUMFMT, EOBS, - EMACPARM, EIMPBRK, EIGNE, EOPEN, - EQUOT, + EQUOTPHR, ENOCTX, - ENOPARMS + ELIB, + MERRMAX }; -#define MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \ +#define MACRO_PROT_ARGS struct mdoc *m, int tok, int line, \ int ppos, int *pos, char *buf struct mdoc_macro { @@ -123,9 +119,9 @@ __BEGIN_DECLS #define mdoc_pwarn(m, l, p, t) \ mdoc_err((m), (l), (p), 0, (t)) #define mdoc_nerr(m, n, t) \ - mdoc_err((m), (n)->line, (n)->pos, 0, (t)) -#define mdoc_nwarn(m, n, t) \ mdoc_err((m), (n)->line, (n)->pos, 1, (t)) +#define mdoc_nwarn(m, n, t) \ + mdoc_err((m), (n)->line, (n)->pos, 0, (t)) int mdoc_err(struct mdoc *, int, int, int, enum merr); int mdoc_verr(struct mdoc *, int, int, const char *, ...); @@ -153,6 +149,9 @@ enum mdoc_sec mdoc_atosec(const char *); 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 *); const char *mdoc_a2msec(const char *); @@ -171,13 +170,17 @@ 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 *, int, char **); +#define ARGS_DELIM (1 << 1) +#define ARGS_TABSEP (1 << 2) +#define ARGS_NOWARN (1 << 3) #define ARGS_ERROR (-1) #define ARGS_EOLN (0) #define ARGS_WORD (1) #define ARGS_PUNCT (2) #define ARGS_QWORD (3) #define ARGS_PHRASE (4) - int mdoc_macroend(struct mdoc *); __END_DECLS