summaryrefslogtreecommitdiffstats
path: root/contrib/mdocml/libmandoc.h
diff options
context:
space:
mode:
authoruqs <uqs@FreeBSD.org>2014-02-01 09:27:57 +0000
committeruqs <uqs@FreeBSD.org>2014-02-01 09:27:57 +0000
commit0745c80c73080aef68ab01f4ccae31a6c48c2b46 (patch)
tree9d4061e26aeee7d0dac2def4bad4d27a2c9427d9 /contrib/mdocml/libmandoc.h
parent06ee51ac6dc8af2b50a8c84976224a439b815071 (diff)
parent7ae17de732546145e4a582d503a54b9870ada39c (diff)
downloadFreeBSD-src-0745c80c73080aef68ab01f4ccae31a6c48c2b46.zip
FreeBSD-src-0745c80c73080aef68ab01f4ccae31a6c48c2b46.tar.gz
Merge mdocml v1.12.3 into head
MFC after: 2 weeks
Diffstat (limited to 'contrib/mdocml/libmandoc.h')
-rw-r--r--contrib/mdocml/libmandoc.h22
1 files changed, 9 insertions, 13 deletions
diff --git a/contrib/mdocml/libmandoc.h b/contrib/mdocml/libmandoc.h
index de42288..3c005e1 100644
--- a/contrib/mdocml/libmandoc.h
+++ b/contrib/mdocml/libmandoc.h
@@ -1,6 +1,7 @@
-/* $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
@@ -29,11 +30,6 @@ enum rofferr {
ROFF_ERR /* badness: puke and stop */
};
-enum regs {
- REG_nS = 0, /* nS register */
- REG__MAX
-};
-
__BEGIN_DECLS
struct roff;
@@ -47,12 +43,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_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 *);
@@ -68,15 +63,16 @@ 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 *,
OpenPOWER on IntegriCloud