===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/mandoc/mdoc.c	2009/06/18 23:51:12	1.8
--- src/usr.bin/mandoc/mdoc.c	2009/06/19 07:20:19	1.9
***************
*** 1,4 ****
! /*	$Id: mdoc.c,v 1.8 2009/06/18 23:51:12 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc.c,v 1.9 2009/06/19 07:20:19 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 144,150 ****
  
  	bzero(&mdoc->meta, sizeof(struct mdoc_meta));
  	mdoc->flags = 0;
! 	mdoc->lastnamed = mdoc->lastsec = 0;
  	mdoc->last = calloc(1, sizeof(struct mdoc_node));
  	if (NULL == mdoc->last)
  		return(0);
--- 144,150 ----
  
  	bzero(&mdoc->meta, sizeof(struct mdoc_meta));
  	mdoc->flags = 0;
! 	mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
  	mdoc->last = calloc(1, sizeof(struct mdoc_node));
  	if (NULL == mdoc->last)
  		return(0);
***************
*** 371,384 ****
  		int ln, int pp, int *pos, char *buf)
  {
  
- 	/* FIXME - these should happen during validation. */
- 
  	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
! 			SEC_PROLOGUE != m->lastnamed)
  		return(perr(m, ln, pp, EPROLBODY));
- 
  	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
! 			SEC_PROLOGUE == m->lastnamed)
  		return(perr(m, ln, pp, EBODYPROL));
  
  	if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
--- 371,381 ----
  		int ln, int pp, int *pos, char *buf)
  {
  
  	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
! 			MDOC_PBODY & m->flags)
  		return(perr(m, ln, pp, EPROLBODY));
  	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
! 			! (MDOC_PBODY & m->flags))
  		return(perr(m, ln, pp, EBODYPROL));
  
  	if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
***************
*** 629,635 ****
  parsetext(struct mdoc *m, int line, char *buf)
  {
  
! 	if (SEC_PROLOGUE == m->lastnamed)
  		return(perr(m, line, 0, ETEXTPROL));
  
  	if (0 == buf[0] && ! (MDOC_LITERAL & m->flags))
--- 626,632 ----
  parsetext(struct mdoc *m, int line, char *buf)
  {
  
! 	if (SEC_NONE == m->lastnamed)
  		return(perr(m, line, 0, ETEXTPROL));
  
  	if (0 == buf[0] && ! (MDOC_LITERAL & m->flags))