diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-06-14 13:00:31 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-14 13:00:31 +0000 |
| commit | d7510635200bec5516c0a2f66d8a4fe42b453020 (patch) | |
| tree | a522ca674fa0a83045235d44267b418171e323e5 /roff_term.c | |
| parent | 078c4f79913f5f296b88db4a9fed67f1ea124c86 (diff) | |
| download | mandoc-d7510635200bec5516c0a2f66d8a4fe42b453020.tar.gz mandoc-d7510635200bec5516c0a2f66d8a4fe42b453020.tar.zst mandoc-d7510635200bec5516c0a2f66d8a4fe42b453020.zip | |
implement roff(7) .rj (right justify) request
Diffstat (limited to 'roff_term.c')
| -rw-r--r-- | roff_term.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/roff_term.c b/roff_term.c index 7574102b..bfcb2d0f 100644 --- a/roff_term.c +++ b/roff_term.c @@ -1,4 +1,4 @@ -/* $Id: roff_term.c,v 1.10 2017/06/08 12:54:58 schwarze Exp $ */ +/* $Id: roff_term.c,v 1.11 2017/06/14 13:00:31 schwarze Exp $ */ /* * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -42,6 +42,7 @@ static const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = { roff_term_pre_ft, /* ft */ roff_term_pre_ll, /* ll */ roff_term_pre_mc, /* mc */ + roff_term_pre_ce, /* rj */ roff_term_pre_sp, /* sp */ roff_term_pre_ta, /* ta */ roff_term_pre_ti, /* ti */ @@ -69,33 +70,34 @@ roff_term_pre_br(ROFF_TERM_ARGS) static void roff_term_pre_ce(ROFF_TERM_ARGS) { - const struct roff_node *nch; + const struct roff_node *nc1, *nc2; size_t len, lm; roff_term_pre_br(p, n); lm = p->tcol->offset; - n = n->child->next; - while (n != NULL) { - nch = n; + nc1 = n->child->next; + while (nc1 != NULL) { + nc2 = nc1; len = 0; do { - if (n->type == ROFFT_TEXT) { + if (nc2->type == ROFFT_TEXT) { if (len) len++; - len += term_strlen(p, nch->string); + len += term_strlen(p, nc2->string); } - nch = nch->next; - } while (nch != NULL && (n->type != ROFFT_TEXT || - (n->flags & NODE_LINE) == 0)); + nc2 = nc2->next; + } while (nc2 != NULL && (nc2->type != ROFFT_TEXT || + (nc2->flags & NODE_LINE) == 0)); p->tcol->offset = len >= p->tcol->rmargin ? 0 : lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len : + n->tok == ROFF_rj ? p->tcol->rmargin - len : (lm + p->tcol->rmargin - len) / 2; - while (n != nch) { - if (n->type == ROFFT_TEXT) - term_word(p, n->string); + while (nc1 != nc2) { + if (nc1->type == ROFFT_TEXT) + term_word(p, nc1->string); else - roff_term_pre(p, n); - n = n->next; + roff_term_pre(p, nc1); + nc1 = nc1->next; } p->flags |= TERMP_NOSPACE; term_flushln(p); |