=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.76 retrieving revision 1.78 diff -u -p -r1.76 -r1.78 --- mandoc/man.c 2010/06/19 20:46:28 1.76 +++ mandoc/man.c 2010/06/26 16:07:08 1.78 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.76 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: man.c,v 1.78 2010/06/26 16:07:08 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -28,6 +28,7 @@ #include #include "mandoc.h" +#include "regs.h" #include "libman.h" #include "libmandoc.h" @@ -53,7 +54,9 @@ static void man_node_free(struct man_node *); static void man_node_unlink(struct man *, struct man_node *); static int man_ptext(struct man *, int, char *, int); -static int man_pmacro(struct man *, int, char *, int); +static int man_pmacro(struct man *, + const struct regset *regs, + int, char *, int); static void man_free1(struct man *); static void man_alloc1(struct man *); static int macrowarn(struct man *, int, const char *, int); @@ -124,14 +127,15 @@ man_endparse(struct man *m) int -man_parseln(struct man *m, int ln, char *buf, int offs) +man_parseln(struct man *m, const struct regset *regs, + int ln, char *buf, int offs) { if (MAN_HALT & m->flags) return(0); return(('.' == buf[offs] || '\'' == buf[offs]) ? - man_pmacro(m, ln, buf, offs) : + man_pmacro(m, regs, ln, buf, offs) : man_ptext(m, ln, buf, offs)); } @@ -447,7 +451,8 @@ macrowarn(struct man *m, int ln, const char *buf, int int -man_pmacro(struct man *m, int ln, char *buf, int offs) +man_pmacro(struct man *m, const struct regset *regs, + int ln, char *buf, int offs) { int i, j, ppos; enum mant tok; @@ -572,7 +577,7 @@ man_pmacro(struct man *m, int ln, char *buf, int offs) /* Call to handler... */ assert(man_macros[tok].fp); - if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) + if ( ! (*man_macros[tok].fp)(m, regs, tok, ln, ppos, &i, buf)) goto err; out: