===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** src/usr.bin/mandoc/man.c	2011/01/09 13:16:48	1.53
--- src/usr.bin/mandoc/man.c	2011/01/16 02:56:47	1.54
***************
*** 1,4 ****
! /*	$Id: man.c,v 1.53 2011/01/09 13:16:48 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: man.c,v 1.54 2011/01/16 02:56:47 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 40,46 ****
  
  const	char * const *man_macronames = __man_macronames;
  
! static	struct man_node	*man_node_alloc(int, int, 
  				enum man_type, enum mant);
  static	int		 man_node_append(struct man *, 
  				struct man_node *);
--- 40,46 ----
  
  const	char * const *man_macronames = __man_macronames;
  
! static	struct man_node	*man_node_alloc(struct man *, int, int, 
  				enum man_type, enum mant);
  static	int		 man_node_append(struct man *, 
  				struct man_node *);
***************
*** 125,130 ****
--- 125,132 ----
  man_parseln(struct man *m, int ln, char *buf, int offs)
  {
  
+ 	m->flags |= MAN_NEWLINE;
+ 
  	assert( ! (MAN_HALT & m->flags));
  	return(('.' == buf[offs] || '\'' == buf[offs]) ? 
  			man_pmacro(m, ln, buf, offs) : 
***************
*** 225,231 ****
  
  
  static struct man_node *
! man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
  {
  	struct man_node *p;
  
--- 227,234 ----
  
  
  static struct man_node *
! man_node_alloc(struct man *m, int line, int pos, 
! 		enum man_type type, enum mant tok)
  {
  	struct man_node *p;
  
***************
*** 234,239 ****
--- 237,246 ----
  	p->pos = pos;
  	p->type = type;
  	p->tok = tok;
+ 
+ 	if (MAN_NEWLINE & m->flags)
+ 		p->flags |= MAN_LINE;
+ 	m->flags &= ~MAN_NEWLINE;
  	return(p);
  }
  
***************
*** 243,249 ****
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(line, pos, MAN_ELEM, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
--- 250,256 ----
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(m, line, pos, MAN_ELEM, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
***************
*** 256,262 ****
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(line, pos, MAN_HEAD, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
--- 263,269 ----
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(m, line, pos, MAN_HEAD, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
***************
*** 269,275 ****
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(line, pos, MAN_BODY, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
--- 276,282 ----
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(m, line, pos, MAN_BODY, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
***************
*** 282,288 ****
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(line, pos, MAN_BLOCK, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
--- 289,295 ----
  {
  	struct man_node *p;
  
! 	p = man_node_alloc(m, line, pos, MAN_BLOCK, tok);
  	if ( ! man_node_append(m, p))
  		return(0);
  	m->next = MAN_NEXT_CHILD;
***************
*** 295,301 ****
  	struct man_node	*n;
  
  	/* FIXME: grab from span */
! 	n = man_node_alloc(0, 0, MAN_TBL, MAN_MAX);
  	n->span = span;
  
  	if ( ! man_node_append(m, n))
--- 302,308 ----
  	struct man_node	*n;
  
  	/* FIXME: grab from span */
! 	n = man_node_alloc(m, 0, 0, MAN_TBL, MAN_MAX);
  	n->span = span;
  
  	if ( ! man_node_append(m, n))
***************
*** 313,319 ****
  
  	len = strlen(word);
  
! 	n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX);
  	n->string = mandoc_malloc(len + 1);
  	sv = strlcpy(n->string, word, len + 1);
  
--- 320,326 ----
  
  	len = strlen(word);
  
! 	n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX);
  	n->string = mandoc_malloc(len + 1);
  	sv = strlcpy(n->string, word, len + 1);