version 1.240, 2014/12/23 13:48:57 |
version 1.243, 2015/01/21 20:33:25 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 273 term_flushln(struct termp *p) |
|
Line 273 term_flushln(struct termp *p) |
|
} |
} |
|
|
if (TERMP_HANG & p->flags) { |
if (TERMP_HANG & p->flags) { |
p->overstep = (int)(vis - maxvis + |
p->overstep += (int)(p->offset + vis - p->rmargin + |
p->trailspace * (*p->width)(p, ' ')); |
p->trailspace * (*p->width)(p, ' ')); |
|
|
/* |
/* |
Line 495 term_word(struct termp *p, const char *word) |
|
Line 495 term_word(struct termp *p, const char *word) |
|
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_SKIPCHAR; |
p->flags |= TERMP_SKIPCHAR; |
continue; |
continue; |
|
case ESCAPE_OVERSTRIKE: |
|
cp = seq + sz; |
|
while (seq < cp) { |
|
if (*seq == '\\') { |
|
mandoc_escape(&seq, NULL, NULL); |
|
continue; |
|
} |
|
encode1(p, *seq++); |
|
if (seq < cp) |
|
encode(p, "\b", 1); |
|
} |
default: |
default: |
continue; |
continue; |
} |
} |
Line 716 term_strlen(const struct termp *p, const char *cp) |
|
Line 727 term_strlen(const struct termp *p, const char *cp) |
|
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
skip = 1; |
skip = 1; |
continue; |
continue; |
|
case ESCAPE_OVERSTRIKE: |
|
rsz = 0; |
|
rhs = seq + ssz; |
|
while (seq < rhs) { |
|
if (*seq == '\\') { |
|
mandoc_escape(&seq, NULL, NULL); |
|
continue; |
|
} |
|
i = (*p->width)(p, *seq++); |
|
if (rsz < i) |
|
rsz = i; |
|
} |
|
sz += rsz; |
|
continue; |
default: |
default: |
continue; |
continue; |
} |
} |
|
|
term_vspan(const struct termp *p, const struct roffsu *su) |
term_vspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
double r; |
double r; |
|
int ri; |
|
|
switch (su->unit) { |
switch (su->unit) { |
case SCALE_BU: |
case SCALE_BU: |
Line 808 term_vspan(const struct termp *p, const struct roffsu |
|
Line 834 term_vspan(const struct termp *p, const struct roffsu |
|
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
return(r > 0.0 ? r + 0.4995 : r - 0.4995); |
ri = r > 0.0 ? r + 0.4995 : r - 0.4995; |
|
return(ri < 66 ? ri : 1); |
} |
} |
|
|
int |
int |