Re: TERMP_NOLPAD r.i.p.

[Ingo Schwarze <schwarze@usta.de>]

Hi Kristaps,

Kristaps Dzonsons wrote on Tue, Sep 20, 2011 at 01:12:29PM +0200:

> This last checkin raised an assertion failure when run over NetBSD's
> manuals.  One can reproduce the failure as follows (cut from
> slapo-retcode.5):
> 
> .TH SLAPO-RETCODE 5 "2010/06/30" "OpenLDAP 2.4.23"
> .SH NAME
> slapo\-retcode \- return code overlay to slapd
> .SH DESCRIPTION
> This directive defines the parent DN where dynamically generated
> entries reside.
> If not defined, the suffix of the database is used.
> .HP
> .hy 0
> .B retcode\-item <RDN> <errCode> [op=<oplist>] [text=<message>]
> .B [ref=<referral>] [sleeptime=<sec>] [matched=<DN>]
> .B [unsolicited=<OID>[:<data>]] [flags=[{pre|post}\-]disconnect[,...]]
> .RS
> A dynamically generated entry, located below \fBretcode\-parent\fP.

Looks like that is an unrelated bug in pre_RS, merely uncovered
by the changes.  When changing the output offset, .RS neglects
to reset the right margin to the default, and it also neglects
to check whether the offset fits into the margin.

The following fixes the (ugly!) test page, and i see no
regressions.

OK?
  Ingo


Index: man_term.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/man_term.c,v
retrieving revision 1.73
diff -u -p -r1.73 man_term.c
--- man_term.c	20 Sep 2011 09:02:18 -0000	1.73
+++ man_term.c	20 Sep 2011 12:04:15 -0000
@@ -822,7 +822,8 @@ pre_RS(DECL_ARGS)
 			sz = (size_t)ival;
 
 	mt->offset += sz;
-	p->offset = mt->offset;
+	p->rmargin = p->maxrmargin;
+	p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin;
 
 	if (++mt->lmarginsz < MAXMARGINS)
 		mt->lmargincur = mt->lmarginsz;
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv