Replacement of `Lb' in mdoc_action.c.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 441e407164f988a34dfeafb70264d45adb5ac5f7..c6633890f72b36108d2af5a84661f9bee4936d35 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.13 2009/07/06 13:04:52 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.18 2009/07/12 20:50:08 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -42,7 +42,7 @@ struct        mdoc {
 };
 
 enum   merr {
 };
 
 enum   merr {

-       ETAILWS,
+       ETAILWS = 0,

        ECOLEMPTY,
        EARGVPARM,
        EQUOTPARM,
        ECOLEMPTY,
        EARGVPARM,
        EQUOTPARM,


@@ -52,7 +52,6 @@ enum  merr {
        ENOCALL,
        EBODYPROL,
        EPROLBODY,
        ENOCALL,
        EBODYPROL,
        EPROLBODY,

-       ESPACE,

        ETEXTPROL,
        ENOBLANK,
        ETOOLONG,
        ETEXTPROL,
        ENOBLANK,
        ETOOLONG,


@@ -66,8 +65,9 @@ enum  merr {
        ELISTTYPE,
        EDISPTYPE,
        EMULTIDISP,
        ELISTTYPE,
        EDISPTYPE,
        EMULTIDISP,

-       ESECNAME,

        EMULTILIST,
        EMULTILIST,

+       ESECNAME,
+       ENAMESECINC,

        EARGREP,
        EBOOL,
        ECOLMIS,
        EARGREP,
        EBOOL,
        ECOLMIS,


@@ -77,27 +77,28 @@ enum        merr {
        ESECOOO,
        ESECREP,
        EBADSTAND,
        ESECOOO,
        ESECREP,
        EBADSTAND,

-       ENAMESECINC,

        ENOMULTILINE,
        EMULTILINE,
        ENOLINE,
        EPROLOOO,
        EPROLREP,
        EBADMSEC,
        ENOMULTILINE,
        EMULTILINE,
        ENOLINE,
        EPROLOOO,
        EPROLREP,
        EBADMSEC,

+       EBADSEC,

        EFONT,
        EBADDATE,
        EFONT,
        EBADDATE,

+       ENUMFMT,

        ENOWIDTH,
        ENOWIDTH,

-       EBADSEC,

        EUTSNAME,
        EUTSNAME,

-       ENUMFMT,

        EOBS,
        EMACPARM,
        EIMPBRK,
        EIGNE,
        EOPEN,
        EOBS,
        EMACPARM,
        EIMPBRK,
        EIGNE,
        EOPEN,

-       EQUOT,
+       EQUOTPHR,

        ENOCTX,
        ENOCTX,

-       ENOPARMS
+       ESPACE,
+       ELIB,
+       MERRMAX

 };
 
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \
 };
 
 #define        MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \


@@ -123,9 +124,9 @@ __BEGIN_DECLS
 #define                  mdoc_pwarn(m, l, p, t) \
                  mdoc_err((m), (l), (p), 0, (t))
 #define                  mdoc_nerr(m, n, t) \
 #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))
                  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 *, ...);
 
 int              mdoc_err(struct mdoc *, int, int, int, enum merr);
 int              mdoc_verr(struct mdoc *, int, int, const char *, ...);


@@ -153,6 +154,9 @@ enum        mdoc_sec  mdoc_atosec(const char *);
 time_t           mdoc_atotime(const char *);
 
 size_t           mdoc_macro2len(int);
 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 *);
 const char      *mdoc_a2arch(const char *);
 const char      *mdoc_a2vol(const char *);
 const char      *mdoc_a2msec(const char *);