mandoc/term.c - diff

Return to term.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/term.c between version 1.215 and 1.221

version 1.215, 2013/12/31 18:07:42

version 1.221, 2014/04/08 07:13:12

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 23

#include <assert.h>

#include <ctype.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include "mandoc.h"

#include "mandoc_aux.h"

#include "out.h"

#include "term.h"

#include "main.h"

Line 72 term_end(struct termp *p)

}

* Flush a line of text. A "line" is loosely defined as being something

* Flush a chunk of text. By default, break the output line each time

* that should be followed by a newline, regardless of whether it's

* the right margin is reached, and continue output on the next line

* broken apart by newlines getting there. A line can also be a

* at the same offset as the chunk itself. By default, also break the

* fragment of a columnar list (`Bl -tag' or `Bl -column'), which does

* output line at the end of the chunk.

* not have a trailing newline.

* The following flags may be specified:

* - TERMP_NOBREAK: this is the most important and is used when making

* - TERMP_NOBREAK: Do not break the output line at the right margin,

* columns. In short: don't print a newline and instead expect the

* but only at the max right margin. Also, do not break the output

* next call to do the padding up to the start of the next column.

* line at the end of the chunk, such that the next call can pad to

* p->trailspace may be set to 0, 1, or 2, depending on how many

* the next column. However, if less than p->trailspace blanks,

* space characters are required at the end of the column.

* which can be 0, 1, or 2, remain to the right margin, the line

* will be broken.

* - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and

* - TERMP_BRIND: If the chunk does not fit and the output line has

* the line is overrun, and don't pad-right if it's underrun.

* to be broken, start the next line at the right margin instead

* of at the offset. Used together with TERMP_NOBREAK for the tags

* - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when

* in various kinds of tagged lists.

* overrunning, instead save the position and continue at that point

* - TERMP_DANGLE: Do not break the output line at the right margin,

* when the next invocation.

* append the next chunk after it even if this one is too long.

* To be used together with TERMP_NOBREAK.

* In-line line breaking:

* - TERMP_HANG: Like TERMP_DANGLE, and also suppress padding before

* the next chunk if this column is not full.

* If TERMP_NOBREAK is specified and the line overruns the right

* margin, it will break and pad-right to the right margin after

* writing. If maxrmargin is violated, it will break and continue

* writing from the right-margin, which will lead to the above scenario

* upon exit. Otherwise, the line will break at the right margin.

void

term_flushln(struct termp *p)

Line 179 term_flushln(struct termp *p)

Line 172 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;

* 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]);

}

Line 193 term_flushln(struct termp *p)

Line 194 term_flushln(struct termp *p)

vend -= vis;

(*p->endline)(p);

p->viscol = 0;

if (TERMP_NOBREAK & p->flags) {

if (TERMP_BRIND & p->flags) {

vbl = p->rmargin;

vend += p->rmargin - p->offset;

} else

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 245 term_flushln(struct termp *p)

Line 248 term_flushln(struct termp *p)

vbl = 0;

}

if (ASCII_HYPH == p->buf[i]) {

(*p->letter)(p, '-');

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

continue;

}

(*p->letter)(p, p->buf[i]);

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

p->viscol -= (*p->width)(p, p->buf[i-1]);

Line 619 encode(struct termp *p, const char *word, size_t sz)

Line 616 encode(struct termp *p, const char *word, size_t sz)

}

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

term_len(const struct termp *p, size_t sz)

{

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

Line 671 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 732 term_strlen(const struct termp *p, const char *cp)

Line 760 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