Re: mdocml: Make -man -Tascii not break within literal lines

[Ingo Schwarze <schwarze@usta.de>]

Hi Kristaps,

Kristaps Dzonsons wrote on Sun, Jan 16, 2011 at 10:56:20AM +0100:

> >Index: man_term.c
> >===================================================================
> >RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_term.c,v
> >retrieving revision 1.97
> >diff -u -p -r1.97 man_term.c
> >--- man_term.c	12 Jan 2011 15:23:25 -0000	1.97
> >+++ man_term.c	16 Jan 2011 03:49:36 -0000
> >@@ -1,6 +1,6 @@
> >  /*	$Id: man_term.c,v 1.97 2011/01/12 15:23:25 kristaps Exp $ */
> >  /*
> >- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons<kristaps@bsd.lv>
> >+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons<kristaps@bsd.lv>
> >   * Copyright (c) 2010, 2011 Ingo Schwarze<schwarze@openbsd.org>
> >   *
> >   * Permission to use, copy, modify, and distribute this software for any
> >@@ -864,7 +864,7 @@ print_man_node(DECL_ARGS)
> >  		 */
> >  		if ('\0' == *n->string) {
> >  			term_vspace(p);
> >-			break;
> >+			return;
> >  		} else if (' ' == *n->string&&  MAN_LINE&  n->flags)
> >  			term_newln(p);
> 
> Ingo, great catch!  Is it doing the same in -Thtml?

No, in man_html.c, function print_man_node(), the comparable place
in the code already does return.

> You may want to check -mdoc too (in both cases)...
> They all use the same logic.

In mdoc_term.c, the function print_mdoc_node() does not contain
any return statement at all, so it is OK that the leading space
case doesn't, either.

In mdoc_html.c, function print_mdoc_node(), the return is at the
end of the MDOC_TEXT case, which correctly covers both the leading
space and the regular case.

Thus, the logic is _slightly_ different in all four files,
and man_term.c was the only one affected.

I'm going to merge the fix to bsd.lv right now.

Yours,
  Ingo
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv