Use a character-table for quick per-character substitution in `tr'. As

[mandoc.git] / libmandoc.h

diff --git a/libmandoc.h b/libmandoc.h
index 23a362e66bd10b9cf6721b2d34228591f00fcf28..bedf0497247c9a0ca47463f5cd0fc145273abd5f 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.22 2011/07/17 11:14:53 kristaps Exp $ */
+/*     $Id: libmandoc.h,v 1.28 2011/07/28 14:17:11 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -34,35 +34,6 @@ enum regs {
        REG__MAX
 };
 
-/*
- * A register (struct reg) can consist of many types: this consists of
- * normalised types from the original string form.  For the time being,
- * there's only an unsigned integer type.
- */
-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;
@@ -76,12 +47,11 @@ void                 mandoc_vmsg(enum mandocerr, struct mparse *,
 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_getcontrol(const char *, int *);
-int             mandoc_strntou(const char *, size_t, int);
+int             mandoc_strntoi(const char *, size_t, int);
 
 void            mdoc_free(struct mdoc *);
-struct mdoc    *mdoc_alloc(struct regset *, struct mparse *);
+struct mdoc    *mdoc_alloc(struct roff *, struct mparse *);
 void            mdoc_reset(struct mdoc *);
 int             mdoc_parseln(struct mdoc *, int, char *, int);
 int             mdoc_endparse(struct mdoc *);
@@ -89,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 *);
@@ -97,11 +67,21 @@ 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(struct mparse *);
 void            roff_reset(struct roff *);
 enum rofferr    roff_parseln(struct roff *, int, 
                        char **, size_t *, int, int *);
 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 *);
+#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 *);