mandoc/term.c - diff

Return to term.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/term.c between version 1.214 and 1.216

version 1.214, 2013/12/25 00:39:31

version 1.216, 2014/01/22 20:58:39

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 179 term_flushln(struct termp *p)

/* Regular word. */

/* Break at the hyphen point if we overrun. */

if (vend > vis && vend < bp &&

ASCII_HYPH == p->buf[j])

(ASCII_HYPH == p->buf[j] ||

ASCII_BREAK == p->buf[j]))

jhy = j;

vend += (*p->width)(p, p->buf[j]);

Line 233 term_flushln(struct termp *p)

Line 234 term_flushln(struct termp *p)

vbl += (*p->width)(p, ' ');

continue;

}

if (ASCII_BREAK == p->buf[i])

continue;

* Now we definitely know there will be

Line 644 term_strlen(const struct termp *p, const char *cp)

Line 647 term_strlen(const struct termp *p, const char *cp)

int ssz, skip, c;

const char *seq, *rhs;

enum mandoc_esc esc;

static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' };

static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH,

ASCII_BREAK, '\0' };

* Account for escaped sequences within string length

Line 659 term_strlen(const struct termp *p, const char *cp)

Line 663 term_strlen(const struct termp *p, const char *cp)

for (i = 0; i < rsz; i++)

sz += cond_width(p, *cp++, &skip);

c = 0;

switch (*cp) {

case ('\\'):

cp++;

Line 733 term_strlen(const struct termp *p, const char *cp)

Line 736 term_strlen(const struct termp *p, const char *cp)

case (ASCII_HYPH):

sz += cond_width(p, '-', &skip);

cp++;

/* FALLTHROUGH */

case (ASCII_BREAK):

break;

default:

break;

CVSweb