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:

> -  XML comments aren't ignored.

Most comments were already ignored.
However...

>    This leads to documents like these[1] 
>    being formatted as one loooong section under NAME.
> [1] https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/reference/gtk/css-overview.xml#L20

... you have a point here.  If a comment contains a greater-than sign,
than was mistaken as the end of the comment.

Fixed with the commit below.

Thanks for the report,
  Ingo


Log Message:
-----------
skip XML comments even if they contain greater-than characters;
issue reported by Stephen Gregoratto <dev at sgregoratto dot me>

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

Revision Data
-------------
Index: parse.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/parse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lparse.c -Lparse.c -u -p -r1.7 -r1.8
--- parse.c
+++ parse.c
@@ -522,6 +522,7 @@ struct ptree *
 parse_file(struct parse *p, int fd, const char *fname)
 {
 	char		 b[4096];
+	char		*cp;
 	ssize_t		 rsz;	/* Return value from read(2). */
 	size_t		 rlen;  /* Number of bytes in b[]. */
 	size_t		 poff;  /* Parse offset in b[]. */
@@ -647,6 +648,29 @@ parse_file(struct parse *p, int fd, cons
 				if (advance(p, b, rlen, &pend, " >") &&
 				    rsz > 0)
 					break;
+				if (pend > poff + 3 &&
+				    strncmp(b + poff, "<!--", 4) == 0) {
+
+					/* Skip a comment. */
+
+					cp = strstr(b + pend - 2, "-->");
+					if (cp == NULL) {
+						if (rsz > 0) {
+							pend = rlen;
+							break;
+						}
+						cp = b + rlen;
+					} else
+						cp += 3;
+					while (b + pend < cp) {
+						if (b[++pend] == '\n') {
+							p->nline++;
+							p->ncol = 1;
+						} else
+							p->ncol++;
+					}
+					continue;
+				}
 				elem_end = 0;
 				if (b[pend] != '>')
 					in_tag = 1;
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv

--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv