===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_argv.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -c -r1.65 -r1.66
*** src/usr.bin/mandoc/mdoc_argv.c	2016/08/28 16:13:51	1.65
--- src/usr.bin/mandoc/mdoc_argv.c	2017/03/03 15:04:51	1.66
***************
*** 1,7 ****
! /*	$OpenBSD: mdoc_argv.c,v 1.65 2016/08/28 16:13:51 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2012, 2014, 2015 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_argv.c,v 1.66 2017/03/03 15:04:51 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2012, 2014-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
***************
*** 422,429 ****
  	if (v == NULL)
  		v = &v_local;
  	fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags;
- 	if (tok != MDOC_It)
- 		return args(mdoc, line, pos, buf, fl, v);
  
  	/*
  	 * We know that we're in an `It', so it's reasonable to expect
--- 422,427 ----
***************
*** 432,443 ****
  	 * safe fall-back into the default behaviour.
  	 */
  
! 	for (n = mdoc->last; n; n = n->parent)
! 		if (MDOC_Bl == n->tok)
! 			if (LIST_column == n->norm->Bl.type) {
  				fl = ARGSFL_TABSEP;
! 				break;
! 			}
  
  	return args(mdoc, line, pos, buf, fl, v);
  }
--- 430,444 ----
  	 * safe fall-back into the default behaviour.
  	 */
  
! 	if (tok == MDOC_It) {
! 		for (n = mdoc->last; n != NULL; n = n->parent) {
! 			if (n->tok != MDOC_Bl)
! 				continue;
! 			if (n->norm->Bl.type == LIST_column)
  				fl = ARGSFL_TABSEP;
! 			break;
! 		}
! 	}
  
  	return args(mdoc, line, pos, buf, fl, v);
  }