=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.77 retrieving revision 1.84 diff -u -p -r1.77 -r1.84 --- mandoc/man.c 2010/06/26 15:36:37 1.77 +++ mandoc/man.c 2010/07/22 23:03:15 1.84 @@ -1,6 +1,6 @@ -/* $Id: man.c,v 1.77 2010/06/26 15:36:37 kristaps Exp $ */ +/* $Id: man.c,v 1.84 2010/07/22 23:03:15 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -28,7 +28,6 @@ #include #include "mandoc.h" -#include "regs.h" #include "libman.h" #include "libmandoc.h" @@ -42,6 +41,7 @@ const char *const __man_macronames[MAN_MAX] = { "nf", "fi", "r", "RE", "RS", "DT", "UC", "PD", "Sp", "Vb", "Ve", "AT", + "in" }; const char * const *man_macronames = __man_macronames; @@ -95,7 +95,8 @@ man_free(struct man *man) struct man * -man_alloc(void *data, int pflags, mandocmsg msg) +man_alloc(struct regset *regs, void *data, + int pflags, mandocmsg msg) { struct man *p; @@ -105,6 +106,7 @@ man_alloc(void *data, int pflags, mandocmsg msg) p->data = data; p->pflags = pflags; p->msg = msg; + p->regs = regs; man_alloc1(p); return(p); @@ -125,8 +127,7 @@ man_endparse(struct man *m) int -man_parseln(struct man *m, const struct regset *regs, - int ln, char *buf, int offs) +man_parseln(struct man *m, int ln, char *buf, int offs) { if (MAN_HALT & m->flags) @@ -409,7 +410,7 @@ man_ptext(struct man *m, int line, char *buf, int offs */ assert(i); - if (mandoc_eos(buf, (size_t)i)) + if (mandoc_eos(buf, (size_t)i, 0)) m->last->flags |= MAN_EOS; descope: