Re: .Bl and .Pp

[Ingo Schwarze <schwarze@usta.de>]

Hi Joerg,

Joerg Sonnenberger wrote on Sun, May 23, 2010 at 02:14:14AM +0200:
> On Tue, May 18, 2010 at 09:39:27AM +0200, Kristaps Dzonsons wrote:
>> Someone wrote:

>>> The file also shows another issue.
>>>
>>> .Bl -tag -compact
>>> .Sm off
>>> .It ...
>>> .Sm on
>>> .El
>>>
>>> triggers the assertion in mdoc_action.c:618 (post_bl_tagwidth).
>>>
>>> I think we have to explicitly scan forward until we find an .It child,
>>> but what do you think?

>> Will look into it...

> Patch attached. Skip over non-It macros for this purpose.

This is
  OK schwarze@

and also tested and committed in the OpenBSD tree.

Yours,
  Ingo


> Index: mdoc_action.c
> ===================================================================
> RCS file: /home/joerg/cvsroot/mdocml/mdoc_action.c,v
> retrieving revision 1.60
> diff -u -p -r1.60 mdoc_action.c
> --- mdoc_action.c	17 May 2010 23:57:06 -0000	1.60
> +++ mdoc_action.c	23 May 2010 00:07:11 -0000
> @@ -637,11 +637,14 @@ post_bl_tagwidth(POST_ARGS)
>  	/* Defaults to ten ens. */
>  
>  	sz = 10; /* XXX: make this a macro value. */
> -	nn = n->body->child;
> +
> +	for (nn = n->body->child; nn; nn = nn->next) {
> +		if (MDOC_It == nn->tok)
> +			break;
> +	}
>  
>  	if (nn) {
>  		assert(MDOC_BLOCK == nn->type);
> -		assert(MDOC_It == nn->tok);
>  		nn = nn->head->child;
>  		if (MDOC_TEXT != nn->type) {
>  			sz = mdoc_macro2len(nn->tok);
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv