diff options
| author | Cem Keylan <cem@ckyln.com> | 2020-10-19 13:43:05 +0300 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2020-10-19 13:43:05 +0300 |
| commit | 75666cb76815ffd35a30153c6cabc53601e9e2de (patch) | |
| tree | 89385348ea2708d9371704e188bcd1004d7a589a /usr.bin/mandoc/roff_term.c | |
| parent | 2171aa6ddbd6f9cbec58ac40ae0b5e511d1b871a (diff) | |
| download | otools-75666cb76815ffd35a30153c6cabc53601e9e2de.tar.gz | |
usr.bin: update to 6.8
Diffstat (limited to 'usr.bin/mandoc/roff_term.c')
| -rw-r--r-- | usr.bin/mandoc/roff_term.c | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/usr.bin/mandoc/roff_term.c b/usr.bin/mandoc/roff_term.c index ef90623..069206a 100644 --- a/usr.bin/mandoc/roff_term.c +++ b/usr.bin/mandoc/roff_term.c @@ -1,6 +1,6 @@ -/* $OpenBSD: roff_term.c,v 1.19 2019/01/04 03:24:30 schwarze Exp $ */ +/* $OpenBSD: roff_term.c,v 1.21 2020/09/03 20:33:20 schwarze Exp $ */ /* - * Copyright (c) 2010,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010,2014,2015,2017-2020 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -155,9 +155,13 @@ static void roff_term_pre_po(ROFF_TERM_ARGS) { struct roffsu su; - static int po, polast; + static int po, pouse, polast; int ponew; + /* Revert the currently active page offset. */ + p->tcol->offset -= pouse; + + /* Determine the requested page offset. */ if (n->child != NULL && a2roffsu(n->child->string, &su, SCALE_EM) != NULL) { ponew = term_hen(p, &su); @@ -166,11 +170,15 @@ roff_term_pre_po(ROFF_TERM_ARGS) ponew += po; } else ponew = polast; + + /* Remeber both the previous and the newly requested offset. */ polast = po; po = ponew; - ponew = po - polast + (int)p->tcol->offset; - p->tcol->offset = ponew > 0 ? ponew : 0; + /* Truncate to the range [-offset, 60], remember, and apply it. */ + pouse = po >= 60 ? 60 : + po < -(int)p->tcol->offset ? -p->tcol->offset : po; + p->tcol->offset += pouse; } static void @@ -208,6 +216,7 @@ roff_term_pre_ti(ROFF_TERM_ARGS) { struct roffsu su; const char *cp; + const size_t maxoff = 72; int len, sign; roff_term_pre_br(p, n); @@ -228,17 +237,26 @@ roff_term_pre_ti(ROFF_TERM_ARGS) return; len = term_hen(p, &su); - if (sign == 0) { + switch (sign) { + case 1: + if (p->tcol->offset + len <= maxoff) + p->ti = len; + else if (p->tcol->offset < maxoff) + p->ti = maxoff - p->tcol->offset; + else + p->ti = 0; + break; + case -1: + if ((size_t)len < p->tcol->offset) + p->ti = -len; + else + p->ti = -p->tcol->offset; + break; + default: + if ((size_t)len > maxoff) + len = maxoff; p->ti = len - p->tcol->offset; - p->tcol->offset = len; - } else if (sign == 1) { - p->ti = len; - p->tcol->offset += len; - } else if ((size_t)len < p->tcol->offset) { - p->ti = -len; - p->tcol->offset -= len; - } else { - p->ti = -p->tcol->offset; - p->tcol->offset = 0; + break; } + p->tcol->offset += p->ti; } |