===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/mandoc/man_term.c	2010/03/25 23:23:01	1.26
--- src/usr.bin/mandoc/man_term.c	2010/03/26 01:22:05	1.27
***************
*** 1,4 ****
! /*	$Id: man_term.c,v 1.26 2010/03/25 23:23:01 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man_term.c,v 1.27 2010/03/26 01:22:05 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 135,143 ****
  	{ pre_ign, NULL, 0 }, /* DT */
  	{ pre_ign, NULL, 0 }, /* UC */
  	{ pre_ign, NULL, 0 }, /* PD */
! 	{ pre_sp, NULL, MAN_NOTEXT }, /* Sp */
! 	{ pre_nf, NULL, 0 }, /* Vb */
! 	{ pre_fi, NULL, 0 }, /* Ve */
  };
  
  
--- 135,149 ----
  	{ pre_ign, NULL, 0 }, /* DT */
  	{ pre_ign, NULL, 0 }, /* UC */
  	{ pre_ign, NULL, 0 }, /* PD */
!  	{ pre_sp, NULL, MAN_NOTEXT }, /* Sp */
!  	{ pre_nf, NULL, 0 }, /* Vb */
!  	{ pre_fi, NULL, 0 }, /* Ve */
!  	{ pre_ign, NULL, MAN_NOTEXT }, /* de */
!  	{ pre_ign, NULL, MAN_NOTEXT }, /* dei */
!  	{ pre_ign, NULL, MAN_NOTEXT }, /* am */
!  	{ pre_ign, NULL, MAN_NOTEXT }, /* ami */
!  	{ pre_ign, NULL, MAN_NOTEXT }, /* ig */
!  	{ NULL, NULL, 0 }, /* . */
  };
  
  
***************
*** 152,161 ****
  
  	p = (struct termp *)arg;
  
  	if (NULL == p->symtab)
  		switch (p->enc) {
  		case (TERMENC_ASCII):
- 			p->maxrmargin = 65;
  			p->symtab = chars_init(CHARS_ASCII);
  			break;
  		default:
--- 158,169 ----
  
  	p = (struct termp *)arg;
  
+ 	p->overstep = 0;
+ 	p->maxrmargin = 65;
+ 
  	if (NULL == p->symtab)
  		switch (p->enc) {
  		case (TERMENC_ASCII):
  			p->symtab = chars_init(CHARS_ASCII);
  			break;
  		default:
***************
*** 259,268 ****
  pre_nf(DECL_ARGS)
  {
  
! 	p->rmargin = p->maxrmargin = 160;
  	term_newln(p);
  	mt->fl |= MANT_LITERAL;
! 	return(1);
  }
  
  
--- 267,277 ----
  pre_nf(DECL_ARGS)
  {
  
! 	p->rmargin = p->maxrmargin = 78;
  	term_newln(p);
  	mt->fl |= MANT_LITERAL;
! 
! 	return(MAN_Vb != n->tok);
  }
  
  
***************
*** 778,783 ****
--- 787,794 ----
  	case (MAN_BLOCK):
  		mt->offset = mt->lmargin = INDENT;
  		break;
+ 	case (MAN_HEAD):
+ 		break;
  	default:
  		term_newln(p);
  		p->offset = INDENT;
***************
*** 878,883 ****
--- 889,895 ----
  	size_t		buflen, titlen;
  
  	p->rmargin = p->maxrmargin;
+ 
  	p->offset = 0;
  	buf[0] = title[0] = '\0';