One of the WARNING messages has to use the word "section" twice in two

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index d3cc643ec9ae176f9121e96ba28711b2ce933926..9b3ffee17918c42a6bd85a4abb3f5ab25661f229 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,6 +1,6 @@
-/*     $Id: libmandoc.h,v 1.15 2011/03/22 10:02:50 kristaps Exp $ */
+/*     $Id: libmandoc.h,v 1.32 2012/11/19 17:57:23 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,42 +29,11 @@ enum        rofferr {
        ROFF_ERR /* badness: puke and stop */
 };
 
-/*
- * Available registers (set in libroff, accessed elsewhere).
- */
 enum   regs {
-       REG_nS = 0,
+       REG_nS = 0, /* nS register */
        REG__MAX
 };
 
-/*
- * A register (struct reg) can consist of many types: this consists of
- * normalised types from the original string form.
- */
-union  regval {
-       unsigned  u; /* unsigned integer */
-};
-
-/*
- * A single register entity.  If "set" is zero, the value of the
- * register should be the default one, which is per-register.  It's
- * assumed that callers know which type in "v" corresponds to which
- * register value.
- */
-struct reg {
-       int               set; /* whether set or not */
-       union regval      v; /* parsed data */
-};
-
-/*
- * The primary interface to setting register values is in libroff,
- * although libmdoc and libman from time to time will manipulate
- * registers (such as `.Sh SYNOPSIS' enabling REG_nS).
- */
-struct regset {
-       struct reg        regs[REG__MAX];
-};
-
 __BEGIN_DECLS
 
 struct roff;
@@ -75,15 +44,14 @@ void                 mandoc_msg(enum mandocerr, struct mparse *,
                        int, int, const char *);
 void            mandoc_vmsg(enum mandocerr, struct mparse *, 
                        int, int, const char *, ...);
-int             mandoc_special(char *);
-char            *mandoc_strdup(const char *);
-char            *mandoc_getarg(struct mparse *, char **, int, int *);
-char            *mandoc_normdate(struct mparse *, char *, int, int);
+char           *mandoc_getarg(struct mparse *, char **, int, int *);
+char           *mandoc_normdate(struct mparse *, char *, int, int);
 int             mandoc_eos(const char *, size_t, int);
-int             mandoc_hyph(const char *, const char *);
+int             mandoc_strntoi(const char *, size_t, int);
+const char     *mandoc_a2msec(const char*);
 
 void            mdoc_free(struct mdoc *);
-struct mdoc    *mdoc_alloc(struct regset *, struct mparse *);
+struct mdoc    *mdoc_alloc(struct roff *, struct mparse *, char *);
 void            mdoc_reset(struct mdoc *);
 int             mdoc_parseln(struct mdoc *, int, char *, int);
 int             mdoc_endparse(struct mdoc *);
@@ -91,7 +59,7 @@ int            mdoc_addspan(struct mdoc *, const struct tbl_span *);
 int             mdoc_addeqn(struct mdoc *, const struct eqn *);
 
 void            man_free(struct man *);
-struct man     *man_alloc(struct regset *, struct mparse *);
+struct man     *man_alloc(struct roff *, struct mparse *);
 void            man_reset(struct man *);
 int             man_parseln(struct man *, int, char *, int);
 int             man_endparse(struct man *);
@@ -99,15 +67,26 @@ int          man_addspan(struct man *, const struct tbl_span *);
 int             man_addeqn(struct man *, const struct eqn *);
 
 void            roff_free(struct roff *);
-struct roff    *roff_alloc(struct regset *, struct mparse *);
+struct roff    *roff_alloc(enum mparset, struct mparse *);
 void            roff_reset(struct roff *);
 enum rofferr    roff_parseln(struct roff *, int, 
                        char **, size_t *, int, int *);
-void             roff_endparse(struct roff *);
-
-const struct tbl_span *roff_span(const struct roff *);
-const struct eqn *roff_eqn(const struct roff *);
+void            roff_endparse(struct roff *);
+int             roff_regisset(const struct roff *, enum regs);
+unsigned int    roff_regget(const struct roff *, enum regs);
+void            roff_regunset(struct roff *, enum regs);
+char           *roff_strdup(const struct roff *, const char *);
+int             roff_getcontrol(const struct roff *, 
+                       const char *, int *);
+#if 0
+char            roff_eqndelim(const struct roff *);
+void            roff_openeqn(struct roff *, const char *, 
+                       int, int, const char *);
+int             roff_closeeqn(struct roff *);
+#endif
 
+const struct tbl_span  *roff_span(const struct roff *);
+const struct eqn       *roff_eqn(const struct roff *);
 
 __END_DECLS