diff options
| -rw-r--r-- | regress/usr.bin/mandoc/roff/ti/Makefile | 10 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/roff/ti/wide.in | 19 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/roff/ti/wide.out_ascii | 22 | ||||
| -rw-r--r-- | usr.bin/mandoc/roff_term.c | 34 |
4 files changed, 71 insertions, 14 deletions
diff --git a/regress/usr.bin/mandoc/roff/ti/Makefile b/regress/usr.bin/mandoc/roff/ti/Makefile index 6203d4f4821..aa0b1f97325 100644 --- a/regress/usr.bin/mandoc/roff/ti/Makefile +++ b/regress/usr.bin/mandoc/roff/ti/Makefile @@ -1,5 +1,11 @@ -# $OpenBSD: Makefile,v 1.1 2017/05/08 15:33:43 schwarze Exp $ +# $OpenBSD: Makefile,v 1.2 2020/09/03 17:37:06 schwarze Exp $ -REGRESS_TARGETS = basic-mdoc basic-man +REGRESS_TARGETS = basic-mdoc basic-man wide + +# groff-1.22.4 defect: +# - Excessive temporare indentations cause excessive line lengths +# instead of being truncated to resonable indentations. + +SKIP_GROFF = wide .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/roff/ti/wide.in b/regress/usr.bin/mandoc/roff/ti/wide.in new file mode 100644 index 00000000000..46a1f90be84 --- /dev/null +++ b/regress/usr.bin/mandoc/roff/ti/wide.in @@ -0,0 +1,19 @@ +.\" $OpenBSD: wide.in,v 1.1 2020/09/03 17:37:06 schwarze Exp $ +.TH TI-WIDE 1 "September 3, 2020" +.SH NAME +ti-wide \- excessive temporary indentation +.SH DESCRIPTION +Absolute .ti of more than 72n: +.ti 80n +max +.RS 40n +Indented block plus excessive relative indentation: +.ti +40n +max +.RE +.RS 66n +Block beyond 72n: +.ti +4n +same +.RE +Back to normal. diff --git a/regress/usr.bin/mandoc/roff/ti/wide.out_ascii b/regress/usr.bin/mandoc/roff/ti/wide.out_ascii new file mode 100644 index 00000000000..95a98ddcfaa --- /dev/null +++ b/regress/usr.bin/mandoc/roff/ti/wide.out_ascii @@ -0,0 +1,22 @@ +TI-WIDE(1) General Commands Manual TI-WIDE(1) + + + +NNAAMMEE + ti-wide - excessive temporary indentation + +DDEESSCCRRIIPPTTIIOONN + Absolute .ti of more than 72n: + max + Indented block plus excessive + relative indentation: + max + Block + beyond + 72n: + same + Back to normal. + + + +OpenBSD September 3, 2020 TI-WIDE(1) diff --git a/usr.bin/mandoc/roff_term.c b/usr.bin/mandoc/roff_term.c index ef90623538e..dc4d4d81bc7 100644 --- a/usr.bin/mandoc/roff_term.c +++ b/usr.bin/mandoc/roff_term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: roff_term.c,v 1.19 2019/01/04 03:24:30 schwarze Exp $ */ +/* $OpenBSD: roff_term.c,v 1.20 2020/09/03 17:37:06 schwarze Exp $ */ /* * Copyright (c) 2010,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org> * @@ -208,6 +208,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 +229,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; } |