===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -c -r1.187 -r1.188
*** src/usr.bin/mandoc/mdoc_macro.c	2018/12/31 04:55:42	1.187
--- src/usr.bin/mandoc/mdoc_macro.c	2019/01/01 07:41:22	1.188
***************
*** 1,7 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.187 2018/12/31 04:55:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 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
--- 1,7 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.188 2019/01/01 07:41:22 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010, 2012-2019 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
***************
*** 694,699 ****
--- 694,712 ----
  			    "%s %s", roff_name[tok], buf + *pos);
  		if (endbody == NULL && n != NULL)
  			rew_pending(mdoc, n);
+ 
+ 		/*
+ 		 * Restore the fill mode that was set before the display.
+ 		 * This needs to be done here rather than during validation
+ 		 * such that subsequent nodes get the right flags.
+ 		 */
+ 
+ 		if (tok == MDOC_Ed && body != NULL) {
+ 			if (body->flags & NODE_NOFILL)
+ 				mdoc->flags |= ROFF_NOFILL;
+ 			else
+ 				mdoc->flags &= ~ROFF_NOFILL;
+ 		}
  		return;
  	}
  
***************
*** 934,947 ****
  static void
  blk_full(MACRO_PROT_ARGS)
  {
- 	int		  done, la, nl, parsed;
  	struct mdoc_arg	 *arg;
  	struct roff_node *blk; /* Our own or a broken block. */
  	struct roff_node *head; /* Our own head. */
  	struct roff_node *body; /* Our own body. */
  	struct roff_node *n;
- 	enum margserr	  ac, lac;
  	char		 *p;
  
  	nl = MDOC_NEWLINE & mdoc->flags;
  
--- 947,961 ----
  static void
  blk_full(MACRO_PROT_ARGS)
  {
  	struct mdoc_arg	 *arg;
  	struct roff_node *blk; /* Our own or a broken block. */
  	struct roff_node *head; /* Our own head. */
  	struct roff_node *body; /* Our own body. */
  	struct roff_node *n;
  	char		 *p;
+ 	size_t		  iarg;
+ 	int		  done, la, nl, parsed;
+ 	enum margserr	  ac, lac;
  
  	nl = MDOC_NEWLINE & mdoc->flags;
  
***************
*** 1037,1042 ****
--- 1051,1059 ----
  	 * regular child nodes.
  	 */
  
+ 	if (tok == MDOC_Sh)
+ 		mdoc->flags &= ~ROFF_NOFILL;
+ 
  	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  	blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
  	head = body = NULL;
***************
*** 1178,1183 ****
--- 1195,1225 ----
  
  	rew_last(mdoc, head);
  	body = roff_body_alloc(mdoc, line, ppos, tok);
+ 
+ 	/*
+ 	 * Set up fill mode for display blocks.
+ 	 * This needs to be done here up front rather than during
+ 	 * validation such that child nodes get the right flags.
+ 	 */
+ 
+ 	if (tok == MDOC_Bd && arg != NULL) {
+ 		for (iarg = 0; iarg < arg->argc; iarg++) {
+ 			switch (arg->argv[iarg].arg) {
+ 			case MDOC_Unfilled:
+ 			case MDOC_Literal:
+ 				mdoc->flags |= ROFF_NOFILL;
+ 				break;
+ 			case MDOC_Filled:
+ 			case MDOC_Ragged:
+ 			case MDOC_Centred:
+ 				mdoc->flags &= ~ROFF_NOFILL;
+ 				break;
+ 			default:
+ 				continue;
+ 			}
+ 			break;
+ 		}
+ 	}
  out:
  	if (mdoc->flags & MDOC_FREECOL) {
  		rew_last(mdoc, body);