src/usr.bin/mandoc/roff.c - diff

Return to roff.c CVS log

Up to [local] / src / usr.bin / mandoc

version 1.71, 2014/03/08 04:43:39

version 1.72, 2014/03/19 21:50:59

Line 99

};

struct roff {

enum mparset parsetype; /* requested parse type */

struct mparse *parse; /* parse point */

int quick; /* skip standard macro deletion */

int options; /* parse options */

struct roffnode *last; /* leaf of stack */

int rstack[RSTACK_MAX]; /* stack of !`ie' rules */

char control; /* control character */

Line 459

Line 458

struct roff *

roff_alloc(enum mparset type, struct mparse *parse, int quick)

roff_alloc(struct mparse *parse, int options)

{

struct roff *r;

r = mandoc_calloc(1, sizeof(struct roff));

r->parsetype = type;

r->parse = parse;

r->quick = quick;

r->options = options;

r->rstackpos = -1;

roffhash_init();

Line 1548

Line 1546

{

const char *const *cp;

if (0 == r->quick && MPARSE_MDOC != r->parsetype)

if (0 == ((MPARSE_MDOC | MPARSE_QUICK) & r->options))

for (cp = __mdoc_reserved; *cp; cp++)

roff_setstr(r, *cp, NULL, 0);

Line 1561

Line 1559

{

const char *const *cp;

if (0 == r->quick && MPARSE_MDOC != r->parsetype)

if (0 == (MPARSE_QUICK & r->options))

for (cp = __man_reserved; *cp; cp++)

roff_setstr(r, *cp, NULL, 0);