===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/mandoc/roff.c	2013/12/30 18:42:55	1.62
--- src/usr.bin/mandoc/roff.c	2014/01/06 21:33:00	1.63
***************
*** 1,7 ****
! /*	$Id: roff.c,v 1.62 2013/12/30 18:42:55 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,7 ----
! /*	$Id: roff.c,v 1.63 2014/01/06 21:33:00 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 105,110 ****
--- 105,111 ----
  struct	roff {
  	enum mparset	 parsetype; /* requested parse type */
  	struct mparse	*parse; /* parse point */
+ 	int		 quick; /* skip standard macro deletion */
  	struct roffnode	*last; /* leaf of stack */
  	enum roffrule	 rstack[RSTACK_MAX]; /* stack of !`ie' rules */
  	char		 control; /* control character */
***************
*** 464,470 ****
  
  
  struct roff *
! roff_alloc(enum mparset type, struct mparse *parse)
  {
  	struct roff	*r;
  	int		 i;
--- 465,471 ----
  
  
  struct roff *
! roff_alloc(enum mparset type, struct mparse *parse, int quick)
  {
  	struct roff	*r;
  	int		 i;
***************
*** 472,477 ****
--- 473,479 ----
  	r = mandoc_calloc(1, sizeof(struct roff));
  	r->parsetype = type;
  	r->parse = parse;
+ 	r->quick = quick;
  	r->rstackpos = -1;
  	
  	roffhash_init();
***************
*** 1493,1499 ****
  {
  	const char *const	*cp;
  
! 	if (MPARSE_MDOC != r->parsetype)
  		for (cp = __mdoc_reserved; *cp; cp++)
  			roff_setstr(r, *cp, NULL, 0);
  
--- 1495,1501 ----
  {
  	const char *const	*cp;
  
! 	if (0 == r->quick && MPARSE_MDOC != r->parsetype)
  		for (cp = __mdoc_reserved; *cp; cp++)
  			roff_setstr(r, *cp, NULL, 0);
  
***************
*** 1506,1512 ****
  {
  	const char *const	*cp;
  
! 	if (MPARSE_MDOC != r->parsetype)
  		for (cp = __man_reserved; *cp; cp++)
  			roff_setstr(r, *cp, NULL, 0);
  
--- 1508,1514 ----
  {
  	const char *const	*cp;
  
! 	if (0 == r->quick && MPARSE_MDOC != r->parsetype)
  		for (cp = __man_reserved; *cp; cp++)
  			roff_setstr(r, *cp, NULL, 0);