===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -c -r1.157 -r1.158
*** src/usr.bin/mandoc/mdoc.c	2017/08/11 16:55:10	1.157
--- src/usr.bin/mandoc/mdoc.c	2018/08/17 20:31:52	1.158
***************
*** 1,7 ****
! /*	$OpenBSD: mdoc.c,v 1.157 2017/08/11 16:55:10 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2012-2017 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 ----
! /*	$OpenBSD: mdoc.c,v 1.158 2018/08/17 20:31:52 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2012-2018 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
***************
*** 78,90 ****
  }
  
  void
- mdoc_macro(MACRO_PROT_ARGS)
- {
- 	assert(tok >= MDOC_Dd && tok < MDOC_MAX);
- 	(*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
- }
- 
- void
  mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, enum roff_tok tok)
  {
  	struct roff_node *p;
--- 78,83 ----
***************
*** 194,200 ****
  	    (n->parent != NULL && n->parent->tok == MDOC_Bl &&
  	     n->parent->norm->Bl.type == LIST_column)) {
  		mdoc->flags |= MDOC_FREECOL;
! 		mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
  		return 1;
  	}
  
--- 187,194 ----
  	    (n->parent != NULL && n->parent->tok == MDOC_Bl &&
  	     n->parent->norm->Bl.type == LIST_column)) {
  		mdoc->flags |= MDOC_FREECOL;
! 		(*mdoc_macro(MDOC_It)->fp)(mdoc, MDOC_It,
! 		    line, offs, &offs, buf);
  		return 1;
  	}
  
***************
*** 376,382 ****
  
  	n = mdoc->last;
  	if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
! 		mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
  		return 1;
  	}
  
--- 370,376 ----
  
  	n = mdoc->last;
  	if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
! 		(*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
  		return 1;
  	}
  
***************
*** 392,404 ****
  	    (n->parent != NULL && n->parent->tok == MDOC_Bl &&
  	     n->parent->norm->Bl.type == LIST_column)) {
  		mdoc->flags |= MDOC_FREECOL;
! 		mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
  		return 1;
  	}
  
  	/* Normal processing of a macro. */
  
! 	mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
  
  	/* In quick mode (for mandocdb), abort after the NAME section. */
  
--- 386,398 ----
  	    (n->parent != NULL && n->parent->tok == MDOC_Bl &&
  	     n->parent->norm->Bl.type == LIST_column)) {
  		mdoc->flags |= MDOC_FREECOL;
! 		(*mdoc_macro(MDOC_It)->fp)(mdoc, MDOC_It, ln, sv, &sv, buf);
  		return 1;
  	}
  
  	/* Normal processing of a macro. */
  
! 	(*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
  
  	/* In quick mode (for mandocdb), abort after the NAME section. */