=================================================================== RCS file: /cvs/mandoc/libmandoc.h,v retrieving revision 1.41 retrieving revision 1.46 diff -u -p -r1.41 -r1.46 --- mandoc/libmandoc.h 2014/04/20 16:46:04 1.41 +++ mandoc/libmandoc.h 2014/10/28 17:36:19 1.46 @@ -1,4 +1,4 @@ -/* $Id: libmandoc.h,v 1.41 2014/04/20 16:46:04 schwarze Exp $ */ +/* $Id: libmandoc.h,v 1.46 2014/10/28 17:36:19 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons * Copyright (c) 2013, 2014 Ingo Schwarze @@ -30,6 +30,12 @@ enum rofferr { ROFF_ERR /* badness: puke and stop */ }; +struct buf { + char *buf; + size_t sz; + size_t offs; +}; + __BEGIN_DECLS struct roff; @@ -50,7 +56,8 @@ 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 *, char *, int); +struct mdoc *mdoc_alloc(struct roff *, struct mparse *, + const char *, int); void mdoc_reset(struct mdoc *); int mdoc_parseln(struct mdoc *, int, char *, int); int mdoc_endparse(struct mdoc *); @@ -65,8 +72,11 @@ int man_endparse(struct man *); int man_addspan(struct man *, const struct tbl_span *); int man_addeqn(struct man *, const struct eqn *); +int preconv_cue(const struct buf *); +int preconv_encode(struct buf *, struct buf *, int *); + void roff_free(struct roff *); -struct roff *roff_alloc(struct mparse *, int); +struct roff *roff_alloc(struct mparse *, const struct mchars *, int); void roff_reset(struct roff *); enum rofferr roff_parseln(struct roff *, int, char **, size_t *, int, int *); @@ -76,12 +86,7 @@ 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 *); -#endif +int roff_getformat(const struct roff *); const struct tbl_span *roff_span(const struct roff *); const struct eqn *roff_eqn(const struct roff *);