diff options
| -rw-r--r-- | regress/roff/ce/basic.in | 14 | ||||
| -rw-r--r-- | regress/roff/ce/basic.out_ascii | 10 | ||||
| -rw-r--r-- | term.c | 21 |
3 files changed, 29 insertions, 16 deletions
diff --git a/regress/roff/ce/basic.in b/regress/roff/ce/basic.in index 9930d56b..e2bd88b9 100644 --- a/regress/roff/ce/basic.in +++ b/regress/roff/ce/basic.in @@ -1,5 +1,5 @@ -.\" $OpenBSD: basic.in,v 1.1 2019/01/04 01:06:44 schwarze Exp $ -.TH CE-BASIC 1 "January 4, 2019" +.\" $OpenBSD: basic.in,v 1.2 2020/09/02 16:36:48 schwarze Exp $ +.TH CE-BASIC 1 "September 2, 2020" .SH NAME ce-basic \- basic usage of the centering request .SH DESCRIPTION @@ -13,5 +13,15 @@ text .rj 2 Text adjusted to the right margin works in just the same way and isn't filled either. +.PP +.nf +Now entering +explicit no-fill mode. +.ce 2 +Text is still +not filled. +.PP +.fi final text +in fill mode diff --git a/regress/roff/ce/basic.out_ascii b/regress/roff/ce/basic.out_ascii index 709e1e96..fe292e71 100644 --- a/regress/roff/ce/basic.out_ascii +++ b/regress/roff/ce/basic.out_ascii @@ -12,8 +12,14 @@ DDEESSCCRRIIPPTTIIOONN normal text Text adjusted to the right margin works in just the same way and isn't filled either. - final text + Now entering + explicit no-fill mode. + Text is still + not filled. + final text in fill mode -OpenBSD January 4, 2019 CE-BASIC(1) + + +OpenBSD September 2, 2020 CE-BASIC(1) @@ -1,7 +1,7 @@ -/* $Id$ */ +/* $Id$ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2010-2019 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2010-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 @@ -38,8 +38,7 @@ static void bufferc(struct termp *, char); static void encode(struct termp *, const char *, size_t); static void encode1(struct termp *, int); static void endline(struct termp *); -static void term_field(struct termp *, size_t, size_t, - size_t, size_t); +static void term_field(struct termp *, size_t, size_t); static void term_fill(struct termp *, size_t *, size_t *, size_t); @@ -127,8 +126,7 @@ term_flushln(struct termp *p) * and with the BRNEVER flag, never break it at all. */ - vtarget = p->flags & TERMP_BRNEVER ? SIZE_MAX : - (p->flags & TERMP_NOBREAK) == 0 ? vfield : + vtarget = (p->flags & TERMP_NOBREAK) == 0 ? vfield : p->maxrmargin > p->viscol + vbl ? p->maxrmargin - p->viscol - vbl : 0; @@ -137,7 +135,8 @@ term_flushln(struct termp *p) * If there is whitespace only, print nothing. */ - term_fill(p, &nbr, &vbr, vtarget); + term_fill(p, &nbr, &vbr, + p->flags & TERMP_BRNEVER ? SIZE_MAX : vtarget); if (nbr == 0) break; @@ -156,7 +155,7 @@ term_flushln(struct termp *p) /* Finally, print the field content. */ - term_field(p, vbl, nbr, vbr, vtarget); + term_field(p, vbl, nbr); /* * If there is no text left in the field, exit the loop. @@ -345,12 +344,10 @@ term_fill(struct termp *p, size_t *nbr, size_t *vbr, size_t vtarget) /* * Print the contents of one field * with an indentation of vbl visual columns, - * an input string length of nbr characters, - * an output width of vbr visual columns, - * and a desired field width of vtarget visual columns. + * and an input string length of nbr characters. */ static void -term_field(struct termp *p, size_t vbl, size_t nbr, size_t vbr, size_t vtarget) +term_field(struct termp *p, size_t vbl, size_t nbr) { size_t ic; /* Character position in the input buffer. */ size_t vis; /* Visual position of the current character. */ |