.TP/.HP inconsistent indentation with .br?

.TP/.HP inconsistent indentation with .br?

[Christian Neukirchen]

The following is a minimal example from a bug found in Linux dmsetup(8):

\f
.SH SYNOPSIS
.TP
.B mirror
.br
Mirrors data across two or more devices.
.HP
.B multipath
.br
Mediates access through multiple paths to the same device.
\f

In groff-1.22.3 and plan9port nroff both sentences are indented 5
spaces, in mdocml-1.13.3 the second sentence is not indented at all.

-- 
Christian Neukirchen  <chneukirchen@gmail.com>  http://chneukirchen.org
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv

Re: .TP/.HP inconsistent indentation with .br?

[Ingo Schwarze]

Hi Christian,

Christian Neukirchen wrote on Wed, Apr 08, 2015 at 04:13:53PM +0200:

> The following is a minimal example from a bug found in Linux dmsetup(8):
> 
> \f
> .SH SYNOPSIS
> .TP
> .B mirror
> .br
> Mirrors data across two or more devices.
> .HP
> .B multipath
> .br
> Mediates access through multiple paths to the same device.
> \f
> 
> In groff-1.22.3 and plan9port nroff both sentences are indented 5
> spaces, in mdocml-1.13.3 the second sentence is not indented at all.

I just committed a fix to both OpenBSD and mdocml.bsd.lv.

Thanks for reporting!
  Ingo


Log Message:
-----------
If an explicit line break request (.br or .sp) occurs within an .HP block,
the next line doesn't hang, but is simply indented.
Issue found by Christian Neukirchen <chneukirchen at gmail dot com>
in the dmsetup(8) manual on Linux.
This patch also improves the indentation of XDGA(3) and XrmGetResource(3).

Modified Files:
--------------
    mdocml:
        man_term.c

Revision Data
-------------
Index: man_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/man_term.c,v
retrieving revision 1.182
retrieving revision 1.183
diff -Lman_term.c -Lman_term.c -u -p -r1.182 -r1.183
--- man_term.c
+++ man_term.c
@@ -482,6 +482,17 @@ pre_sp(DECL_ARGS)
 		for (i = 0; i < len; i++)
 			term_vspace(p);
 
+	/*
+	 * Handle an explicit break request in the same way
+	 * as an overflowing line.
+	 */
+
+	if (p->flags & TERMP_BRIND) {
+		p->offset = p->rmargin;
+		p->rmargin = p->maxrmargin;
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
+	}
+
 	return(0);
 }
 
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv