version 1.216, 2014/01/22 20:58:39 |
version 1.220, 2014/04/05 21:18:19 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <stdint.h> |
|
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "out.h" |
#include "out.h" |
#include "term.h" |
#include "term.h" |
#include "main.h" |
#include "main.h" |
Line 183 term_flushln(struct termp *p) |
|
Line 183 term_flushln(struct termp *p) |
|
ASCII_BREAK == p->buf[j])) |
ASCII_BREAK == p->buf[j])) |
jhy = j; |
jhy = j; |
|
|
|
/* |
|
* Hyphenation now decided, put back a real |
|
* hyphen such that we get the correct width. |
|
*/ |
|
if (ASCII_HYPH == p->buf[j]) |
|
p->buf[j] = '-'; |
|
|
vend += (*p->width)(p, p->buf[j]); |
vend += (*p->width)(p, p->buf[j]); |
} |
} |
|
|
Line 248 term_flushln(struct termp *p) |
|
Line 255 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
if (ASCII_HYPH == p->buf[i]) { |
|
(*p->letter)(p, '-'); |
|
p->viscol += (*p->width)(p, '-'); |
|
continue; |
|
} |
|
|
|
(*p->letter)(p, p->buf[i]); |
(*p->letter)(p, p->buf[i]); |
if (8 == p->buf[i]) |
if (8 == p->buf[i]) |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
Line 620 encode(struct termp *p, const char *word, size_t sz) |
|
Line 621 encode(struct termp *p, const char *word, size_t sz) |
|
else |
else |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
} |
} |
|
} |
|
|
|
void |
|
term_setwidth(struct termp *p, const char *wstr) |
|
{ |
|
struct roffsu su; |
|
size_t width; |
|
int iop; |
|
|
|
iop = 0; |
|
width = 0; |
|
if (NULL != wstr) { |
|
switch (*wstr) { |
|
case ('+'): |
|
iop = 1; |
|
wstr++; |
|
break; |
|
case ('-'): |
|
iop = -1; |
|
wstr++; |
|
break; |
|
default: |
|
break; |
|
} |
|
if (a2roffsu(wstr, &su, SCALE_MAX)) |
|
width = term_hspan(p, &su); |
|
else |
|
iop = 0; |
|
} |
|
(*p->setwidth)(p, iop, width); |
} |
} |
|
|
size_t |
size_t |