===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -c -r1.222 -r1.223
*** src/usr.bin/mandoc/roff.c	2018/12/14 05:17:45	1.222
--- src/usr.bin/mandoc/roff.c	2018/12/14 06:33:03	1.223
***************
*** 1,4 ****
! /*	$OpenBSD: roff.c,v 1.222 2018/12/14 05:17:45 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: roff.c,v 1.223 2018/12/14 06:33:03 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 96,102 ****
  };
  
  struct	roff {
- 	struct mparse	*parse; /* parse point */
  	struct roff_man	*man; /* mdoc or man parser */
  	struct roffnode	*last; /* leaf of stack */
  	struct mctx	*mstack; /* stack of macro contexts */
--- 96,101 ----
***************
*** 778,789 ****
  }
  
  struct roff *
! roff_alloc(struct mparse *parse, int options)
  {
  	struct roff	*r;
  
  	r = mandoc_calloc(1, sizeof(struct roff));
- 	r->parse = parse;
  	r->reqtab = roffhash_alloc(0, ROFF_RENAMED);
  	r->options = options;
  	r->format = options & (MPARSE_MDOC | MPARSE_MAN);
--- 777,787 ----
  }
  
  struct roff *
! roff_alloc(int options)
  {
  	struct roff	*r;
  
  	r = mandoc_calloc(1, sizeof(struct roff));
  	r->reqtab = roffhash_alloc(0, ROFF_RENAMED);
  	r->options = options;
  	r->format = options & (MPARSE_MDOC | MPARSE_MAN);
***************
*** 842,854 ****
  }
  
  struct roff_man *
! roff_man_alloc(struct roff *roff, struct mparse *parse,
! 	const char *os_s, int quick)
  {
  	struct roff_man *man;
  
  	man = mandoc_calloc(1, sizeof(*man));
- 	man->parse = parse;
  	man->roff = roff;
  	man->os_s = os_s;
  	man->quick = quick;
--- 840,850 ----
  }
  
  struct roff_man *
! roff_man_alloc(struct roff *roff, const char *os_s, int quick)
  {
  	struct roff_man *man;
  
  	man = mandoc_calloc(1, sizeof(*man));
  	man->roff = roff;
  	man->os_s = os_s;
  	man->quick = quick;
***************
*** 3146,3152 ****
  
  	assert(r->eqn == NULL);
  	if (r->last_eqn == NULL)
! 		r->last_eqn = eqn_alloc(r->parse);
  	else
  		eqn_reset(r->last_eqn);
  	r->eqn = r->last_eqn;
--- 3142,3148 ----
  
  	assert(r->eqn == NULL);
  	if (r->last_eqn == NULL)
! 		r->last_eqn = eqn_alloc();
  	else
  		eqn_reset(r->last_eqn);
  	r->eqn = r->last_eqn;
***************
*** 3180,3186 ****
  		mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");
  		tbl_end(r->tbl, 0);
  	}
! 	r->tbl = tbl_alloc(ppos, ln, r->parse, r->last_tbl);
  	if (r->last_tbl == NULL)
  		r->first_tbl = r->tbl;
  	r->last_tbl = r->tbl;
--- 3176,3182 ----
  		mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");
  		tbl_end(r->tbl, 0);
  	}
! 	r->tbl = tbl_alloc(ppos, ln, r->last_tbl);
  	if (r->last_tbl == NULL)
  		r->first_tbl = r->tbl;
  	r->last_tbl = r->tbl;
***************
*** 3657,3663 ****
  			ctx->argv = mandoc_reallocarray(ctx->argv,
  			    ctx->argsz, sizeof(*ctx->argv));
  		}
! 		arg = mandoc_getarg(r->parse, &src, ln, &pos);
  		sz = 1;  /* For the terminating NUL. */
  		for (ap = arg; *ap != '\0'; ap++)
  			sz += *ap == '"' ? 4 : 1;
--- 3653,3659 ----
  			ctx->argv = mandoc_reallocarray(ctx->argv,
  			    ctx->argsz, sizeof(*ctx->argv));
  		}
! 		arg = mandoc_getarg(&src, ln, &pos);
  		sz = 1;  /* For the terminating NUL. */
  		for (ap = arg; *ap != '\0'; ap++)
  			sz += *ap == '"' ? 4 : 1;