Ugly fix for `Bl' or `Bd' causing badness when nested in `Bl -hang' lists.

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 6a92bcb6f761147635748aa19506abe375ba47dc..5a86094dcd82d50f464d88041bd3d64cd9f75388 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.14 2009/07/07 09:29:15 kristaps Exp $ */
+/*     $Id: libmdoc.h,v 1.21 2009/07/20 14:09:38 kristaps Exp $ */

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


@@ -43,8 +43,6 @@ struct        mdoc {
 
 enum   merr {
        ETAILWS = 0,
 
 enum   merr {
        ETAILWS = 0,

-       ECOLEMPTY,
-       EARGVPARM,

        EQUOTPARM,
        EQUOTTERM,
        EMALLOC,
        EQUOTPARM,
        EQUOTTERM,
        EMALLOC,


@@ -97,6 +95,7 @@ enum  merr {
        EQUOTPHR,
        ENOCTX,
        ESPACE,
        EQUOTPHR,
        ENOCTX,
        ESPACE,

+       ELIB,

        MERRMAX
 };
 
        MERRMAX
 };
 


@@ -123,9 +122,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 +152,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 *);


@@ -171,6 +173,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 **);
 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)
 #define        ARGS_ERROR      (-1)
 #define        ARGS_EOLN       (0)
 #define        ARGS_WORD       (1)