Print this page
Update to 1.12.3.
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/mandoc/libmandoc.h
+++ new/usr/src/cmd/mandoc/libmandoc.h
1 -/* $Id: libmandoc.h,v 1.29 2011/12/02 01:37:14 schwarze Exp $ */
1 +/* $Id: libmandoc.h,v 1.35 2013/12/15 21:23:52 schwarze Exp $ */
2 2 /*
3 - * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
3 + * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
4 + * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
4 5 *
5 6 * Permission to use, copy, modify, and distribute this software for any
6 7 * purpose with or without fee is hereby granted, provided that the above
7 8 * copyright notice and this permission notice appear in all copies.
8 9 *
9 10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 17 */
17 18 #ifndef LIBMANDOC_H
18 19 #define LIBMANDOC_H
19 20
20 21 enum rofferr {
21 22 ROFF_CONT, /* continue processing line */
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
22 23 ROFF_RERUN, /* re-run roff interpreter with offset */
23 24 ROFF_APPEND, /* re-run main parser, appending next line */
24 25 ROFF_REPARSE, /* re-run main parser on the result */
25 26 ROFF_SO, /* include another file */
26 27 ROFF_IGN, /* ignore current line */
27 28 ROFF_TBL, /* a table row was successfully parsed */
28 29 ROFF_EQN, /* an equation was successfully parsed */
29 30 ROFF_ERR /* badness: puke and stop */
30 31 };
31 32
32 -enum regs {
33 - REG_nS = 0, /* nS register */
34 - REG__MAX
35 -};
36 -
37 33 __BEGIN_DECLS
38 34
39 35 struct roff;
40 36 struct mdoc;
41 37 struct man;
42 38
43 39 void mandoc_msg(enum mandocerr, struct mparse *,
44 40 int, int, const char *);
45 41 void mandoc_vmsg(enum mandocerr, struct mparse *,
46 42 int, int, const char *, ...);
47 43 char *mandoc_getarg(struct mparse *, char **, int, int *);
48 44 char *mandoc_normdate(struct mparse *, char *, int, int);
49 45 int mandoc_eos(const char *, size_t, int);
50 -int mandoc_getcontrol(const char *, int *);
51 46 int mandoc_strntoi(const char *, size_t, int);
52 47 const char *mandoc_a2msec(const char*);
53 48
54 49 void mdoc_free(struct mdoc *);
55 -struct mdoc *mdoc_alloc(struct roff *, struct mparse *);
50 +struct mdoc *mdoc_alloc(struct roff *, struct mparse *, char *);
56 51 void mdoc_reset(struct mdoc *);
57 52 int mdoc_parseln(struct mdoc *, int, char *, int);
58 53 int mdoc_endparse(struct mdoc *);
59 54 int mdoc_addspan(struct mdoc *, const struct tbl_span *);
60 55 int mdoc_addeqn(struct mdoc *, const struct eqn *);
61 56
62 57 void man_free(struct man *);
63 58 struct man *man_alloc(struct roff *, struct mparse *);
64 59 void man_reset(struct man *);
65 60 int man_parseln(struct man *, int, char *, int);
66 61 int man_endparse(struct man *);
67 62 int man_addspan(struct man *, const struct tbl_span *);
68 63 int man_addeqn(struct man *, const struct eqn *);
69 64
70 65 void roff_free(struct roff *);
71 -struct roff *roff_alloc(struct mparse *);
66 +struct roff *roff_alloc(enum mparset, struct mparse *);
72 67 void roff_reset(struct roff *);
73 68 enum rofferr roff_parseln(struct roff *, int,
74 69 char **, size_t *, int, int *);
75 70 void roff_endparse(struct roff *);
76 -int roff_regisset(const struct roff *, enum regs);
77 -unsigned int roff_regget(const struct roff *, enum regs);
78 -void roff_regunset(struct roff *, enum regs);
71 +void roff_setreg(struct roff *, const char *, int, char sign);
72 +int roff_getreg(const struct roff *, const char *);
79 73 char *roff_strdup(const struct roff *, const char *);
74 +int roff_getcontrol(const struct roff *,
75 + const char *, int *);
80 76 #if 0
81 77 char roff_eqndelim(const struct roff *);
82 78 void roff_openeqn(struct roff *, const char *,
83 79 int, int, const char *);
84 80 int roff_closeeqn(struct roff *);
85 81 #endif
86 82
87 83 const struct tbl_span *roff_span(const struct roff *);
88 84 const struct eqn *roff_eqn(const struct roff *);
89 85
90 86 __END_DECLS
91 87
92 88 #endif /*!LIBMANDOC_H*/
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX