Re: Parsing errors, output regressions with new XML parser

[Ingo Schwarze <schwarze@usta.de>]

Hi Stephen,

Stephen Gregoratto wrote on Sat, Mar 30, 2019 at 11:19:19AM +1100:

> -  There are regressions in how <author> and <citerefentry>
>    nodes are transformed. The example I pointed out previously:
> 
>   <author>
>     <personname>
>       <firstname>Joe</firstname>
>       <surname>Bloggs</surname>
>     </personname>
>     <email>joe@foo.net</email>
>   </author>
> 
>   Now converts to:
> 
>   .Dd $Mdocdate$
>   .Dt UNKNOWN 1
>   .Os
>   .Sh AUTHORS
>   .Nm foo
>   is maintained by
>   .An \&Joe Bloggs ,
>   .Aq Mt joe@foo.net
>   \&.

Fixing that was quite straightforward, see the commit below.

I also added a regression test based on your example to my regress/
directory, which is so far private.  But at some point, i will almost
certainly want to publish that; i didn't do that yet because making
Makefiles portable is a pain.  Are you comfortable with your
contributions being included under the ISC license (of course
including the correct Copyright notice with your name)?

 $ cat regress/author/email.{xml,out}        
<part>
  <!-- Copyright (c) 2019 Stephen Gregoratto -->
  <author>
    <affiliation>Placeholder Inc.</affiliation>
    <email>joe@foo.net</email>
    <personname>
      <firstname>Joe</firstname>
      <surname>Bloggs</surname>
    </personname>
  </author>
</part>
.An \&Joe Bloggs Aq Mt joe@foo.net ,
Placeholder Inc.

Thanks,
  Ingo


Log Message:
-----------
use the idiom ".An Name Aq Mt email" for author email addresses;
issue reported by Stephen Gregoratto <dev at sgregoratto dot me>

Modified Files:
--------------
    docbook2mdoc:
        docbook2mdoc.c

Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.79 -r1.80
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -438,6 +438,16 @@ pnode_printauthor(struct format *f, stru
 	}
 
 	/*
+	 * If there is an email address,
+	 * print it on the same macro line.
+	 */
+
+	if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) {
+		pnode_print(f, nc);
+		pnode_unlink(nc);
+	}
+
+	/*
 	 * If there are still unprinted children, end the scope
 	 * with a comma.  Otherwise, leave the scope open in case
 	 * a text node follows that starts with closing punctuation.
--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv