=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/read.c,v retrieving revision 1.68 retrieving revision 1.69 diff -c -r1.68 -r1.69 *** src/usr.bin/mandoc/read.c 2014/10/20 19:21:31 1.68 --- src/usr.bin/mandoc/read.c 2014/10/28 17:35:42 1.69 *************** *** 1,4 **** ! /* $OpenBSD: read.c,v 1.68 2014/10/20 19:21:31 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze --- 1,4 ---- ! /* $OpenBSD: read.c,v 1.69 2014/10/28 17:35:42 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze *************** *** 50,55 **** --- 50,56 ---- struct man *man; /* man parser */ struct mdoc *mdoc; /* mdoc parser */ struct roff *roff; /* roff parser (!NULL) */ + const struct mchars *mchars; /* character table */ char *sodest; /* filename pointed to by .so */ const char *file; /* filename of current input file */ struct buf *primary; /* buffer currently being parsed */ *************** *** 858,865 **** } struct mparse * ! mparse_alloc(int options, enum mandoclevel wlevel, ! mandocmsg mmsg, const char *defos) { struct mparse *curp; --- 859,866 ---- } struct mparse * ! mparse_alloc(int options, enum mandoclevel wlevel, mandocmsg mmsg, ! const struct mchars *mchars, const char *defos) { struct mparse *curp; *************** *** 872,878 **** curp->mmsg = mmsg; curp->defos = defos; ! curp->roff = roff_alloc(curp, options); if (curp->options & MPARSE_MDOC) curp->pmdoc = mdoc_alloc( curp->roff, curp, curp->defos, --- 873,880 ---- curp->mmsg = mmsg; curp->defos = defos; ! curp->mchars = mchars; ! curp->roff = roff_alloc(curp, curp->mchars, options); if (curp->options & MPARSE_MDOC) curp->pmdoc = mdoc_alloc( curp->roff, curp, curp->defos,