Print this page
5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

@@ -1,8 +1,9 @@
-/*      $Id: libmandoc.h,v 1.29 2011/12/02 01:37:14 schwarze Exp $ */
+/*      $Id: libmandoc.h,v 1.35 2013/12/15 21:23:52 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

@@ -27,15 +28,10 @@
         ROFF_TBL, /* a table row was successfully parsed */
         ROFF_EQN, /* an equation was successfully parsed */
         ROFF_ERR /* badness: puke and stop */
 };
 
-enum    regs {
-        REG_nS = 0, /* nS register */
-        REG__MAX
-};
-
 __BEGIN_DECLS
 
 struct  roff;
 struct  mdoc;
 struct  man;

@@ -45,16 +41,15 @@
 void             mandoc_vmsg(enum mandocerr, struct mparse *, 
                         int, int, const char *, ...);
 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_getcontrol(const char *, int *);
 int              mandoc_strntoi(const char *, size_t, int);
 const char      *mandoc_a2msec(const char*);
 
 void             mdoc_free(struct mdoc *);
-struct  mdoc    *mdoc_alloc(struct roff *, 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 *);
 int              mdoc_addspan(struct mdoc *, const struct tbl_span *);
 int              mdoc_addeqn(struct mdoc *, const struct eqn *);

@@ -66,19 +61,20 @@
 int              man_endparse(struct man *);
 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 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 *);
-int              roff_regisset(const struct roff *, enum regs);
-unsigned int     roff_regget(const struct roff *, enum regs);
-void             roff_regunset(struct roff *, enum regs);
+void             roff_setreg(struct roff *, const char *, int, char sign);
+int              roff_getreg(const struct roff *, const char *);
 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 *);