===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -c -r1.187 -r1.188
*** src/usr.bin/mandoc/roff.c	2017/06/18 17:35:40	1.187
--- src/usr.bin/mandoc/roff.c	2017/06/24 14:38:28	1.188
***************
*** 1,4 ****
! /*	$OpenBSD: roff.c,v 1.187 2017/06/18 17:35:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: roff.c,v 1.188 2017/06/24 14:38:28 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 817,830 ****
  
  struct roff_man *
  roff_man_alloc(struct roff *roff, struct mparse *parse,
! 	const char *defos, int quick)
  {
  	struct roff_man *man;
  
  	man = mandoc_calloc(1, sizeof(*man));
  	man->parse = parse;
  	man->roff = roff;
! 	man->defos = defos;
  	man->quick = quick;
  	roff_man_alloc1(man);
  	roff->man = man;
--- 817,830 ----
  
  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;
  	roff_man_alloc1(man);
  	roff->man = man;
***************
*** 1136,1142 ****
  	size_t		 maxl;  /* expected length of the escape name */
  	size_t		 naml;	/* actual length of the escape name */
  	enum mandoc_esc	 esc;	/* type of the escape sequence */
! 	enum mdoc_os	 os_e;	/* kind of RCS id seen */
  	int		 inaml;	/* length returned from mandoc_escape() */
  	int		 expand_count;	/* to avoid infinite loops */
  	int		 npos;	/* position in numeric expression */
--- 1136,1142 ----
  	size_t		 maxl;  /* expected length of the escape name */
  	size_t		 naml;	/* actual length of the escape name */
  	enum mandoc_esc	 esc;	/* type of the escape sequence */
! 	enum mandoc_os	 os_e;	/* kind of RCS id seen */
  	int		 inaml;	/* length returned from mandoc_escape() */
  	int		 expand_count;	/* to avoid infinite loops */
  	int		 npos;	/* position in numeric expression */
***************
*** 1159,1168 ****
  		/* Comment found, look for RCS id. */
  
  		if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
! 			os_e = MDOC_OS_OPENBSD;
  			cp += 8;
  		} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
! 			os_e = MDOC_OS_NETBSD;
  			cp += 7;
  		}
  		if (cp != NULL &&
--- 1159,1168 ----
  		/* Comment found, look for RCS id. */
  
  		if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
! 			os_e = MANDOC_OS_OPENBSD;
  			cp += 8;
  		} else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
! 			os_e = MANDOC_OS_NETBSD;
  			cp += 7;
  		}
  		if (cp != NULL &&