summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc/man.c
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2011-09-18 10:25:28 +0000
committerschwarze <schwarze@openbsd.org>2011-09-18 10:25:28 +0000
commitf8618d9964397ffcbec49fbf86801d8e517e51aa (patch)
tree60d86093f0e5ef2fa40fab6d112ce30a3e2806bc /usr.bin/mandoc/man.c
parentAvoid potential 64-bit unaligned access on strict alignment architectures. (diff)
downloadwireguard-openbsd-f8618d9964397ffcbec49fbf86801d8e517e51aa.tar.xz
wireguard-openbsd-f8618d9964397ffcbec49fbf86801d8e517e51aa.zip
sync to version 1.11.5:
adding an implementation of the eqn(7) language by kristaps@ So far, only .EQ/.EN blocks are handled, in-line equations are not, and rendering is not yet very pretty, but the parser is fairly complete.
Diffstat (limited to 'usr.bin/mandoc/man.c')
-rw-r--r--usr.bin/mandoc/man.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mandoc/man.c b/usr.bin/mandoc/man.c
index e0d4bb26ddb..85d213099dd 100644
--- a/usr.bin/mandoc/man.c
+++ b/usr.bin/mandoc/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.59 2011/04/24 16:22:02 schwarze Exp $ */
+/* $Id: man.c,v 1.60 2011/09/18 10:25:28 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -92,7 +92,7 @@ man_free(struct man *man)
struct man *
-man_alloc(struct regset *regs, struct mparse *parse)
+man_alloc(struct roff *roff, struct mparse *parse)
{
struct man *p;
@@ -100,7 +100,7 @@ man_alloc(struct regset *regs, struct mparse *parse)
man_hash_init();
p->parse = parse;
- p->regs = regs;
+ p->roff = roff;
man_alloc1(p);
return(p);
@@ -367,14 +367,14 @@ man_addeqn(struct man *m, const struct eqn *ep)
assert( ! (MAN_HALT & m->flags));
- n = man_node_alloc(m, ep->line, ep->pos, MAN_EQN, MAN_MAX);
+ n = man_node_alloc(m, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
n->eqn = ep;
if ( ! man_node_append(m, n))
return(0);
m->next = MAN_NEXT_SIBLING;
- return(man_descope(m, ep->line, ep->pos));
+ return(man_descope(m, ep->ln, ep->pos));
}
int