===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -c -r1.78 -r1.79
*** src/usr.bin/mandoc/mdoc.c	2011/01/09 13:16:48	1.78
--- src/usr.bin/mandoc/mdoc.c	2011/02/10 00:06:30	1.79
***************
*** 1,4 ****
! /*	$Id: mdoc.c,v 1.78 2011/01/09 13:16:48 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc.c,v 1.79 2011/02/10 00:06:30 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 94,103 ****
  				struct mdoc_node *);
  static	int		  mdoc_ptext(struct mdoc *, int, char *, int);
  static	int		  mdoc_pmacro(struct mdoc *, int, char *, int);
- static	int		  mdoc_span_alloc(struct mdoc *, 
- 				const struct tbl_span *);
  
- 
  const struct mdoc_node *
  mdoc_node(const struct mdoc *m)
  {
--- 94,100 ----
***************
*** 223,240 ****
  int
  mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
  {
  
  	assert( ! (MDOC_HALT & m->flags));
  
  	/* No text before an initial macro. */
  
  	if (SEC_NONE == m->lastnamed) {
! 		/* FIXME: grab from span. */
! 		mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT);
  		return(1);
  	}
  
! 	return(mdoc_span_alloc(m, sp));
  }
  
  
--- 220,244 ----
  int
  mdoc_addspan(struct mdoc *m, const struct tbl_span *sp)
  {
+ 	struct mdoc_node *n;
  
  	assert( ! (MDOC_HALT & m->flags));
  
  	/* No text before an initial macro. */
  
  	if (SEC_NONE == m->lastnamed) {
! 		mdoc_pmsg(m, sp->line, 0, MANDOCERR_NOTEXT);
  		return(1);
  	}
  
! 	n = node_alloc(m, sp->line, 0, MDOC_MAX, MDOC_TBL);
! 	n->span = sp;
! 
! 	if ( ! node_append(m, n))
! 		return(0);
! 
! 	m->next = MDOC_NEXT_SIBLING;
! 	return(1);
  }
  
  
***************
*** 541,563 ****
  	m->next = MDOC_NEXT_CHILD;
  	return(1);
  }
- 
- static int
- mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp)
- {
- 	struct mdoc_node *n;
- 
- 	/* FIXME: grab from tbl_span. */
- 	n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL);
- 	n->span = sp;
- 
- 	if ( ! node_append(m, n))
- 		return(0);
- 
- 	m->next = MDOC_NEXT_SIBLING;
- 	return(1);
- }
- 
  
  int
  mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
--- 545,550 ----