version 1.211, 2013/12/22 23:34:13 |
version 1.221, 2014/04/08 07:13:12 |
|
|
/* $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, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2014 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 |
|
|
|
|
#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 72 term_end(struct termp *p) |
|
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: |
* 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 |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
Line 120 term_flushln(struct termp *p) |
|
Line 113 term_flushln(struct termp *p) |
|
* First, establish the maximum columns of "visible" content. |
* First, establish the maximum columns of "visible" content. |
* This is usually the difference between the right-margin and |
* This is usually the difference between the right-margin and |
* an indentation, but can be, for tagged lists or columns, a |
* an indentation, but can be, for tagged lists or columns, a |
* small set of values. |
* small set of values. |
|
* |
|
* The following unsigned-signed subtractions look strange, |
|
* but they are actually correct. If the int p->overstep |
|
* is negative, it gets sign extended. Subtracting that |
|
* very large size_t effectively adds a small number to dv. |
*/ |
*/ |
assert (p->rmargin >= p->offset); |
assert (p->rmargin >= p->offset); |
dv = p->rmargin - p->offset; |
dv = p->rmargin - p->offset; |
Line 174 term_flushln(struct termp *p) |
|
Line 172 term_flushln(struct termp *p) |
|
/* Regular word. */ |
/* Regular word. */ |
/* Break at the hyphen point if we overrun. */ |
/* Break at the hyphen point if we overrun. */ |
if (vend > vis && vend < bp && |
if (vend > vis && vend < bp && |
ASCII_HYPH == p->buf[j]) |
(ASCII_HYPH == 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 188 term_flushln(struct termp *p) |
|
Line 194 term_flushln(struct termp *p) |
|
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
p->viscol = 0; |
if (TERMP_NOBREAK & p->flags) { |
if (TERMP_BRIND & p->flags) { |
vbl = p->rmargin; |
vbl = p->rmargin; |
vend += p->rmargin - p->offset; |
vend += p->rmargin - p->offset; |
} else |
} else |
Line 199 term_flushln(struct termp *p) |
|
Line 205 term_flushln(struct termp *p) |
|
if (0 < ntab) |
if (0 < ntab) |
vbl += ntab * p->tabwidth; |
vbl += ntab * p->tabwidth; |
|
|
/* Remove the p->overstep width. */ |
/* |
|
* Remove the p->overstep width. |
|
* Again, if p->overstep is negative, |
|
* sign extension does the right thing. |
|
*/ |
|
|
bp += (size_t)p->overstep; |
bp += (size_t)p->overstep; |
p->overstep = 0; |
p->overstep = 0; |
Line 224 term_flushln(struct termp *p) |
|
Line 234 term_flushln(struct termp *p) |
|
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
|
if (ASCII_BREAK == p->buf[i]) |
|
continue; |
|
|
/* |
/* |
* Now we definitely know there will be |
* Now we definitely know there will be |
Line 236 term_flushln(struct termp *p) |
|
Line 248 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 275 term_flushln(struct termp *p) |
|
Line 281 term_flushln(struct termp *p) |
|
* If we have overstepped the margin, temporarily move |
* If we have overstepped the margin, temporarily move |
* it to the right and flag the rest of the line to be |
* it to the right and flag the rest of the line to be |
* shorter. |
* shorter. |
|
* If there is a request to keep the columns together, |
|
* allow negative overstep when the column is not full. |
*/ |
*/ |
if (p->overstep < 0) |
if (p->trailspace && p->overstep < 0) |
p->overstep = 0; |
p->overstep = 0; |
return; |
return; |
|
|
Line 396 term_fontpop(struct termp *p) |
|
Line 404 term_fontpop(struct termp *p) |
|
void |
void |
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
|
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char *seq, *cp; |
const char *seq, *cp; |
char c; |
char c; |
int sz, uc; |
int sz, uc; |
Line 418 term_word(struct termp *p, const char *word) |
|
Line 427 term_word(struct termp *p, const char *word) |
|
else |
else |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM); |
p->flags &= ~TERMP_SENTENCE; |
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
Line 427 term_word(struct termp *p, const char *word) |
|
Line 436 term_word(struct termp *p, const char *word) |
|
word++; |
word++; |
continue; |
continue; |
} |
} |
ssz = strcspn(word, "\\"); |
if (TERMP_NBRWORD & p->flags) { |
|
if (' ' == *word) { |
|
encode(p, nbrsp, 1); |
|
word++; |
|
continue; |
|
} |
|
ssz = strcspn(word, "\\ "); |
|
} else |
|
ssz = strcspn(word, "\\"); |
encode(p, word, ssz); |
encode(p, word, ssz); |
word += (int)ssz; |
word += (int)ssz; |
continue; |
continue; |
Line 502 term_word(struct termp *p, const char *word) |
|
Line 519 term_word(struct termp *p, const char *word) |
|
break; |
break; |
} |
} |
} |
} |
|
p->flags &= ~TERMP_NBRWORD; |
} |
} |
|
|
static void |
static void |
Line 598 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 |
size_t |
term_len(const struct termp *p, size_t sz) |
term_len(const struct termp *p, size_t sz) |
{ |
{ |
Line 623 term_strlen(const struct termp *p, const char *cp) |
|
Line 671 term_strlen(const struct termp *p, const char *cp) |
|
int ssz, skip, c; |
int ssz, skip, c; |
const char *seq, *rhs; |
const char *seq, *rhs; |
enum mandoc_esc esc; |
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 |
* Account for escaped sequences within string length |
Line 638 term_strlen(const struct termp *p, const char *cp) |
|
Line 687 term_strlen(const struct termp *p, const char *cp) |
|
for (i = 0; i < rsz; i++) |
for (i = 0; i < rsz; i++) |
sz += cond_width(p, *cp++, &skip); |
sz += cond_width(p, *cp++, &skip); |
|
|
c = 0; |
|
switch (*cp) { |
switch (*cp) { |
case ('\\'): |
case ('\\'): |
cp++; |
cp++; |
Line 712 term_strlen(const struct termp *p, const char *cp) |
|
Line 760 term_strlen(const struct termp *p, const char *cp) |
|
case (ASCII_HYPH): |
case (ASCII_HYPH): |
sz += cond_width(p, '-', &skip); |
sz += cond_width(p, '-', &skip); |
cp++; |
cp++; |
|
/* FALLTHROUGH */ |
|
case (ASCII_BREAK): |
break; |
break; |
default: |
default: |
break; |
break; |