===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/mandoc/term.c	2014/04/08 07:13:01	1.82
--- src/usr.bin/mandoc/term.c	2014/04/20 16:44:44	1.83
***************
*** 1,4 ****
! /*	$Id: term.c,v 1.82 2014/04/08 07:13:01 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: term.c,v 1.83 2014/04/20 16:44:44 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 35,40 ****
--- 35,41 ----
  static	void		 encode(struct termp *, const char *, size_t);
  static	void		 encode1(struct termp *, int);
  
+ 
  void
  term_free(struct termp *p)
  {
***************
*** 47,55 ****
  	free(p);
  }
  
- 
  void
! term_begin(struct termp *p, term_margin head, 
  		term_margin foot, const void *arg)
  {
  
--- 48,55 ----
  	free(p);
  }
  
  void
! term_begin(struct termp *p, term_margin head,
  		term_margin foot, const void *arg)
  {
  
***************
*** 59,65 ****
  	(*p->begin)(p);
  }
  
- 
  void
  term_end(struct termp *p)
  {
--- 59,64 ----
***************
*** 167,173 ****
  
  			/* Regular word. */
  			/* Break at the hyphen point if we overrun. */
! 			if (vend > vis && vend < bp && 
  			    (ASCII_HYPH == p->buf[j] ||
  			     ASCII_BREAK == p->buf[j]))
  				jhy = j;
--- 166,172 ----
  
  			/* Regular word. */
  			/* Break at the hyphen point if we overrun. */
! 			if (vend > vis && vend < bp &&
  			    (ASCII_HYPH == p->buf[j] ||
  			     ASCII_BREAK == p->buf[j]))
  				jhy = j;
***************
*** 247,253 ****
  			(*p->letter)(p, p->buf[i]);
  			if (8 == p->buf[i])
  				p->viscol -= (*p->width)(p, p->buf[i-1]);
! 			else 
  				p->viscol += (*p->width)(p, p->buf[i]);
  		}
  		vis = vend;
--- 246,252 ----
  			(*p->letter)(p, p->buf[i]);
  			if (8 == p->buf[i])
  				p->viscol -= (*p->width)(p, p->buf[i-1]);
! 			else
  				p->viscol += (*p->width)(p, p->buf[i]);
  		}
  		vis = vend;
***************
*** 271,277 ****
  
  	if (TERMP_HANG & p->flags) {
  		p->overstep = (int)(vis - maxvis +
! 				p->trailspace * (*p->width)(p, ' '));
  
  		/*
  		 * If we have overstepped the margin, temporarily move
--- 270,276 ----
  
  	if (TERMP_HANG & p->flags) {
  		p->overstep = (int)(vis - maxvis +
! 		    p->trailspace * (*p->width)(p, ' '));
  
  		/*
  		 * If we have overstepped the margin, temporarily move
***************
*** 294,301 ****
  	}
  }
  
! 
! /* 
   * A newline only breaks an existing line; it won't assert vertical
   * space.  All data in the output buffer is flushed prior to the newline
   * assertion.
--- 293,299 ----
  	}
  }
  
! /*
   * A newline only breaks an existing line; it won't assert vertical
   * space.  All data in the output buffer is flushed prior to the newline
   * assertion.
***************
*** 309,315 ****
  		term_flushln(p);
  }
  
- 
  /*
   * Asserts a vertical space (a full, empty line-break between lines).
   * Note that if used twice, this will cause two blank spaces and so on.
--- 307,312 ----
***************
*** 338,344 ****
  	p->fontq[p->fonti] = f;
  }
  
- 
  void
  term_fontrepl(struct termp *p, enum termfont f)
  {
--- 335,340 ----
***************
*** 347,353 ****
  	p->fontq[p->fonti] = f;
  }
  
- 
  void
  term_fontpush(struct termp *p, enum termfont f)
  {
--- 343,348 ----
***************
*** 357,363 ****
  	p->fontq[++p->fonti] = f;
  }
  
- 
  const void *
  term_fontq(struct termp *p)
  {
--- 352,357 ----
***************
*** 365,371 ****
  	return(&p->fontq[p->fonti]);
  }
  
- 
  enum termfont
  term_fonttop(struct termp *p)
  {
--- 359,364 ----
***************
*** 373,379 ****
  	return(p->fontq[p->fonti]);
  }
  
- 
  void
  term_fontpopq(struct termp *p, const void *key)
  {
--- 366,371 ----
***************
*** 383,389 ****
  	assert(p->fonti >= 0);
  }
  
- 
  void
  term_fontpop(struct termp *p)
  {
--- 375,380 ----
***************
*** 453,465 ****
  
  		if (TERMENC_ASCII != p->enc)
  			switch (esc) {
! 			case (ESCAPE_UNICODE):
  				uc = mchars_num2uc(seq + 1, sz - 1);
  				if ('\0' == uc)
  					break;
  				encode1(p, uc);
  				continue;
! 			case (ESCAPE_SPECIAL):
  				uc = mchars_spec2cp(p->symtab, seq, sz);
  				if (uc <= 0)
  					break;
--- 444,456 ----
  
  		if (TERMENC_ASCII != p->enc)
  			switch (esc) {
! 			case ESCAPE_UNICODE:
  				uc = mchars_num2uc(seq + 1, sz - 1);
  				if ('\0' == uc)
  					break;
  				encode1(p, uc);
  				continue;
! 			case ESCAPE_SPECIAL:
  				uc = mchars_spec2cp(p->symtab, seq, sz);
  				if (uc <= 0)
  					break;
***************
*** 470,514 ****
  			}
  
  		switch (esc) {
! 		case (ESCAPE_UNICODE):
  			encode1(p, '?');
  			break;
! 		case (ESCAPE_NUMBERED):
  			c = mchars_num2char(seq, sz);
  			if ('\0' != c)
  				encode(p, &c, 1);
  			break;
! 		case (ESCAPE_SPECIAL):
  			cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
! 			if (NULL != cp) 
  				encode(p, cp, ssz);
  			else if (1 == ssz)
  				encode(p, seq, sz);
  			break;
! 		case (ESCAPE_FONTBOLD):
  			term_fontrepl(p, TERMFONT_BOLD);
  			break;
! 		case (ESCAPE_FONTITALIC):
  			term_fontrepl(p, TERMFONT_UNDER);
  			break;
! 		case (ESCAPE_FONTBI):
  			term_fontrepl(p, TERMFONT_BI);
  			break;
! 		case (ESCAPE_FONT):
  			/* FALLTHROUGH */
! 		case (ESCAPE_FONTROMAN):
  			term_fontrepl(p, TERMFONT_NONE);
  			break;
! 		case (ESCAPE_FONTPREV):
  			term_fontlast(p);
  			break;
! 		case (ESCAPE_NOSPACE):
  			if (TERMP_SKIPCHAR & p->flags)
  				p->flags &= ~TERMP_SKIPCHAR;
  			else if ('\0' == *word)
  				p->flags |= TERMP_NOSPACE;
  			break;
! 		case (ESCAPE_SKIPCHAR):
  			p->flags |= TERMP_SKIPCHAR;
  			break;
  		default:
--- 461,505 ----
  			}
  
  		switch (esc) {
! 		case ESCAPE_UNICODE:
  			encode1(p, '?');
  			break;
! 		case ESCAPE_NUMBERED:
  			c = mchars_num2char(seq, sz);
  			if ('\0' != c)
  				encode(p, &c, 1);
  			break;
! 		case ESCAPE_SPECIAL:
  			cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
! 			if (NULL != cp)
  				encode(p, cp, ssz);
  			else if (1 == ssz)
  				encode(p, seq, sz);
  			break;
! 		case ESCAPE_FONTBOLD:
  			term_fontrepl(p, TERMFONT_BOLD);
  			break;
! 		case ESCAPE_FONTITALIC:
  			term_fontrepl(p, TERMFONT_UNDER);
  			break;
! 		case ESCAPE_FONTBI:
  			term_fontrepl(p, TERMFONT_BI);
  			break;
! 		case ESCAPE_FONT:
  			/* FALLTHROUGH */
! 		case ESCAPE_FONTROMAN:
  			term_fontrepl(p, TERMFONT_NONE);
  			break;
! 		case ESCAPE_FONTPREV:
  			term_fontlast(p);
  			break;
! 		case ESCAPE_NOSPACE:
  			if (TERMP_SKIPCHAR & p->flags)
  				p->flags &= ~TERMP_SKIPCHAR;
  			else if ('\0' == *word)
  				p->flags |= TERMP_NOSPACE;
  			break;
! 		case ESCAPE_SKIPCHAR:
  			p->flags |= TERMP_SKIPCHAR;
  			break;
  		default:
***************
*** 591,597 ****
  	 */
  
  	if (TERMFONT_NONE == term_fonttop(p)) {
! 		if (p->col + sz >= p->maxcols) 
  			adjbuf(p, p->col + sz);
  		for (i = 0; i < sz; i++)
  			p->buf[p->col++] = word[i];
--- 582,588 ----
  	 */
  
  	if (TERMFONT_NONE == term_fonttop(p)) {
! 		if (p->col + sz >= p->maxcols)
  			adjbuf(p, p->col + sz);
  		for (i = 0; i < sz; i++)
  			p->buf[p->col++] = word[i];
***************
*** 623,633 ****
  	width = 0;
  	if (NULL != wstr) {
  		switch (*wstr) {
! 		case ('+'):
  			iop = 1;
  			wstr++;
  			break;
! 		case ('-'):
  			iop = -1;
  			wstr++;
  			break;
--- 614,624 ----
  	width = 0;
  	if (NULL != wstr) {
  		switch (*wstr) {
! 		case '+':
  			iop = 1;
  			wstr++;
  			break;
! 		case '-':
  			iop = -1;
  			wstr++;
  			break;
***************
*** 684,690 ****
  			sz += cond_width(p, *cp++, &skip);
  
  		switch (*cp) {
! 		case ('\\'):
  			cp++;
  			esc = mandoc_escape(&cp, &seq, &ssz);
  			if (ESCAPE_ERROR == esc)
--- 675,681 ----
  			sz += cond_width(p, *cp++, &skip);
  
  		switch (*cp) {
! 		case '\\':
  			cp++;
  			esc = mandoc_escape(&cp, &seq, &ssz);
  			if (ESCAPE_ERROR == esc)
***************
*** 692,707 ****
  
  			if (TERMENC_ASCII != p->enc)
  				switch (esc) {
! 				case (ESCAPE_UNICODE):
! 					c = mchars_num2uc
! 						(seq + 1, ssz - 1);
  					if ('\0' == c)
  						break;
  					sz += cond_width(p, c, &skip);
  					continue;
! 				case (ESCAPE_SPECIAL):
! 					c = mchars_spec2cp
! 						(p->symtab, seq, ssz);
  					if (c <= 0)
  						break;
  					sz += cond_width(p, c, &skip);
--- 683,698 ----
  
  			if (TERMENC_ASCII != p->enc)
  				switch (esc) {
! 				case ESCAPE_UNICODE:
! 					c = mchars_num2uc(seq + 1,
! 					    ssz - 1);
  					if ('\0' == c)
  						break;
  					sz += cond_width(p, c, &skip);
  					continue;
! 				case ESCAPE_SPECIAL:
! 					c = mchars_spec2cp(p->symtab,
! 					    seq, ssz);
  					if (c <= 0)
  						break;
  					sz += cond_width(p, c, &skip);
***************
*** 713,729 ****
  			rhs = NULL;
  
  			switch (esc) {
! 			case (ESCAPE_UNICODE):
  				sz += cond_width(p, '?', &skip);
  				break;
! 			case (ESCAPE_NUMBERED):
  				c = mchars_num2char(seq, ssz);
  				if ('\0' != c)
  					sz += cond_width(p, c, &skip);
  				break;
! 			case (ESCAPE_SPECIAL):
! 				rhs = mchars_spec2str
! 					(p->symtab, seq, ssz, &rsz);
  
  				if (ssz != 1 || rhs)
  					break;
--- 704,720 ----
  			rhs = NULL;
  
  			switch (esc) {
! 			case ESCAPE_UNICODE:
  				sz += cond_width(p, '?', &skip);
  				break;
! 			case ESCAPE_NUMBERED:
  				c = mchars_num2char(seq, ssz);
  				if ('\0' != c)
  					sz += cond_width(p, c, &skip);
  				break;
! 			case ESCAPE_SPECIAL:
! 				rhs = mchars_spec2str(p->symtab,
! 				    seq, ssz, &rsz);
  
  				if (ssz != 1 || rhs)
  					break;
***************
*** 731,737 ****
  				rhs = seq;
  				rsz = ssz;
  				break;
! 			case (ESCAPE_SKIPCHAR):
  				skip = 1;
  				break;
  			default:
--- 722,728 ----
  				rhs = seq;
  				rsz = ssz;
  				break;
! 			case ESCAPE_SKIPCHAR:
  				skip = 1;
  				break;
  			default:
***************
*** 749,763 ****
  			for (i = 0; i < rsz; i++)
  				sz += (*p->width)(p, *rhs++);
  			break;
! 		case (ASCII_NBRSP):
  			sz += cond_width(p, ' ', &skip);
  			cp++;
  			break;
! 		case (ASCII_HYPH):
  			sz += cond_width(p, '-', &skip);
  			cp++;
  			/* FALLTHROUGH */
! 		case (ASCII_BREAK):
  			break;
  		default:
  			break;
--- 740,754 ----
  			for (i = 0; i < rsz; i++)
  				sz += (*p->width)(p, *rhs++);
  			break;
! 		case ASCII_NBRSP:
  			sz += cond_width(p, ' ', &skip);
  			cp++;
  			break;
! 		case ASCII_HYPH:
  			sz += cond_width(p, '-', &skip);
  			cp++;
  			/* FALLTHROUGH */
! 		case ASCII_BREAK:
  			break;
  		default:
  			break;
***************
*** 767,795 ****
  	return(sz);
  }
  
- /* ARGSUSED */
  size_t
  term_vspan(const struct termp *p, const struct roffsu *su)
  {
  	double		 r;
  
  	switch (su->unit) {
! 	case (SCALE_CM):
  		r = su->scale * 2;
  		break;
! 	case (SCALE_IN):
  		r = su->scale * 6;
  		break;
! 	case (SCALE_PC):
  		r = su->scale;
  		break;
! 	case (SCALE_PT):
  		r = su->scale / 8;
  		break;
! 	case (SCALE_MM):
  		r = su->scale / 1000;
  		break;
! 	case (SCALE_VS):
  		r = su->scale;
  		break;
  	default:
--- 758,785 ----
  	return(sz);
  }
  
  size_t
  term_vspan(const struct termp *p, const struct roffsu *su)
  {
  	double		 r;
  
  	switch (su->unit) {
! 	case SCALE_CM:
  		r = su->scale * 2;
  		break;
! 	case SCALE_IN:
  		r = su->scale * 6;
  		break;
! 	case SCALE_PC:
  		r = su->scale;
  		break;
! 	case SCALE_PT:
  		r = su->scale / 8;
  		break;
! 	case SCALE_MM:
  		r = su->scale / 1000;
  		break;
! 	case SCALE_VS:
  		r = su->scale;
  		break;
  	default:
***************
*** 799,806 ****
  
  	if (r < 0.0)
  		r = 0.0;
! 	return(/* LINTED */(size_t)
! 			r);
  }
  
  size_t
--- 789,795 ----
  
  	if (r < 0.0)
  		r = 0.0;
! 	return((size_t)r);
  }
  
  size_t
***************
*** 811,816 ****
  	v = ((*p->hspan)(p, su));
  	if (v < 0.0)
  		v = 0.0;
! 	return((size_t) /* LINTED */
! 			v);
  }
--- 800,804 ----
  	v = ((*p->hspan)(p, su));
  	if (v < 0.0)
  		v = 0.0;
! 	return((size_t)v);
  }