r80756 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r80755‎ \| r80756 \| r80757 >
Date:	17:20, 22 January 2011
Author:	aj
Status:	deferred
Tags:
Comment:	handling of garbage contents
Modified paths:	/trunk/parsers/libmwparser/Makefile.am (modified) (history) /trunk/parsers/libmwparser/Makefile.in (modified) (history) /trunk/parsers/libmwparser/include/mwgarbage.h (added) (history) /trunk/parsers/libmwparser/include/mwlistener.h (modified) (history) /trunk/parsers/libmwparser/include/mwparsercontext.h (modified) (history) /trunk/parsers/libmwparser/src/mwWikitextParser.g (modified) (history) /trunk/parsers/libmwparser/src/mwbasicevents.c (modified) (history) /trunk/parsers/libmwparser/src/mwformats.c (modified) (history) /trunk/parsers/libmwparser/src/mwgarbage.c (added) (history) /trunk/parsers/libmwparser/src/mwheadings.c (modified) (history) /trunk/parsers/libmwparser/src/mwhtml.c (modified) (history) /trunk/parsers/libmwparser/src/mwlexerpredicatetable.php (modified) (history) /trunk/parsers/libmwparser/src/mwlistener.template (modified) (history) /trunk/parsers/libmwparser/src/mwparsercontext.c (modified) (history) /trunk/parsers/libmwparser/src/mwtables.c (modified) (history) /trunk/parsers/libmwparser/src/tracingcontext.c (modified) (history) /trunk/parsers/libmwparser/tests/format/heading1.out (modified) (history) /trunk/parsers/libmwparser/tests/hr/hr1.out (modified) (history) /trunk/parsers/libmwparser/tests/html/garbage.in (added) (history) /trunk/parsers/libmwparser/tests/html/garbage.out (added) (history) /trunk/parsers/libmwparser/tests/link/link5.out (modified) (history) /trunk/parsers/libmwparser/tests/list/list2.out (modified) (history) /trunk/parsers/libmwparser/tests/table/table3.out (modified) (history) /trunk/parsers/libmwparser/tests/table/table6.out (modified) (history) /trunk/parsers/libmwparser/tests/table/table7.in (added) (history) /trunk/parsers/libmwparser/tests/table/table7.out (added) (history) /trunk/parsers/libmwparser/tests/testsuite (modified) (history) /trunk/parsers/libmwparser/tests/testsuite.at (modified) (history) /trunk/parsers/libmwparser/wrapper/src/mwscriptbufferlistener.c (modified) (history)

Diff [purge]

Index: trunk/parsers/libmwparser/wrapper/src/mwscriptbufferlistener.c
—	—	@@ -122,6 +122,8 @@
123	123	static void SBBeginHtmlAbbr(MWLISTENER *listener, pANTLR3_VECTOR attr);
124	124	static void SBEndHtmlAbbr(MWLISTENER *listener);
125	125	static void SBOnHtmlPre(MWLISTENER *listener, pANTLR3_STRING body, pANTLR3_VECTOR attr);
	126	+static void SBBeginGarbage(MWLISTENER *listener);
	127	+static void SBEndGarbage(MWLISTENER *listener);
126	128	static void * SBNew(void);
127	129	static void SBReset(void *data);
128	130	static void SBFree(void *data);
—	—	@@ -267,7 +269,8 @@
268	270	.beginHtmlAbbr = SBBeginHtmlAbbr,
269	271	.endHtmlAbbr = SBEndHtmlAbbr,
270	272	.onHtmlPre = SBOnHtmlPre,
271		-
	273	+ .beginGarbage = SBBeginGarbage,
	274	+ .endGarbage = SBEndGarbage,
272	275	};
273	276
274	277
—	—	@@ -872,7 +875,7 @@
873	876	DATA->width = width;
874	877	DATA->url = linkResolution->url;
875	878	DATA->imageUrl = linkResolution->imageUrl;
876		~~- DATA->alt = mlOption == NULL ? NULL : mlOption->alt;~~
	879	+ DATA->alt = (char *) (mlOption == NULL ? NULL : mlOption->alt);
877	880	DATA->renderMarkup = false;
878	881	DATA->startCaption = getIndex(&DATA->buf);
879	882	}
—	—	@@ -1877,3 +1880,14 @@
1878	1881	SBOnSpecial(listener, body);
1879	1882	HTML_END("pre");
1880	1883	}
	1884	+
	1885	+
	1886	+static void
	1887	+SBBeginGarbage(MWLISTENER *listener)
	1888	+{
	1889	+}
	1890	+
	1891	+static void
	1892	+SBEndGarbage(MWLISTENER *listener)
	1893	+{
	1894	+}
Index: trunk/parsers/libmwparser/Makefile.in
—	—	@@ -83,7 +83,7 @@
84	84	libmwparser_la-mwbasicevents.lo libmwparser_la-mwformats.lo \
85	85	libmwparser_la-mwheadings.lo libmwparser_la-mwhtml.lo \
86	86	libmwparser_la-mwlexercontext.lo libmwparser_la-mwlinks.lo \
87		~~- libmwparser_la-mwlinkresolution.lo \~~
	87	+ libmwparser_la-mwgarbage.lo libmwparser_la-mwlinkresolution.lo \
88	88	libmwparser_la-mwlinkcollection.lo \
89	89	libmwparser_la-mwmedialinkoption.lo libmwparser_la-mwparser.lo \
90	90	libmwparser_la-mwparsercontext.lo libmwparser_la-mwtagext.lo \
—	—	@@ -313,6 +313,7 @@
314	314	include/mwformats.h \
315	315	include/mwheadings.h \
316	316	include/mwhtml.h \
	317	+ include/mwgarbage.h \
317	318	include/mwkeyvalue.h \
318	319	include/mwlexercontext.h \
319	320	include/mwlinkcollection.h \
—	—	@@ -333,6 +334,7 @@
334	335	src/mwhtml.c \
335	336	src/mwlexercontext.c \
336	337	src/mwlinks.c \
	338	+ src/mwgarbage.c \
337	339	src/mwlinkresolution.c \
338	340	src/mwlinkcollection.c \
339	341	src/mwmedialinkoption.c \
—	—	@@ -457,6 +459,7 @@
458	460	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwattributes.Plo@am__quote@
459	461	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwbasicevents.Plo@am__quote@
460	462	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwformats.Plo@am__quote@
	463	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwgarbage.Plo@am__quote@
461	464	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwheadings.Plo@am__quote@
462	465	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwhtml.Plo@am__quote@
463	466	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmwparser_la-mwlexercontext.Plo@am__quote@
—	—	@@ -540,6 +543,13 @@
541	544	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
542	545	@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmwparser_la_CFLAGS) $(CFLAGS) -c -o libmwparser_la-mwlinks.lo `test -f 'src/mwlinks.c' \|\| echo '$(srcdir)/'`src/mwlinks.c
543	546
	547	+libmwparser_la-mwgarbage.lo: src/mwgarbage.c
	548	+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmwparser_la_CFLAGS) $(CFLAGS) -MT libmwparser_la-mwgarbage.lo -MD -MP -MF $(DEPDIR)/libmwparser_la-mwgarbage.Tpo -c -o libmwparser_la-mwgarbage.lo `test -f 'src/mwgarbage.c' \|\| echo '$(srcdir)/'`src/mwgarbage.c
	549	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmwparser_la-mwgarbage.Tpo $(DEPDIR)/libmwparser_la-mwgarbage.Plo
	550	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/mwgarbage.c' object='libmwparser_la-mwgarbage.lo' libtool=yes @AMDEPBACKSLASH@
	551	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	552	+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmwparser_la_CFLAGS) $(CFLAGS) -c -o libmwparser_la-mwgarbage.lo `test -f 'src/mwgarbage.c' \|\| echo '$(srcdir)/'`src/mwgarbage.c
	553	+
544	554	libmwparser_la-mwlinkresolution.lo: src/mwlinkresolution.c
545	555	@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmwparser_la_CFLAGS) $(CFLAGS) -MT libmwparser_la-mwlinkresolution.lo -MD -MP -MF $(DEPDIR)/libmwparser_la-mwlinkresolution.Tpo -c -o libmwparser_la-mwlinkresolution.lo `test -f 'src/mwlinkresolution.c' \|\| echo '$(srcdir)/'`src/mwlinkresolution.c
546	556	@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libmwparser_la-mwlinkresolution.Tpo $(DEPDIR)/libmwparser_la-mwlinkresolution.Plo
Index: trunk/parsers/libmwparser/include/mwlistener.h
—	—	@@ -153,6 +153,8 @@
154	154	void (beginHtmlAbbr)(struct MWLISTENER_struct listener, pANTLR3_VECTOR attr);
155	155	void (endHtmlAbbr)(struct MWLISTENER_struct listener);
156	156	void (onHtmlPre)(struct MWLISTENER_struct listener, pANTLR3_STRING nowiki, pANTLR3_VECTOR attr);
	157	+ void (beginGarbage)(struct MWLISTENER_struct listener);
	158	+ void (endGarbage)(struct MWLISTENER_struct listener);
157	159	}
158	160	MWLISTENER;
159	161
Index: trunk/parsers/libmwparser/include/mwgarbage.h
—	—	@@ -0,0 +1,6 @@
	2	+#ifndef MWGARBAGE_H_
	3	+#define MWGARBAGE_H_
	4	+
	5	+void mwGarbageInit(MWPARSERCONTEXT *context);
	6	+
	7	+#endif
Index: trunk/parsers/libmwparser/include/mwparsercontext.h
—	—	@@ -59,7 +59,7 @@
60	60	void (endItalic)(struct MWPARSERCONTEXT_struct context);
61	61	void (beginBold)(struct MWPARSERCONTEXT_struct context, pANTLR3_VECTOR attr);
62	62	void (endBold)(struct MWPARSERCONTEXT_struct context);
63		~~- void (beginPre)(struct MWPARSERCONTEXT_struct context);~~
	63	+ void (beginPre)(struct MWPARSERCONTEXT_struct context, pANTLR3_VECTOR attr);
64	64	void (endPre)(struct MWPARSERCONTEXT_struct context);
65	65	void (beginArticle)(struct MWPARSERCONTEXT_struct context);
66	66	void (endArticle)(struct MWPARSERCONTEXT_struct context);
—	—	@@ -151,6 +151,8 @@
152	152	void (beginHtmlAbbr)(struct MWPARSERCONTEXT_struct context, pANTLR3_VECTOR attr);
153	153	void (endHtmlAbbr)(struct MWPARSERCONTEXT_struct context);
154	154	void (onHtmlPre)(struct MWPARSERCONTEXT_struct context, pANTLR3_STRING body, pANTLR3_VECTOR attr);
	155	+ void (beginGarbage)(struct MWPARSERCONTEXT_struct context, pANTLR3_VECTOR attr);
	156	+ void (endGarbage)(struct MWPARSERCONTEXT_struct context);
155	157	/*
156	158	* The listener API.
157	159	*/
—	—	@@ -231,9 +233,9 @@
232	234	* @param context
233	235	* @param beginmethod The name of the begin method.
234	236	* @param endmethod The name of the corresponding end method.
	237	+ * @param parameter Parameter to pass as last argument
235	238	* @param delayFirst If also the first occurence should be delayed, i.e.,
236	239	* if even explicitly inputted empty instances should be removed.
237		~~- * @param identifier Unique identifier in case of multiple active instances are allowed.~~
238	240	*/
239	241	#define MW_DELAYED_CALL(context, beginmethod, endmethod, parameter, delayFirst) \
240	242	do { \
Index: trunk/parsers/libmwparser/src/mwparsercontext.c
—	—	@@ -24,6 +24,7 @@
25	25	#include <mwparser.h>
26	26	#include <mwtables.h>
27	27	#include <mwheadings.h>
	28	+#include <mwgarbage.h>
28	29	#include <mwhtml.h>
29	30	#include <mwlinks.h>
30	31	#include <mwlexercontext.h>
—	—	@@ -177,6 +178,7 @@
178	179	mwHeadingsInit(context);
179	180	mwLinksInit(context);
180	181	mwHtmlInit(context);
	182	+ mwGarbageInit(context);
181	183
182	184	context->closeFormats = closeFormats;
183	185	context->openFormats = openFormats;
Index: trunk/parsers/libmwparser/src/mwhtml.c
—	—	@@ -43,6 +43,7 @@
44	44	static void
45	45	beginHtmlDiv(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
46	46	{
	47	+ MW_TRIGGER_DELAYED_CALLS(context);
47	48	MWLISTENER *l = &context->listener;
48	49	l->beginHtmlDiv(l, attr);
49	50	}
—	—	@@ -57,6 +58,7 @@
58	59	static void
59	60	beginHtmlBlockquote(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
60	61	{
	62	+ MW_TRIGGER_DELAYED_CALLS(context);
61	63	MWLISTENER *l = &context->listener;
62	64	l->beginHtmlBlockquote(l, attr);
63	65	}
—	—	@@ -71,6 +73,7 @@
72	74	static void
73	75	beginHtmlCenter(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
74	76	{
	77	+ MW_TRIGGER_DELAYED_CALLS(context);
75	78	MWLISTENER *l = &context->listener;
76	79	l->beginHtmlCenter(l, attr);
77	80	}
Index: trunk/parsers/libmwparser/src/mwbasicevents.c
—	—	@@ -34,7 +34,6 @@
35	35	onSpace(MWPARSERCONTEXT *context, pANTLR3_STRING space)
36	36	{
37	37	MW_TRIGGER_DELAYED_CALLS(context);
38		-
39	38	MWLISTENER *l = &context->listener;
40	39	l->onSpace(l, space);
41	40	}
—	—	@@ -42,6 +41,7 @@
43	42	static void
44	43	onNewline(MWPARSERCONTEXT *context)
45	44	{
	45	+ MW_TRIGGER_DELAYED_CALLS(context);
46	46	MWLISTENER *l = &context->listener;
47	47	l->onNewline(l);
48	48	}
—	—	@@ -49,6 +49,7 @@
50	50	static void
51	51	onBr(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
52	52	{
	53	+ MW_TRIGGER_DELAYED_CALLS(context);
53	54	MWLISTENER *l = &context->listener;
54	55	l->onBr(l, attr);
55	56	}
—	—	@@ -56,6 +57,7 @@
57	58	static void
58	59	beginParagraph(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
59	60	{
	61	+ MW_TRIGGER_DELAYED_CALLS(context);
60	62	MWLISTENER *l = &context->listener;
61	63	l->beginParagraph(l, attr);
62	64	}
Index: trunk/parsers/libmwparser/src/mwtables.c
—	—	@@ -18,6 +18,7 @@
19	19	static void
20	20	beginTable(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
21	21	{
	22	+ MW_TRIGGER_DELAYED_CALLS(context);
22	23	MWLISTENER *l = &context->listener;
23	24	l->beginTable(l, attributes);
24	25	}
—	—	@@ -32,6 +33,7 @@
33	34	static void
34	35	beginTableRow(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
35	36	{
	37	+ MW_TRIGGER_DELAYED_CALLS(context);
36	38	MWLISTENER *l = &context->listener;
37	39	l->beginTableRow(l, attributes);
38	40	}
—	—	@@ -46,6 +48,7 @@
47	49	static void
48	50	beginTableCell(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
49	51	{
	52	+ MW_TRIGGER_DELAYED_CALLS(context);
50	53	MWLISTENER *l = &context->listener;
51	54	l->beginTableCell(l, attributes);
52	55	}
—	—	@@ -60,6 +63,7 @@
61	64	static void
62	65	beginTableHeading(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
63	66	{
	67	+ MW_TRIGGER_DELAYED_CALLS(context);
64	68	MWLISTENER *l = &context->listener;
65	69	l->beginTableHeading(l, attributes);
66	70	}
—	—	@@ -74,6 +78,7 @@
75	79	static void
76	80	beginTableCaption(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
77	81	{
	82	+ MW_TRIGGER_DELAYED_CALLS(context);
78	83	MWLISTENER *l = &context->listener;
79	84	l->beginTableCaption(l, attributes);
80	85	}
—	—	@@ -85,10 +90,10 @@
86	91	l->endTableCaption(l);
87	92	}
88	93
89		-
90	94	static void
91	95	beginTableBody(MWPARSERCONTEXT *context, pANTLR3_VECTOR attributes)
92	96	{
	97	+ MW_TRIGGER_DELAYED_CALLS(context);
93	98	MWLISTENER *l = &context->listener;
94	99	l->beginTableBody(l, attributes);
95	100	}
Index: trunk/parsers/libmwparser/src/mwformats.c
—	—	@@ -6,6 +6,8 @@
7	7	static void endItalic(MWPARSERCONTEXT *context);
8	8	static void beginBold(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr);
9	9	static void endBold(MWPARSERCONTEXT *context);
	10	+static void beginPre(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr);
	11	+static void endPre(MWPARSERCONTEXT *context);
10	12
11	13	static void
12	14	beginItalic(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
—	—	@@ -72,8 +74,9 @@
73	75	}
74	76
75	77	static void
76		~~-beginPre(MWPARSERCONTEXT *context)~~
	78	+beginPre(MWPARSERCONTEXT *context, pANTLR3_VECTOR attr)
77	79	{
	80	+ MW_DELAYED_CALL( context, beginPre, endPre, attr, true);
78	81	MWLISTENER *l = &context->listener;
79	82	l->beginPre(l);
80	83	}
—	—	@@ -81,6 +84,7 @@
82	85	static void
83	86	endPre(MWPARSERCONTEXT *context)
84	87	{
	88	+ MW_SKIP_IF_EMPTY( context, beginPre, endPre);
85	89	MWLISTENER *l = &context->listener;
86	90	l->endPre(l);
87	91	}
Index: trunk/parsers/libmwparser/src/mwlexerpredicatetable.php
—	—	@@ -224,7 +224,7 @@
225	225	'close' => 'htmlDtClose',
226	226	'initiallyDisabled' => array('BLOCK_CONTEXT'),
227	227	'affects' => array(new TypeDisable('block', 'BLOCK')),
228		~~- 'mayNest' => true,~~
	228	+ 'mayNest' => false,
229	229	'types' => array('block', 'html'),
230	230	),
231	231	array(
Index: trunk/parsers/libmwparser/src/mwlistener.template
—	—	@@ -117,6 +117,8 @@
118	118	static void PREFIX`BeginHtmlAbbr'(MWLISTENER *listener, pANTLR3_VECTOR attributes);
119	119	static void PREFIX`EndHtmlAbbr'(MWLISTENER *listener);
120	120	static void PREFIX`OnHtmlPre'(MWLISTENER *listener, pANTLR3_STRING body, pANTLR3_VECTOR attr);
	121	+static void PREFIX`BeginGarbage'(MWLISTENER *listener);
	122	+static void PREFIX`EndGarbage'(MWLISTENER *listener);
121	123	static void * PREFIX`New'(void);
122	124	static void PREFIX`Reset'(void *data);
123	125	static void PREFIX`Free'(void *data);
—	—	@@ -256,6 +258,8 @@
257	259	.beginHtmlAbbr = PREFIX`BeginHtmlAbbr',
258	260	.endHtmlAbbr = PREFIX`EndHtmlAbbr',
259	261	.onHtmlPre = PREFIX`OnHtmlPre',
	262	+ .beginGarbage = PREFIX`BeginGarbage',
	263	+ .endGarbage = PREFIX`EndGarbage',
260	264
261	265	};
262	266
—	—	@@ -1463,3 +1467,27 @@
1464	1468	PREFIX`OnHtmlPre'(MWLISTENER *listener, pANTLR3_STRING body, pANTLR3_VECTOR attr)
1465	1469	{
1466	1470	}
	1471	+
	1472	+
	1473	+/**
	1474	+ * Indicates beginning of garbage.
	1475	+ *
	1476	+ * The listener could ignore any generated event untli end of garbage,
	1477	+ * or it could render the contents in a special error box.
	1478	+ *
	1479	+ * @param listener
	1480	+ * @param attr
	1481	+ */
	1482	+static void
	1483	+PREFIX`BeginGarbage'(MWLISTENER *listener)
	1484	+{
	1485	+}
	1486	+
	1487	+/**
	1488	+ * Indicates end of garbage.
	1489	+ *
	1490	+ * @param listener
	1491	+ */
	1492	+static void
	1493	+PREFIX`EndGarbage'(MWLISTENER *listener)
	1494	+{
Index: trunk/parsers/libmwparser/src/mwheadings.c
—	—	@@ -12,6 +12,7 @@
13	13	static void
14	14	beginHeading(MWPARSERCONTEXT *context, int level, pANTLR3_STRING anchor, pANTLR3_VECTOR attr)
15	15	{
	16	+ MW_TRIGGER_DELAYED_CALLS(context);
16	17	MWLISTENER *l = &context->listener;
17	18	l->beginHeading(l, level, anchor, attr);
18	19	}
—	—	@@ -26,6 +27,7 @@
27	28	static void
28	29	beginTableOfContents(MWPARSERCONTEXT *context)
29	30	{
	31	+ MW_TRIGGER_DELAYED_CALLS(context);
30	32	MWLISTENER *l = &context->listener;
31	33	l->beginTableOfContents(l);
32	34	}
Index: trunk/parsers/libmwparser/src/mwgarbage.c
—	—	@@ -0,0 +1,28 @@
	2	+#include <antlr3defs.h>
	3	+#include <mwparsercontext.h>
	4	+#include <mwgarbage.h>
	5	+
	6	+static void beginGarbage(MWPARSERCONTEXT * context, pANTLR3_VECTOR attr);
	7	+static void endGarbage(MWPARSERCONTEXT * context);
	8	+
	9	+static void
	10	+beginGarbage(MWPARSERCONTEXT * context, pANTLR3_VECTOR attr)
	11	+{
	12	+ MW_DELAYED_CALL( context, beginGarbage, endGarbage, attr, true);
	13	+ MWLISTENER *l = &context->listener;
	14	+ l->beginGarbage(l);
	15	+}
	16	+
	17	+static void
	18	+endGarbage(MWPARSERCONTEXT * context)
	19	+{
	20	+ MW_SKIP_IF_EMPTY( context, beginGarbage, endGarbage);
	21	+ MWLISTENER *l = &context->listener;
	22	+ l->endGarbage(l);
	23	+}
	24	+
	25	+void mwGarbageInit(MWPARSERCONTEXT *context)
	26	+{
	27	+ context->beginGarbage = beginGarbage;
	28	+ context->endGarbage = endGarbage;
	29	+}
Index: trunk/parsers/libmwparser/src/tracingcontext.c
—	—	@@ -126,6 +126,8 @@
127	127	static void TCBeginHtmlAbbr(MWLISTENER *listener, pANTLR3_VECTOR attributes);
128	128	static void TCEndHtmlAbbr(MWLISTENER *listener);
129	129	static void TCOnHtmlPre(MWLISTENER *listener, pANTLR3_STRING nowiki, pANTLR3_VECTOR attr);
	130	+static void TCBeginGarbage(MWLISTENER *listener);
	131	+static void TCEndGarbage(MWLISTENER *listener);
130	132
131	133	static void * TCNew(void);
132	134	static void TCFree(void *tcontext);
—	—	@@ -257,6 +259,8 @@
258	260	.beginHtmlAbbr = TCBeginHtmlAbbr,
259	261	.endHtmlAbbr = TCEndHtmlAbbr,
260	262	.onHtmlPre = TCOnHtmlPre,
	263	+ .beginGarbage = TCBeginGarbage,
	264	+ .endGarbage = TCEndGarbage,
261	265	};
262	266
263	267
—	—	@@ -1322,3 +1326,16 @@
1323	1327	TC(listener)->indent -= INDENT_SPACES;
1324	1328	}
1325	1329
	1330	+static void
	1331	+TCBeginGarbage(MWLISTENER *listener) {
	1332	+ TCPrintIndent(listener);
	1333	+ printf("BEGIN GARBAGE\n");
	1334	+ TCIncreaseIndent(listener);
	1335	+}
	1336	+
	1337	+static void
	1338	+TCEndGarbage(MWLISTENER *listener) {
	1339	+ TCDecreaseIndent(listener);
	1340	+ TCPrintIndent(listener);
	1341	+ printf("END GARBAGE\n");
	1342	+}
Index: trunk/parsers/libmwparser/src/mwWikitextParser.g
—	—	@@ -70,7 +70,7 @@
71	71	(()=> NEWLINE)+
72	72	;
73	73
74		~~-block_element: paragraph \| table \| wikitext_list \| heading \| pre \| horizontal_rule \| html_div \| html_list \| html_pre \| html_blockquote \| html_center \| block_tag_extension~~
	74	+block_element: paragraph \| table \| html_table \| wikitext_list \| heading \| pre \| horizontal_rule \| html_div \| html_list \| html_pre \| html_blockquote \| html_center \| block_tag_extension
75	75	;
76	76
77	77	html_div:
—	—	@@ -121,13 +121,12 @@
122	122	;
123	123
124	124	html_ul:
125		~~- token = HTML_UL_OPEN~~
	125	+ token = HTML_UL_OPEN html_garbage
126	126	{
	127	+ MW_TRIGGER_DELAYED_CALLS(CX);
127	128	LISTENER->beginBulletList(LISTENER, $token->custom);
128	129	}
129		~~- ((~(EOF\|HTML_UL_CLOSE))=>~~
130		~~- (()=> html_ul_li~~
131		- \| block_element_contents))*
	130	+ ((~(EOF\|HTML_UL_CLOSE))=> html_ul_li)*
132	131	(HTML_UL_CLOSE\|EOF)
133	132	{
134	133	LISTENER->endBulletList(LISTENER);
—	—	@@ -135,13 +134,12 @@
136	135	;
137	136
138	137	html_ol:
139		~~- token = HTML_OL_OPEN~~
	138	+ token = HTML_OL_OPEN html_garbage
140	139	{
	140	+ MW_TRIGGER_DELAYED_CALLS(CX);
141	141	LISTENER->beginEnumerationList(LISTENER, $token->custom);
142	142	}
143		~~- ((~(EOF\|HTML_OL_CLOSE))=>~~
144		~~- (()=> html_ol_li~~
145		- \| block_element_contents))*
	143	+ ((~(EOF\|HTML_OL_CLOSE))=> html_ol_li)*
146	144	(HTML_OL_CLOSE\|EOF)
147	145	{
148	146	LISTENER->endEnumerationList(LISTENER);
—	—	@@ -149,14 +147,12 @@
150	148	;
151	149
152	150	html_dl:
153		~~- token = HTML_DL_OPEN~~
	151	+ token = HTML_DL_OPEN html_garbage
154	152	{
	153	+ MW_TRIGGER_DELAYED_CALLS(CX);
155	154	LISTENER->beginDefinitionList(LISTENER, $token->custom);
156	155	}
157		~~- ((~(HTML_DL_CLOSE\|EOF))=>~~
158		~~- (()=> html_dd~~
159		~~- \| ()=> html_dt~~
160		- \| block_element_contents))*
	156	+ ((~(HTML_DL_CLOSE\|EOF))=> (html_dd \| html_dt))*
161	157	(HTML_DL_CLOSE\|EOF)
162	158	{
163	159	LISTENER->endDefinitionList(LISTENER);
—	—	@@ -166,6 +162,7 @@
167	163	html_ul_li:
168	164	token = HTML_UL_LI_OPEN
169	165	{
	166	+ MW_TRIGGER_DELAYED_CALLS(CX);
170	167	LISTENER->beginBulletListItem(LISTENER, $token->custom);
171	168	}
172	169	block_element_contents
—	—	@@ -173,11 +170,13 @@
174	171	{
175	172	LISTENER->endBulletListItem(LISTENER);
176	173	}
	174	+ html_garbage
177	175	;
178	176
179	177	html_ol_li:
180	178	token = HTML_OL_LI_OPEN
181	179	{
	180	+ MW_TRIGGER_DELAYED_CALLS(CX);
182	181	LISTENER->beginEnumerationItem(LISTENER, $token->custom);
183	182	}
184	183	block_element_contents
—	—	@@ -185,11 +184,13 @@
186	185	{
187	186	LISTENER->endEnumerationItem(LISTENER);
188	187	}
	188	+ html_garbage
189	189	;
190	190
191	191	html_dt:
192	192	token = HTML_DT_OPEN
193	193	{
	194	+ MW_TRIGGER_DELAYED_CALLS(CX);
194	195	LISTENER->beginDefinedTermItem(LISTENER, $token->custom);
195	196	}
196	197	block_element_contents
—	—	@@ -197,11 +198,13 @@
198	199	{
199	200	LISTENER->endDefinedTermItem(LISTENER);
200	201	}
	202	+ html_garbage
201	203	;
202	204
203	205	html_dd:
204	206	token = HTML_DD_OPEN
205	207	{
	208	+ MW_TRIGGER_DELAYED_CALLS(CX);
206	209	LISTENER->beginDefinitionItem(LISTENER, $token->custom);
207	210	}
208	211	block_element_contents
—	—	@@ -209,10 +212,18 @@
210	213	{
211	214	LISTENER->endDefinitionItem(LISTENER);
212	215	}
	216	+ html_garbage
213	217	;
214	218
215	219
216		~~-wikitext_list: (()=> list_element (()=>NEWLINE)?)+ {CX->onNonListBlockElement(CX);}~~
	220	+wikitext_list:
	221	+ {
	222	+ MW_TRIGGER_DELAYED_CALLS(CX);
	223	+ }
	224	+ (()=> list_element (()=>NEWLINE)?)+
	225	+ {
	226	+ CX->onNonListBlockElement(CX);
	227	+ }
217	228	;
218	229
219	230	list_element:
—	—	@@ -348,7 +359,7 @@
349	360
350	361	pre:
351	362	{
352		~~- CX->beginPre(CX);~~
	363	+ CX->beginPre(CX, NULL);
353	364	}
354	365	(()=> INDENT (inline_text_line)? (NEWLINE\|EOF))+
355	366	{
—	—	@@ -359,23 +370,42 @@
360	371	table:
361	372	begin_table
362	373	((TABLE_CAPTION\|TABLE_ROW_SEPARATOR\|TABLE_CELL\|
363		~~- TABLE_HEADING\|HTML_CAPTION_OPEN\|HTML_TR_OPEN\|~~
364		- HTML_TD_OPEN\|HTML_TH_OPEN\|HTML_TBODY_OPEN)=> table_body)*
	374	+ TABLE_HEADING)=> table_body)*
365	375	end_table
366	376	(()=> garbage_inline_text_line)?
367	377	;
368	378
	379	+html_table:
	380	+ html_begin_table
	381	+ ((HTML_CAPTION_OPEN\|HTML_TR_OPEN\|
	382	+ HTML_TD_OPEN\|HTML_TH_OPEN\|HTML_TBODY_OPEN)=> html_table_body)*
	383	+ html_end_table
	384	+ ;
	385	+
369	386	table_body:
370		~~- ((TABLE_CAPTION\|HTML_CAPTION_OPEN)=> table_captions)?~~
371		~~- ((~(END_TABLE\|HTML_TABLE_CLOSE))=>~~
	387	+ ((TABLE_CAPTION)=> table_captions)?
	388	+ ((~(END_TABLE))=>
372	389	{
373	390	CX->beginTableBody(CX, NULL);
374	391	}
	392	+ table_rows
	393	+ {
	394	+ CX->endTableBody(CX);
	395	+ }
	396	+ )?
	397	+ ;
	398	+
	399	+html_table_body:
	400	+ ((HTML_CAPTION_OPEN)=> html_table_captions)?
	401	+ ((~(HTML_TABLE_CLOSE))=>
	402	+ {
	403	+ CX->beginTableBody(CX, NULL);
	404	+ }
375	405	(
376		~~- (()=> HTML_TBODY_OPEN table_rows HTML_TBODY_CLOSE?)~~
377		~~- \|~~
378		~~- table_rows~~
379		~~- )~~
	406	+ (()=> HTML_TBODY_OPEN html_garbage html_table_rows (HTML_TBODY_CLOSE html_garbage)?)
	407	+ \|
	408	+ html_table_rows
	409	+ )
380	410	{
381	411	CX->endTableBody(CX);
382	412	}
—	—	@@ -383,15 +413,13 @@
384	414	;
385	415
386	416	table_captions:
387		~~- (~~
388		- caption = TABLE_CAPTION table_caption_contents[$caption->custom] ((TABLE_CELL_INLINE)=> inline_table_caption)*
389		~~- )~~
390		~~- \|~~
391		~~- (~~
392		~~- caption = HTML_CAPTION_OPEN table_caption_contents[$caption->custom] HTML_CAPTION_CLOSE?~~
393		~~- )~~
	417	+ caption = TABLE_CAPTION table_caption_contents[$caption->custom] ((TABLE_CELL_INLINE)=> inline_table_caption)*
394	418	;
395	419
	420	+html_table_captions:
	421	+ caption = HTML_CAPTION_OPEN table_caption_contents[$caption->custom] HTML_CAPTION_CLOSE?
	422	+ ;
	423	+
396	424	inline_table_caption: TABLE_CELL_INLINE table_caption_contents[NULL]
397	425	;
398	426
—	—	@@ -406,63 +434,86 @@
407	435	;
408	436
409	437	begin_table:
410		- begin = (BEGIN_TABLE\|HTML_TABLE_OPEN) (()=> NEWLINE)*
411		- (()=> garbage_inline_text_line (()=>NEWLINE))
412		~~- block_element_contents~~
	438	+ begin = BEGIN_TABLE table_garbage
413	439	{CX->beginTable(CX, $begin->custom);}
414	440	;
415	441
416		~~-garbage_inline_text_line: inline_text_line~~
	442	+html_begin_table:
	443	+ begin = HTML_TABLE_OPEN html_garbage
	444	+ {CX->beginTable(CX, $begin->custom);}
417	445	;
418	446
419		~~-end_table: (END_TABLE \| HTML_TABLE_CLOSE \| EOF) {CX->endTable(CX);}~~
	447	+end_table: (END_TABLE \| EOF) {CX->endTable(CX);}
420	448	;
421	449
422		-table_rows: ((~(TABLE_ROW_SEPARATOR\|HTML_TR_OPEN))=> table_first_row)? ((TABLE_ROW_SEPARATOR\|HTML_TR_OPEN)=> table_row)*
	450	+html_end_table: (HTML_TABLE_CLOSE \| EOF) {CX->endTable(CX);}
423	451	;
424	452
	453	+table_rows: ((~(TABLE_ROW_SEPARATOR))=> table_first_row)? ((TABLE_ROW_SEPARATOR)=> table_row)*
	454	+ ;
	455	+
425	456	table_first_row: table_row_content[NULL]
426	457	;
427	458
428		~~-table_row:~~
429		~~- (row = TABLE_ROW_SEPARATOR table_row_content[$row->custom])~~
430		~~- \|~~
431		~~- (row = HTML_TR_OPEN table_row_content[$row->custom] HTML_TR_CLOSE?)~~
	459	+html_table_rows: ((HTML_TR_OPEN\|HTML_TD_OPEN\|HTML_TH_OPEN)=> html_table_row)*
432	460	;
433	461
	462	+table_row:
	463	+ row = TABLE_ROW_SEPARATOR table_garbage table_row_content[$row->custom]
	464	+ ;
	465	+
	466	+html_table_row:
	467	+ ((HTML_TR_OPEN)=>
	468	+ (row = HTML_TR_OPEN html_garbage html_table_row_content[$row->custom] ((HTML_TR_CLOSE)=> HTML_TR_CLOSE html_garbage)?)
	469	+ \|
	470	+ html_table_row_content[NULL]
	471	+ )
	472	+ ;
	473	+
	474	+
434	475	table_row_content[pANTLR3_VECTOR attrs]:
435		~~- {~~
436		~~- CX->beginTableRow(CX, attrs);~~
437		~~- }~~
438		~~- table_cells~~
439		~~- {~~
440		~~- CX->endTableRow(CX);~~
441		~~- }~~
	476	+ {
	477	+ CX->beginTableRow(CX, attrs);
	478	+ }
	479	+ table_cells
	480	+ {
	481	+ CX->endTableRow(CX);
	482	+ }
442	483	;
443	484
444		-table_cells: ((TABLE_CELL\|TABLE_CELL_INLINE\|TABLE_HEADING\|TABLE_HEADING_INLINE\|HTML_TD_OPEN\|HTML_TH_OPEN)=> (table_cell\|table_heading))*
	485	+html_table_row_content[pANTLR3_VECTOR attrs]:
	486	+ {
	487	+ CX->beginTableRow(CX, attrs);
	488	+ }
	489	+ html_table_cells
	490	+ {
	491	+ CX->endTableRow(CX);
	492	+ }
445	493	;
446	494
447		~~-table_cell:~~
448		~~- (~~
449		~~- cell = (TABLE_CELL\|TABLE_CELL_INLINE) table_cell_common[$cell->custom]~~
450		~~- )~~
451		~~- \|~~
452		~~- (~~
453		~~- cell = HTML_TD_OPEN table_cell_common[$cell->custom] HTML_TD_CLOSE?~~
454		~~- )~~
	495	+table_cells: ((TABLE_CELL\|TABLE_CELL_INLINE\|TABLE_HEADING\|TABLE_HEADING_INLINE)=> (table_cell\|table_heading))*
455	496	;
456	497
	498	+html_table_cells: ((HTML_TD_OPEN\|HTML_TH_OPEN)=> (html_table_cell\|html_table_heading))*
	499	+ ;
	500	+
	501	+table_cell:
	502	+ cell = (TABLE_CELL\|TABLE_CELL_INLINE) table_cell_common[$cell->custom]
	503	+ ;
	504	+
	505	+html_table_cell:
	506	+ cell = HTML_TD_OPEN table_cell_common[$cell->custom] (HTML_TD_CLOSE html_garbage)?
	507	+ ;
	508	+
	509	+
457	510	table_heading:
458		~~- (~~
459		~~- h= (TABLE_HEADING\|TABLE_HEADING_INLINE) table_heading_common[$h->custom]~~
460		~~- )~~
461		~~- \|~~
462		~~- (~~
463		~~- h = HTML_TH_OPEN table_heading_common[$h->custom] HTML_TH_CLOSE?~~
464		~~- )~~
	511	+ h= (TABLE_HEADING\|TABLE_HEADING_INLINE) table_heading_common[$h->custom]
465	512	;
466	513
	514	+html_table_heading:
	515	+ h = HTML_TH_OPEN table_heading_common[$h->custom] (HTML_TH_CLOSE html_garbage)?
	516	+ ;
	517	+
467	518	table_cell_common[pANTLR3_VECTOR attrs]:
468	519	{
469	520	CX->beginTableCell(CX, attrs);
—	—	@@ -483,6 +534,38 @@
484	535	}
485	536	;
486	537
	538	+table_garbage:
	539	+ {
	540	+ CX->beginGarbage(CX, NULL);
	541	+ }
	542	+ (()=> NEWLINE)*
	543	+ (()=> garbage_inline_text_line (()=>NEWLINE))
	544	+ block_element_contents
	545	+ {
	546	+ CX->endGarbage(CX);
	547	+ }
	548	+ ;
	549	+
	550	+html_garbage:
	551	+ {
	552	+ CX->beginGarbage(CX, NULL);
	553	+ }
	554	+ block_element_contents
	555	+ {
	556	+ CX->endGarbage(CX);
	557	+ }
	558	+ ;
	559	+
	560	+garbage_inline_text_line:
	561	+ {
	562	+ CX->beginGarbage(CX, NULL);
	563	+ }
	564	+ inline_text_line
	565	+ {
	566	+ CX->endGarbage(CX);
	567	+ }
	568	+ ;
	569	+
487	570	block_element_contents:
488	571	(
489	572	/*
—	—	@@ -657,6 +740,7 @@
658	741	attr->remove(attr, attr->count - 1);
659	742	const char * name = attr->get(attr, attr->count - 1);
660	743	attr->remove(attr, attr->count - 1);
	744	+ MW_TRIGGER_DELAYED_CALLS(CX);
661	745	LISTENER->onTagExtension(LISTENER, name, body, attr);
662	746	}
663	747	;
Index: trunk/parsers/libmwparser/tests/table/table3.out
—	—	@@ -1,11 +1,19 @@
2	2	BEGIN ARTICLE
3		~~- WORD[garbage]~~
4		~~- WORD[inline]~~
5		~~- SPACE[ ]~~
6		~~- BEGIN ITALIC~~
7		~~- WORD[formatted]~~
8		~~- END ITALIC~~
9		~~- WORD[text]~~
	3	+ BEGIN GARBAGE
	4	+ BEGIN GARBAGE
	5	+ WORD[garbage]
	6	+ END GARBAGE
	7	+ BEGIN GARBAGE
	8	+ WORD[inline]
	9	+ SPACE[ ]
	10	+ BEGIN ITALIC
	11	+ WORD[formatted]
	12	+ END ITALIC
	13	+ END GARBAGE
	14	+ BEGIN GARBAGE
	15	+ WORD[text]
	16	+ END GARBAGE
	17	+ END GARBAGE
10	18	BEGIN TABLE key1="value" key2="value"
11	19	BEGIN TABLE BODY
12	20	BEGIN ROW
—	—	@@ -74,12 +82,14 @@
75	83	END ROW
76	84	END TABLE BODY
77	85	END TABLE
78		~~- SPACE[ ]~~
79		~~- WORD[garbage]~~
80		~~- SPACE[ ]~~
81		~~- BEGIN ITALIC~~
82		~~- WORD[formatted]~~
83		~~- END ITALIC~~
84		~~- SPACE[ ]~~
85		~~- WORD[text]~~
	86	+ BEGIN GARBAGE
	87	+ SPACE[ ]
	88	+ WORD[garbage]
	89	+ SPACE[ ]
	90	+ BEGIN ITALIC
	91	+ WORD[formatted]
	92	+ END ITALIC
	93	+ SPACE[ ]
	94	+ WORD[text]
	95	+ END GARBAGE
86	96	END ARTICLE
Index: trunk/parsers/libmwparser/tests/table/table6.out
—	—	@@ -1,5 +1,7 @@
2	2	BEGIN ARTICLE
3		~~- SPACE[ ]~~
	3	+ BEGIN GARBAGE
	4	+ SPACE[ ]
	5	+ END GARBAGE
4	6	BEGIN TABLE
5	7	BEGIN TABLE BODY
6	8	BEGIN ROW
—	—	@@ -30,7 +32,9 @@
31	33	SPECIAL[\|]
32	34	SPECIAL[}]
33	35	END PARAGRAPH
34		~~- SPACE[ ]~~
	36	+ BEGIN GARBAGE
	37	+ SPACE[ ]
	38	+ END GARBAGE
35	39	BEGIN TABLE
36	40	BEGIN TABLE BODY
37	41	BEGIN ROW
—	—	@@ -48,7 +52,9 @@
49	53	WORD[table]
50	54	SPECIAL[>]
51	55	END PARAGRAPH
52		~~- SPACE[ ]~~
	56	+ BEGIN GARBAGE
	57	+ SPACE[ ]
	58	+ END GARBAGE
53	59	BEGIN TABLE
54	60	BEGIN TABLE BODY
55	61	BEGIN ROW
—	—	@@ -77,7 +83,9 @@
78	84	WORD[table]
79	85	WORD[6]
80	86	NEWLINE
81		~~- SPACE[ ]~~
	87	+ BEGIN GARBAGE
	88	+ SPACE[ ]
	89	+ END GARBAGE
82	90	BEGIN TABLE
83	91	BEGIN TABLE BODY
84	92	BEGIN ROW
Index: trunk/parsers/libmwparser/tests/table/table7.in
—	—	@@ -0,0 +1,10 @@
	2	+
	3	+{\|
	4	+* list item
	5	+!t
	6	+
	7	+\|-
	8	+* list item
	9	+\| z
	10	+
	11	+\|}
Index: trunk/parsers/libmwparser/tests/table/table7.out
—	—	@@ -0,0 +1,39 @@
	2	+BEGIN ARTICLE
	3	+ BEGIN GARBAGE
	4	+ BEGIN BULLET LIST
	5	+ BEGIN BULLET LIST ITEM
	6	+ WORD[list]
	7	+ SPACE[ ]
	8	+ WORD[item]
	9	+ SPACE[ ]
	10	+ END BULLET LIST ITEM
	11	+ END BULLET LIST
	12	+ END GARBAGE
	13	+ BEGIN TABLE
	14	+ BEGIN TABLE BODY
	15	+ BEGIN ROW
	16	+ BEGIN TABLE HEADING
	17	+ WORD[t]
	18	+ NEWLINE
	19	+ END TABLE HEADING
	20	+ END ROW
	21	+ BEGIN GARBAGE
	22	+ BEGIN BULLET LIST
	23	+ BEGIN BULLET LIST ITEM
	24	+ WORD[list]
	25	+ SPACE[ ]
	26	+ WORD[item]
	27	+ SPACE[ ]
	28	+ END BULLET LIST ITEM
	29	+ END BULLET LIST
	30	+ END GARBAGE
	31	+ BEGIN ROW
	32	+ BEGIN CELL
	33	+ SPACE[ ]
	34	+ WORD[z]
	35	+ NEWLINE
	36	+ END CELL
	37	+ END ROW
	38	+ END TABLE BODY
	39	+ END TABLE
	40	+END ARTICLE
Index: trunk/parsers/libmwparser/tests/format/heading1.out
—	—	@@ -29,7 +29,9 @@
30	30	WORD[text]
31	31	SPACE[ ]
32	32	END PARAGRAPH
33		~~- SPACE[ ]~~
	33	+ BEGIN GARBAGE
	34	+ SPACE[ ]
	35	+ END GARBAGE
34	36	BEGIN TABLE
35	37	BEGIN TABLE BODY
36	38	BEGIN ROW
Index: trunk/parsers/libmwparser/tests/testsuite
—	—	@@ -579,7 +579,7 @@
580	580	# List of the tested programs.
581	581	at_tested=''
582	582	# List of the all the test groups.
583		~~-at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35'~~
	583	+at_groups_all=' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37'
584	584	# As many question marks as there are digits in the last test group number.
585	585	# Used to normalize the test group numbers so that `ls' lists them in
586	586	# numerical order.
—	—	@@ -592,34 +592,36 @@
593	593	5;testsuite.at:35;entity1;;
594	594	6;testsuite.at:42;block1;;
595	595	7;testsuite.at:49;inline1;;
596		~~-8;testsuite.at:56;italic1;;~~
597		~~-9;testsuite.at:63;italic2;;~~
598		~~-10;testsuite.at:70;italic3;;~~
599		~~-11;testsuite.at:77;italic4;;~~
600		~~-12;testsuite.at:84;italic5;;~~
601		~~-13;testsuite.at:91;bold1;;~~
602		~~-14;testsuite.at:98;bold2;;~~
603		~~-15;testsuite.at:105;bolditalic1;;~~
604		~~-16;testsuite.at:112;bolditalic2;;~~
605		~~-17;testsuite.at:119;pre1;;~~
606		~~-18;testsuite.at:126;heading1;;~~
607		~~-19;testsuite.at:133;heading2;;~~
608		~~-20;testsuite.at:140;table1;;~~
609		~~-21;testsuite.at:147;table2;;~~
610		~~-22;testsuite.at:154;table3;;~~
611		~~-23;testsuite.at:161;table4;;~~
612		~~-24;testsuite.at:168;table5;;~~
613		~~-25;testsuite.at:175;table6;;~~
614		~~-26;testsuite.at:182;list1;;~~
615		~~-27;testsuite.at:189;list2;;~~
616		~~-28;testsuite.at:196;list3;;~~
617		~~-29;testsuite.at:203;list4;;~~
618		~~-30;testsuite.at:210;hr;;~~
619		~~-31;testsuite.at:217;link1;;~~
620		~~-32;testsuite.at:225;link2;;~~
621		~~-33;testsuite.at:232;link3;;~~
622		~~-34;testsuite.at:239;link4;;~~
623		~~-35;testsuite.at:246;link5;;~~
	596	+8;testsuite.at:56;garbage;;
	597	+9;testsuite.at:63;italic1;;
	598	+10;testsuite.at:70;italic2;;
	599	+11;testsuite.at:77;italic3;;
	600	+12;testsuite.at:84;italic4;;
	601	+13;testsuite.at:91;italic5;;
	602	+14;testsuite.at:98;bold1;;
	603	+15;testsuite.at:105;bold2;;
	604	+16;testsuite.at:112;bolditalic1;;
	605	+17;testsuite.at:119;bolditalic2;;
	606	+18;testsuite.at:126;pre1;;
	607	+19;testsuite.at:133;heading1;;
	608	+20;testsuite.at:140;heading2;;
	609	+21;testsuite.at:147;table1;;
	610	+22;testsuite.at:154;table2;;
	611	+23;testsuite.at:161;table3;;
	612	+24;testsuite.at:168;table4;;
	613	+25;testsuite.at:175;table5;;
	614	+26;testsuite.at:182;table6;;
	615	+27;testsuite.at:189;table7;;
	616	+28;testsuite.at:196;list1;;
	617	+29;testsuite.at:203;list2;;
	618	+30;testsuite.at:210;list3;;
	619	+31;testsuite.at:217;list4;;
	620	+32;testsuite.at:224;hr;;
	621	+33;testsuite.at:231;link1;;
	622	+34;testsuite.at:239;link2;;
	623	+35;testsuite.at:246;link3;;
	624	+36;testsuite.at:253;link4;;
	625	+37;testsuite.at:260;link5;;
624	626	"
625	627
626	628	# at_fn_validate_ranges NAME...
—	—	@@ -631,7 +633,7 @@
632	634	for at_grp
633	635	do
634	636	eval at_value=\$$at_grp
635		~~- if test $at_value -lt 1 \|\| test $at_value -gt 35; then~~
	637	+ if test $at_value -lt 1 \|\| test $at_value -gt 37; then
636	638	$as_echo "invalid test group: $at_value" >&2
637	639	exit 1
638	640	fi
—	—	@@ -2227,10 +2229,10 @@
2228	2230	read at_status <"$at_status_file"
2229	2231	#AT_STOP_7
2230	2232	#AT_START_8
2231		~~-# 8. testsuite.at:56: italic1~~
	2233	+# 8. testsuite.at:56: garbage
2232	2234	at_setup_line='testsuite.at:56'
2233	2235	at_fn_banner 1
2234		~~-at_desc="italic1"~~
	2236	+at_desc="garbage"
2235	2237	at_desc_line=" 8: $at_desc "
2236	2238	$at_quiet $as_echo_n "$at_desc_line"
2237	2239	at_xfail=no
—	—	@@ -2244,9 +2246,9 @@
2245	2247	_ATEOF
2246	2248
2247	2249	{ set +x
2248		~~-$as_echo "$at_srcdir/testsuite.at:59: testtext \${srcdir}/format/italic1.in > tempoutput && diff \${srcdir}/format/italic1.out tempoutput"~~
	2250	+$as_echo "$at_srcdir/testsuite.at:59: testtext \${srcdir}/html/garbage.in > tempoutput && diff \${srcdir}/html/garbage.out tempoutput"
2249	2251	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:59"
2250		~~-( $at_check_trace; testtext ${srcdir}/format/italic1.in > tempoutput && diff ${srcdir}/format/italic1.out tempoutput~~
	2252	+( $at_check_trace; testtext ${srcdir}/html/garbage.in > tempoutput && diff ${srcdir}/html/garbage.out tempoutput
2251	2253	) >>"$at_stdout" 2>>"$at_stderr"
2252	2254	at_status=$? at_failed=false
2253	2255	$at_check_filter
—	—	@@ -2263,10 +2265,10 @@
2264	2266	read at_status <"$at_status_file"
2265	2267	#AT_STOP_8
2266	2268	#AT_START_9
2267		~~-# 9. testsuite.at:63: italic2~~
	2269	+# 9. testsuite.at:63: italic1
2268	2270	at_setup_line='testsuite.at:63'
2269	2271	at_fn_banner 1
2270		~~-at_desc="italic2"~~
	2272	+at_desc="italic1"
2271	2273	at_desc_line=" 9: $at_desc "
2272	2274	$at_quiet $as_echo_n "$at_desc_line"
2273	2275	at_xfail=no
—	—	@@ -2280,9 +2282,9 @@
2281	2283	_ATEOF
2282	2284
2283	2285	{ set +x
2284		~~-$as_echo "$at_srcdir/testsuite.at:66: testtext \${srcdir}/format/italic2.in > tempoutput && diff \${srcdir}/format/italic2.out tempoutput"~~
	2286	+$as_echo "$at_srcdir/testsuite.at:66: testtext \${srcdir}/format/italic1.in > tempoutput && diff \${srcdir}/format/italic1.out tempoutput"
2285	2287	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:66"
2286		~~-( $at_check_trace; testtext ${srcdir}/format/italic2.in > tempoutput && diff ${srcdir}/format/italic2.out tempoutput~~
	2288	+( $at_check_trace; testtext ${srcdir}/format/italic1.in > tempoutput && diff ${srcdir}/format/italic1.out tempoutput
2287	2289	) >>"$at_stdout" 2>>"$at_stderr"
2288	2290	at_status=$? at_failed=false
2289	2291	$at_check_filter
—	—	@@ -2299,10 +2301,10 @@
2300	2302	read at_status <"$at_status_file"
2301	2303	#AT_STOP_9
2302	2304	#AT_START_10
2303		~~-# 10. testsuite.at:70: italic3~~
	2305	+# 10. testsuite.at:70: italic2
2304	2306	at_setup_line='testsuite.at:70'
2305	2307	at_fn_banner 1
2306		~~-at_desc="italic3"~~
	2308	+at_desc="italic2"
2307	2309	at_desc_line=" 10: $at_desc "
2308	2310	$at_quiet $as_echo_n "$at_desc_line"
2309	2311	at_xfail=no
—	—	@@ -2316,9 +2318,9 @@
2317	2319	_ATEOF
2318	2320
2319	2321	{ set +x
2320		~~-$as_echo "$at_srcdir/testsuite.at:73: testtext \${srcdir}/format/italic3.in > tempoutput && diff \${srcdir}/format/italic3.out tempoutput"~~
	2322	+$as_echo "$at_srcdir/testsuite.at:73: testtext \${srcdir}/format/italic2.in > tempoutput && diff \${srcdir}/format/italic2.out tempoutput"
2321	2323	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:73"
2322		~~-( $at_check_trace; testtext ${srcdir}/format/italic3.in > tempoutput && diff ${srcdir}/format/italic3.out tempoutput~~
	2324	+( $at_check_trace; testtext ${srcdir}/format/italic2.in > tempoutput && diff ${srcdir}/format/italic2.out tempoutput
2323	2325	) >>"$at_stdout" 2>>"$at_stderr"
2324	2326	at_status=$? at_failed=false
2325	2327	$at_check_filter
—	—	@@ -2335,10 +2337,10 @@
2336	2338	read at_status <"$at_status_file"
2337	2339	#AT_STOP_10
2338	2340	#AT_START_11
2339		~~-# 11. testsuite.at:77: italic4~~
	2341	+# 11. testsuite.at:77: italic3
2340	2342	at_setup_line='testsuite.at:77'
2341	2343	at_fn_banner 1
2342		~~-at_desc="italic4"~~
	2344	+at_desc="italic3"
2343	2345	at_desc_line=" 11: $at_desc "
2344	2346	$at_quiet $as_echo_n "$at_desc_line"
2345	2347	at_xfail=no
—	—	@@ -2352,9 +2354,9 @@
2353	2355	_ATEOF
2354	2356
2355	2357	{ set +x
2356		~~-$as_echo "$at_srcdir/testsuite.at:80: testtext \${srcdir}/format/italic4.in > tempoutput && diff \${srcdir}/format/italic4.out tempoutput"~~
	2358	+$as_echo "$at_srcdir/testsuite.at:80: testtext \${srcdir}/format/italic3.in > tempoutput && diff \${srcdir}/format/italic3.out tempoutput"
2357	2359	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:80"
2358		~~-( $at_check_trace; testtext ${srcdir}/format/italic4.in > tempoutput && diff ${srcdir}/format/italic4.out tempoutput~~
	2360	+( $at_check_trace; testtext ${srcdir}/format/italic3.in > tempoutput && diff ${srcdir}/format/italic3.out tempoutput
2359	2361	) >>"$at_stdout" 2>>"$at_stderr"
2360	2362	at_status=$? at_failed=false
2361	2363	$at_check_filter
—	—	@@ -2371,10 +2373,10 @@
2372	2374	read at_status <"$at_status_file"
2373	2375	#AT_STOP_11
2374	2376	#AT_START_12
2375		~~-# 12. testsuite.at:84: italic5~~
	2377	+# 12. testsuite.at:84: italic4
2376	2378	at_setup_line='testsuite.at:84'
2377	2379	at_fn_banner 1
2378		~~-at_desc="italic5"~~
	2380	+at_desc="italic4"
2379	2381	at_desc_line=" 12: $at_desc "
2380	2382	$at_quiet $as_echo_n "$at_desc_line"
2381	2383	at_xfail=no
—	—	@@ -2388,9 +2390,9 @@
2389	2391	_ATEOF
2390	2392
2391	2393	{ set +x
2392		~~-$as_echo "$at_srcdir/testsuite.at:87: testtext \${srcdir}/format/italic5.in > tempoutput && diff \${srcdir}/format/italic5.out tempoutput"~~
	2394	+$as_echo "$at_srcdir/testsuite.at:87: testtext \${srcdir}/format/italic4.in > tempoutput && diff \${srcdir}/format/italic4.out tempoutput"
2393	2395	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:87"
2394		~~-( $at_check_trace; testtext ${srcdir}/format/italic5.in > tempoutput && diff ${srcdir}/format/italic5.out tempoutput~~
	2396	+( $at_check_trace; testtext ${srcdir}/format/italic4.in > tempoutput && diff ${srcdir}/format/italic4.out tempoutput
2395	2397	) >>"$at_stdout" 2>>"$at_stderr"
2396	2398	at_status=$? at_failed=false
2397	2399	$at_check_filter
—	—	@@ -2407,11 +2409,11 @@
2408	2410	read at_status <"$at_status_file"
2409	2411	#AT_STOP_12
2410	2412	#AT_START_13
2411		~~-# 13. testsuite.at:91: bold1~~
	2413	+# 13. testsuite.at:91: italic5
2412	2414	at_setup_line='testsuite.at:91'
2413	2415	at_fn_banner 1
2414		~~-at_desc="bold1"~~
2415		~~-at_desc_line=" 13: $at_desc "~~
	2416	+at_desc="italic5"
	2417	+at_desc_line=" 13: $at_desc "
2416	2418	$at_quiet $as_echo_n "$at_desc_line"
2417	2419	at_xfail=no
2418	2420	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2424,9 +2426,9 @@
2425	2427	_ATEOF
2426	2428
2427	2429	{ set +x
2428		~~-$as_echo "$at_srcdir/testsuite.at:94: testtext \${srcdir}/format/bold1.in > tempoutput && diff \${srcdir}/format/bold1.out tempoutput"~~
	2430	+$as_echo "$at_srcdir/testsuite.at:94: testtext \${srcdir}/format/italic5.in > tempoutput && diff \${srcdir}/format/italic5.out tempoutput"
2429	2431	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:94"
2430		~~-( $at_check_trace; testtext ${srcdir}/format/bold1.in > tempoutput && diff ${srcdir}/format/bold1.out tempoutput~~
	2432	+( $at_check_trace; testtext ${srcdir}/format/italic5.in > tempoutput && diff ${srcdir}/format/italic5.out tempoutput
2431	2433	) >>"$at_stdout" 2>>"$at_stderr"
2432	2434	at_status=$? at_failed=false
2433	2435	$at_check_filter
—	—	@@ -2443,10 +2445,10 @@
2444	2446	read at_status <"$at_status_file"
2445	2447	#AT_STOP_13
2446	2448	#AT_START_14
2447		~~-# 14. testsuite.at:98: bold2~~
	2449	+# 14. testsuite.at:98: bold1
2448	2450	at_setup_line='testsuite.at:98'
2449	2451	at_fn_banner 1
2450		~~-at_desc="bold2"~~
	2452	+at_desc="bold1"
2451	2453	at_desc_line=" 14: $at_desc "
2452	2454	$at_quiet $as_echo_n "$at_desc_line"
2453	2455	at_xfail=no
—	—	@@ -2460,9 +2462,9 @@
2461	2463	_ATEOF
2462	2464
2463	2465	{ set +x
2464		~~-$as_echo "$at_srcdir/testsuite.at:101: testtext \${srcdir}/format/bold2.in > tempoutput && diff \${srcdir}/format/bold2.out tempoutput"~~
	2466	+$as_echo "$at_srcdir/testsuite.at:101: testtext \${srcdir}/format/bold1.in > tempoutput && diff \${srcdir}/format/bold1.out tempoutput"
2465	2467	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:101"
2466		~~-( $at_check_trace; testtext ${srcdir}/format/bold2.in > tempoutput && diff ${srcdir}/format/bold2.out tempoutput~~
	2468	+( $at_check_trace; testtext ${srcdir}/format/bold1.in > tempoutput && diff ${srcdir}/format/bold1.out tempoutput
2467	2469	) >>"$at_stdout" 2>>"$at_stderr"
2468	2470	at_status=$? at_failed=false
2469	2471	$at_check_filter
—	—	@@ -2479,11 +2481,11 @@
2480	2482	read at_status <"$at_status_file"
2481	2483	#AT_STOP_14
2482	2484	#AT_START_15
2483		~~-# 15. testsuite.at:105: bolditalic1~~
	2485	+# 15. testsuite.at:105: bold2
2484	2486	at_setup_line='testsuite.at:105'
2485	2487	at_fn_banner 1
2486		~~-at_desc="bolditalic1"~~
2487		~~-at_desc_line=" 15: $at_desc "~~
	2488	+at_desc="bold2"
	2489	+at_desc_line=" 15: $at_desc "
2488	2490	$at_quiet $as_echo_n "$at_desc_line"
2489	2491	at_xfail=no
2490	2492	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2496,9 +2498,9 @@
2497	2499	_ATEOF
2498	2500
2499	2501	{ set +x
2500		~~-$as_echo "$at_srcdir/testsuite.at:108: testtext \${srcdir}/format/bolditalic1.in > tempoutput && diff \${srcdir}/format/bolditalic1.out tempoutput"~~
	2502	+$as_echo "$at_srcdir/testsuite.at:108: testtext \${srcdir}/format/bold2.in > tempoutput && diff \${srcdir}/format/bold2.out tempoutput"
2501	2503	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:108"
2502		~~-( $at_check_trace; testtext ${srcdir}/format/bolditalic1.in > tempoutput && diff ${srcdir}/format/bolditalic1.out tempoutput~~
	2504	+( $at_check_trace; testtext ${srcdir}/format/bold2.in > tempoutput && diff ${srcdir}/format/bold2.out tempoutput
2503	2505	) >>"$at_stdout" 2>>"$at_stderr"
2504	2506	at_status=$? at_failed=false
2505	2507	$at_check_filter
—	—	@@ -2515,10 +2517,10 @@
2516	2518	read at_status <"$at_status_file"
2517	2519	#AT_STOP_15
2518	2520	#AT_START_16
2519		~~-# 16. testsuite.at:112: bolditalic2~~
	2521	+# 16. testsuite.at:112: bolditalic1
2520	2522	at_setup_line='testsuite.at:112'
2521	2523	at_fn_banner 1
2522		~~-at_desc="bolditalic2"~~
	2524	+at_desc="bolditalic1"
2523	2525	at_desc_line=" 16: $at_desc "
2524	2526	$at_quiet $as_echo_n "$at_desc_line"
2525	2527	at_xfail=no
—	—	@@ -2532,9 +2534,9 @@
2533	2535	_ATEOF
2534	2536
2535	2537	{ set +x
2536		~~-$as_echo "$at_srcdir/testsuite.at:115: testtext \${srcdir}/format/bolditalic2.in > tempoutput && diff \${srcdir}/format/bolditalic2.out tempoutput"~~
	2538	+$as_echo "$at_srcdir/testsuite.at:115: testtext \${srcdir}/format/bolditalic1.in > tempoutput && diff \${srcdir}/format/bolditalic1.out tempoutput"
2537	2539	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:115"
2538		~~-( $at_check_trace; testtext ${srcdir}/format/bolditalic2.in > tempoutput && diff ${srcdir}/format/bolditalic2.out tempoutput~~
	2540	+( $at_check_trace; testtext ${srcdir}/format/bolditalic1.in > tempoutput && diff ${srcdir}/format/bolditalic1.out tempoutput
2539	2541	) >>"$at_stdout" 2>>"$at_stderr"
2540	2542	at_status=$? at_failed=false
2541	2543	$at_check_filter
—	—	@@ -2551,11 +2553,11 @@
2552	2554	read at_status <"$at_status_file"
2553	2555	#AT_STOP_16
2554	2556	#AT_START_17
2555		~~-# 17. testsuite.at:119: pre1~~
	2557	+# 17. testsuite.at:119: bolditalic2
2556	2558	at_setup_line='testsuite.at:119'
2557	2559	at_fn_banner 1
2558		~~-at_desc="pre1"~~
2559		~~-at_desc_line=" 17: $at_desc "~~
	2560	+at_desc="bolditalic2"
	2561	+at_desc_line=" 17: $at_desc "
2560	2562	$at_quiet $as_echo_n "$at_desc_line"
2561	2563	at_xfail=no
2562	2564	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2568,9 +2570,9 @@
2569	2571	_ATEOF
2570	2572
2571	2573	{ set +x
2572		~~-$as_echo "$at_srcdir/testsuite.at:122: testtext \${srcdir}/format/pre1.in > tempoutput && diff \${srcdir}/format/pre1.out tempoutput"~~
	2574	+$as_echo "$at_srcdir/testsuite.at:122: testtext \${srcdir}/format/bolditalic2.in > tempoutput && diff \${srcdir}/format/bolditalic2.out tempoutput"
2573	2575	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:122"
2574		~~-( $at_check_trace; testtext ${srcdir}/format/pre1.in > tempoutput && diff ${srcdir}/format/pre1.out tempoutput~~
	2576	+( $at_check_trace; testtext ${srcdir}/format/bolditalic2.in > tempoutput && diff ${srcdir}/format/bolditalic2.out tempoutput
2575	2577	) >>"$at_stdout" 2>>"$at_stderr"
2576	2578	at_status=$? at_failed=false
2577	2579	$at_check_filter
—	—	@@ -2587,11 +2589,11 @@
2588	2590	read at_status <"$at_status_file"
2589	2591	#AT_STOP_17
2590	2592	#AT_START_18
2591		~~-# 18. testsuite.at:126: heading1~~
	2593	+# 18. testsuite.at:126: pre1
2592	2594	at_setup_line='testsuite.at:126'
2593	2595	at_fn_banner 1
2594		~~-at_desc="heading1"~~
2595		~~-at_desc_line=" 18: $at_desc "~~
	2596	+at_desc="pre1"
	2597	+at_desc_line=" 18: $at_desc "
2596	2598	$at_quiet $as_echo_n "$at_desc_line"
2597	2599	at_xfail=no
2598	2600	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2604,9 +2606,9 @@
2605	2607	_ATEOF
2606	2608
2607	2609	{ set +x
2608		~~-$as_echo "$at_srcdir/testsuite.at:129: testtext \${srcdir}/format/heading1.in > tempoutput && diff \${srcdir}/format/heading1.out tempoutput"~~
	2610	+$as_echo "$at_srcdir/testsuite.at:129: testtext \${srcdir}/format/pre1.in > tempoutput && diff \${srcdir}/format/pre1.out tempoutput"
2609	2611	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:129"
2610		~~-( $at_check_trace; testtext ${srcdir}/format/heading1.in > tempoutput && diff ${srcdir}/format/heading1.out tempoutput~~
	2612	+( $at_check_trace; testtext ${srcdir}/format/pre1.in > tempoutput && diff ${srcdir}/format/pre1.out tempoutput
2611	2613	) >>"$at_stdout" 2>>"$at_stderr"
2612	2614	at_status=$? at_failed=false
2613	2615	$at_check_filter
—	—	@@ -2623,10 +2625,10 @@
2624	2626	read at_status <"$at_status_file"
2625	2627	#AT_STOP_18
2626	2628	#AT_START_19
2627		~~-# 19. testsuite.at:133: heading2~~
	2629	+# 19. testsuite.at:133: heading1
2628	2630	at_setup_line='testsuite.at:133'
2629	2631	at_fn_banner 1
2630		~~-at_desc="heading2"~~
	2632	+at_desc="heading1"
2631	2633	at_desc_line=" 19: $at_desc "
2632	2634	$at_quiet $as_echo_n "$at_desc_line"
2633	2635	at_xfail=no
—	—	@@ -2640,9 +2642,9 @@
2641	2643	_ATEOF
2642	2644
2643	2645	{ set +x
2644		~~-$as_echo "$at_srcdir/testsuite.at:136: testtext \${srcdir}/format/heading2.in > tempoutput && diff \${srcdir}/format/heading2.out tempoutput"~~
	2646	+$as_echo "$at_srcdir/testsuite.at:136: testtext \${srcdir}/format/heading1.in > tempoutput && diff \${srcdir}/format/heading1.out tempoutput"
2645	2647	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:136"
2646		~~-( $at_check_trace; testtext ${srcdir}/format/heading2.in > tempoutput && diff ${srcdir}/format/heading2.out tempoutput~~
	2648	+( $at_check_trace; testtext ${srcdir}/format/heading1.in > tempoutput && diff ${srcdir}/format/heading1.out tempoutput
2647	2649	) >>"$at_stdout" 2>>"$at_stderr"
2648	2650	at_status=$? at_failed=false
2649	2651	$at_check_filter
—	—	@@ -2659,11 +2661,11 @@
2660	2662	read at_status <"$at_status_file"
2661	2663	#AT_STOP_19
2662	2664	#AT_START_20
2663		~~-# 20. testsuite.at:140: table1~~
	2665	+# 20. testsuite.at:140: heading2
2664	2666	at_setup_line='testsuite.at:140'
2665	2667	at_fn_banner 1
2666		~~-at_desc="table1"~~
2667		~~-at_desc_line=" 20: $at_desc "~~
	2668	+at_desc="heading2"
	2669	+at_desc_line=" 20: $at_desc "
2668	2670	$at_quiet $as_echo_n "$at_desc_line"
2669	2671	at_xfail=no
2670	2672	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2676,9 +2678,9 @@
2677	2679	_ATEOF
2678	2680
2679	2681	{ set +x
2680		~~-$as_echo "$at_srcdir/testsuite.at:143: testtext \${srcdir}/table/table1.in > tempoutput && diff \${srcdir}/table/table1.out tempoutput"~~
	2682	+$as_echo "$at_srcdir/testsuite.at:143: testtext \${srcdir}/format/heading2.in > tempoutput && diff \${srcdir}/format/heading2.out tempoutput"
2681	2683	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:143"
2682		~~-( $at_check_trace; testtext ${srcdir}/table/table1.in > tempoutput && diff ${srcdir}/table/table1.out tempoutput~~
	2684	+( $at_check_trace; testtext ${srcdir}/format/heading2.in > tempoutput && diff ${srcdir}/format/heading2.out tempoutput
2683	2685	) >>"$at_stdout" 2>>"$at_stderr"
2684	2686	at_status=$? at_failed=false
2685	2687	$at_check_filter
—	—	@@ -2695,10 +2697,10 @@
2696	2698	read at_status <"$at_status_file"
2697	2699	#AT_STOP_20
2698	2700	#AT_START_21
2699		~~-# 21. testsuite.at:147: table2~~
	2701	+# 21. testsuite.at:147: table1
2700	2702	at_setup_line='testsuite.at:147'
2701	2703	at_fn_banner 1
2702		~~-at_desc="table2"~~
	2704	+at_desc="table1"
2703	2705	at_desc_line=" 21: $at_desc "
2704	2706	$at_quiet $as_echo_n "$at_desc_line"
2705	2707	at_xfail=no
—	—	@@ -2712,9 +2714,9 @@
2713	2715	_ATEOF
2714	2716
2715	2717	{ set +x
2716		~~-$as_echo "$at_srcdir/testsuite.at:150: testtext \${srcdir}/table/table2.in > tempoutput && diff \${srcdir}/table/table2.out tempoutput"~~
	2718	+$as_echo "$at_srcdir/testsuite.at:150: testtext \${srcdir}/table/table1.in > tempoutput && diff \${srcdir}/table/table1.out tempoutput"
2717	2719	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:150"
2718		~~-( $at_check_trace; testtext ${srcdir}/table/table2.in > tempoutput && diff ${srcdir}/table/table2.out tempoutput~~
	2720	+( $at_check_trace; testtext ${srcdir}/table/table1.in > tempoutput && diff ${srcdir}/table/table1.out tempoutput
2719	2721	) >>"$at_stdout" 2>>"$at_stderr"
2720	2722	at_status=$? at_failed=false
2721	2723	$at_check_filter
—	—	@@ -2731,10 +2733,10 @@
2732	2734	read at_status <"$at_status_file"
2733	2735	#AT_STOP_21
2734	2736	#AT_START_22
2735		~~-# 22. testsuite.at:154: table3~~
	2737	+# 22. testsuite.at:154: table2
2736	2738	at_setup_line='testsuite.at:154'
2737	2739	at_fn_banner 1
2738		~~-at_desc="table3"~~
	2740	+at_desc="table2"
2739	2741	at_desc_line=" 22: $at_desc "
2740	2742	$at_quiet $as_echo_n "$at_desc_line"
2741	2743	at_xfail=no
—	—	@@ -2748,9 +2750,9 @@
2749	2751	_ATEOF
2750	2752
2751	2753	{ set +x
2752		~~-$as_echo "$at_srcdir/testsuite.at:157: testtext \${srcdir}/table/table3.in > tempoutput && diff \${srcdir}/table/table3.out tempoutput"~~
	2754	+$as_echo "$at_srcdir/testsuite.at:157: testtext \${srcdir}/table/table2.in > tempoutput && diff \${srcdir}/table/table2.out tempoutput"
2753	2755	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:157"
2754		~~-( $at_check_trace; testtext ${srcdir}/table/table3.in > tempoutput && diff ${srcdir}/table/table3.out tempoutput~~
	2756	+( $at_check_trace; testtext ${srcdir}/table/table2.in > tempoutput && diff ${srcdir}/table/table2.out tempoutput
2755	2757	) >>"$at_stdout" 2>>"$at_stderr"
2756	2758	at_status=$? at_failed=false
2757	2759	$at_check_filter
—	—	@@ -2767,10 +2769,10 @@
2768	2770	read at_status <"$at_status_file"
2769	2771	#AT_STOP_22
2770	2772	#AT_START_23
2771		~~-# 23. testsuite.at:161: table4~~
	2773	+# 23. testsuite.at:161: table3
2772	2774	at_setup_line='testsuite.at:161'
2773	2775	at_fn_banner 1
2774		~~-at_desc="table4"~~
	2776	+at_desc="table3"
2775	2777	at_desc_line=" 23: $at_desc "
2776	2778	$at_quiet $as_echo_n "$at_desc_line"
2777	2779	at_xfail=no
—	—	@@ -2784,9 +2786,9 @@
2785	2787	_ATEOF
2786	2788
2787	2789	{ set +x
2788		~~-$as_echo "$at_srcdir/testsuite.at:164: testtext \${srcdir}/table/table4.in > tempoutput && diff \${srcdir}/table/table4.out tempoutput"~~
	2790	+$as_echo "$at_srcdir/testsuite.at:164: testtext \${srcdir}/table/table3.in > tempoutput && diff \${srcdir}/table/table3.out tempoutput"
2789	2791	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:164"
2790		~~-( $at_check_trace; testtext ${srcdir}/table/table4.in > tempoutput && diff ${srcdir}/table/table4.out tempoutput~~
	2792	+( $at_check_trace; testtext ${srcdir}/table/table3.in > tempoutput && diff ${srcdir}/table/table3.out tempoutput
2791	2793	) >>"$at_stdout" 2>>"$at_stderr"
2792	2794	at_status=$? at_failed=false
2793	2795	$at_check_filter
—	—	@@ -2803,10 +2805,10 @@
2804	2806	read at_status <"$at_status_file"
2805	2807	#AT_STOP_23
2806	2808	#AT_START_24
2807		~~-# 24. testsuite.at:168: table5~~
	2809	+# 24. testsuite.at:168: table4
2808	2810	at_setup_line='testsuite.at:168'
2809	2811	at_fn_banner 1
2810		~~-at_desc="table5"~~
	2812	+at_desc="table4"
2811	2813	at_desc_line=" 24: $at_desc "
2812	2814	$at_quiet $as_echo_n "$at_desc_line"
2813	2815	at_xfail=no
—	—	@@ -2820,9 +2822,9 @@
2821	2823	_ATEOF
2822	2824
2823	2825	{ set +x
2824		~~-$as_echo "$at_srcdir/testsuite.at:171: testtext \${srcdir}/table/table5.in > tempoutput && diff \${srcdir}/table/table5.out tempoutput"~~
	2826	+$as_echo "$at_srcdir/testsuite.at:171: testtext \${srcdir}/table/table4.in > tempoutput && diff \${srcdir}/table/table4.out tempoutput"
2825	2827	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:171"
2826		~~-( $at_check_trace; testtext ${srcdir}/table/table5.in > tempoutput && diff ${srcdir}/table/table5.out tempoutput~~
	2828	+( $at_check_trace; testtext ${srcdir}/table/table4.in > tempoutput && diff ${srcdir}/table/table4.out tempoutput
2827	2829	) >>"$at_stdout" 2>>"$at_stderr"
2828	2830	at_status=$? at_failed=false
2829	2831	$at_check_filter
—	—	@@ -2839,10 +2841,10 @@
2840	2842	read at_status <"$at_status_file"
2841	2843	#AT_STOP_24
2842	2844	#AT_START_25
2843		~~-# 25. testsuite.at:175: table6~~
	2845	+# 25. testsuite.at:175: table5
2844	2846	at_setup_line='testsuite.at:175'
2845	2847	at_fn_banner 1
2846		~~-at_desc="table6"~~
	2848	+at_desc="table5"
2847	2849	at_desc_line=" 25: $at_desc "
2848	2850	$at_quiet $as_echo_n "$at_desc_line"
2849	2851	at_xfail=no
—	—	@@ -2856,9 +2858,9 @@
2857	2859	_ATEOF
2858	2860
2859	2861	{ set +x
2860		~~-$as_echo "$at_srcdir/testsuite.at:178: testtext \${srcdir}/table/table6.in > tempoutput && diff \${srcdir}/table/table6.out tempoutput"~~
	2862	+$as_echo "$at_srcdir/testsuite.at:178: testtext \${srcdir}/table/table5.in > tempoutput && diff \${srcdir}/table/table5.out tempoutput"
2861	2863	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:178"
2862		~~-( $at_check_trace; testtext ${srcdir}/table/table6.in > tempoutput && diff ${srcdir}/table/table6.out tempoutput~~
	2864	+( $at_check_trace; testtext ${srcdir}/table/table5.in > tempoutput && diff ${srcdir}/table/table5.out tempoutput
2863	2865	) >>"$at_stdout" 2>>"$at_stderr"
2864	2866	at_status=$? at_failed=false
2865	2867	$at_check_filter
—	—	@@ -2875,11 +2877,11 @@
2876	2878	read at_status <"$at_status_file"
2877	2879	#AT_STOP_25
2878	2880	#AT_START_26
2879		~~-# 26. testsuite.at:182: list1~~
	2881	+# 26. testsuite.at:182: table6
2880	2882	at_setup_line='testsuite.at:182'
2881	2883	at_fn_banner 1
2882		~~-at_desc="list1"~~
2883		~~-at_desc_line=" 26: $at_desc "~~
	2884	+at_desc="table6"
	2885	+at_desc_line=" 26: $at_desc "
2884	2886	$at_quiet $as_echo_n "$at_desc_line"
2885	2887	at_xfail=no
2886	2888	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2892,9 +2894,9 @@
2893	2895	_ATEOF
2894	2896
2895	2897	{ set +x
2896		~~-$as_echo "$at_srcdir/testsuite.at:185: testtext \${srcdir}/list/list1.in > tempoutput && diff \${srcdir}/list/list1.out tempoutput"~~
	2898	+$as_echo "$at_srcdir/testsuite.at:185: testtext \${srcdir}/table/table6.in > tempoutput && diff \${srcdir}/table/table6.out tempoutput"
2897	2899	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:185"
2898		~~-( $at_check_trace; testtext ${srcdir}/list/list1.in > tempoutput && diff ${srcdir}/list/list1.out tempoutput~~
	2900	+( $at_check_trace; testtext ${srcdir}/table/table6.in > tempoutput && diff ${srcdir}/table/table6.out tempoutput
2899	2901	) >>"$at_stdout" 2>>"$at_stderr"
2900	2902	at_status=$? at_failed=false
2901	2903	$at_check_filter
—	—	@@ -2911,11 +2913,11 @@
2912	2914	read at_status <"$at_status_file"
2913	2915	#AT_STOP_26
2914	2916	#AT_START_27
2915		~~-# 27. testsuite.at:189: list2~~
	2917	+# 27. testsuite.at:189: table7
2916	2918	at_setup_line='testsuite.at:189'
2917	2919	at_fn_banner 1
2918		~~-at_desc="list2"~~
2919		~~-at_desc_line=" 27: $at_desc "~~
	2920	+at_desc="table7"
	2921	+at_desc_line=" 27: $at_desc "
2920	2922	$at_quiet $as_echo_n "$at_desc_line"
2921	2923	at_xfail=no
2922	2924	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -2928,9 +2930,9 @@
2929	2931	_ATEOF
2930	2932
2931	2933	{ set +x
2932		~~-$as_echo "$at_srcdir/testsuite.at:192: testtext \${srcdir}/list/list2.in > tempoutput && diff \${srcdir}/list/list2.out tempoutput"~~
	2934	+$as_echo "$at_srcdir/testsuite.at:192: testtext \${srcdir}/table/table7.in > tempoutput && diff \${srcdir}/table/table7.out tempoutput"
2933	2935	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:192"
2934		~~-( $at_check_trace; testtext ${srcdir}/list/list2.in > tempoutput && diff ${srcdir}/list/list2.out tempoutput~~
	2936	+( $at_check_trace; testtext ${srcdir}/table/table7.in > tempoutput && diff ${srcdir}/table/table7.out tempoutput
2935	2937	) >>"$at_stdout" 2>>"$at_stderr"
2936	2938	at_status=$? at_failed=false
2937	2939	$at_check_filter
—	—	@@ -2947,10 +2949,10 @@
2948	2950	read at_status <"$at_status_file"
2949	2951	#AT_STOP_27
2950	2952	#AT_START_28
2951		~~-# 28. testsuite.at:196: list3~~
	2953	+# 28. testsuite.at:196: list1
2952	2954	at_setup_line='testsuite.at:196'
2953	2955	at_fn_banner 1
2954		~~-at_desc="list3"~~
	2956	+at_desc="list1"
2955	2957	at_desc_line=" 28: $at_desc "
2956	2958	$at_quiet $as_echo_n "$at_desc_line"
2957	2959	at_xfail=no
—	—	@@ -2964,9 +2966,9 @@
2965	2967	_ATEOF
2966	2968
2967	2969	{ set +x
2968		~~-$as_echo "$at_srcdir/testsuite.at:199: testtext \${srcdir}/list/list3.in > tempoutput && diff \${srcdir}/list/list3.out tempoutput"~~
	2970	+$as_echo "$at_srcdir/testsuite.at:199: testtext \${srcdir}/list/list1.in > tempoutput && diff \${srcdir}/list/list1.out tempoutput"
2969	2971	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:199"
2970		~~-( $at_check_trace; testtext ${srcdir}/list/list3.in > tempoutput && diff ${srcdir}/list/list3.out tempoutput~~
	2972	+( $at_check_trace; testtext ${srcdir}/list/list1.in > tempoutput && diff ${srcdir}/list/list1.out tempoutput
2971	2973	) >>"$at_stdout" 2>>"$at_stderr"
2972	2974	at_status=$? at_failed=false
2973	2975	$at_check_filter
—	—	@@ -2983,10 +2985,10 @@
2984	2986	read at_status <"$at_status_file"
2985	2987	#AT_STOP_28
2986	2988	#AT_START_29
2987		~~-# 29. testsuite.at:203: list4~~
	2989	+# 29. testsuite.at:203: list2
2988	2990	at_setup_line='testsuite.at:203'
2989	2991	at_fn_banner 1
2990		~~-at_desc="list4"~~
	2992	+at_desc="list2"
2991	2993	at_desc_line=" 29: $at_desc "
2992	2994	$at_quiet $as_echo_n "$at_desc_line"
2993	2995	at_xfail=no
—	—	@@ -3000,9 +3002,9 @@
3001	3003	_ATEOF
3002	3004
3003	3005	{ set +x
3004		~~-$as_echo "$at_srcdir/testsuite.at:206: testtext \${srcdir}/list/list4.in > tempoutput && diff \${srcdir}/list/list4.out tempoutput"~~
	3006	+$as_echo "$at_srcdir/testsuite.at:206: testtext \${srcdir}/list/list2.in > tempoutput && diff \${srcdir}/list/list2.out tempoutput"
3005	3007	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:206"
3006		~~-( $at_check_trace; testtext ${srcdir}/list/list4.in > tempoutput && diff ${srcdir}/list/list4.out tempoutput~~
	3008	+( $at_check_trace; testtext ${srcdir}/list/list2.in > tempoutput && diff ${srcdir}/list/list2.out tempoutput
3007	3009	) >>"$at_stdout" 2>>"$at_stderr"
3008	3010	at_status=$? at_failed=false
3009	3011	$at_check_filter
—	—	@@ -3019,11 +3021,11 @@
3020	3022	read at_status <"$at_status_file"
3021	3023	#AT_STOP_29
3022	3024	#AT_START_30
3023		~~-# 30. testsuite.at:210: hr~~
	3025	+# 30. testsuite.at:210: list3
3024	3026	at_setup_line='testsuite.at:210'
3025	3027	at_fn_banner 1
3026		~~-at_desc="hr"~~
3027		~~-at_desc_line=" 30: $at_desc "~~
	3028	+at_desc="list3"
	3029	+at_desc_line=" 30: $at_desc "
3028	3030	$at_quiet $as_echo_n "$at_desc_line"
3029	3031	at_xfail=no
3030	3032	echo "# -- compilation --" >> "$at_group_log"
—	—	@@ -3036,9 +3038,9 @@
3037	3039	_ATEOF
3038	3040
3039	3041	{ set +x
3040		~~-$as_echo "$at_srcdir/testsuite.at:213: testtext \${srcdir}/hr/hr1.in > tempoutput && diff \${srcdir}/hr/hr1.out tempoutput"~~
	3042	+$as_echo "$at_srcdir/testsuite.at:213: testtext \${srcdir}/list/list3.in > tempoutput && diff \${srcdir}/list/list3.out tempoutput"
3041	3043	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:213"
3042		~~-( $at_check_trace; testtext ${srcdir}/hr/hr1.in > tempoutput && diff ${srcdir}/hr/hr1.out tempoutput~~
	3044	+( $at_check_trace; testtext ${srcdir}/list/list3.in > tempoutput && diff ${srcdir}/list/list3.out tempoutput
3043	3045	) >>"$at_stdout" 2>>"$at_stderr"
3044	3046	at_status=$? at_failed=false
3045	3047	$at_check_filter
—	—	@@ -3055,10 +3057,10 @@
3056	3058	read at_status <"$at_status_file"
3057	3059	#AT_STOP_30
3058	3060	#AT_START_31
3059		~~-# 31. testsuite.at:217: link1~~
	3061	+# 31. testsuite.at:217: list4
3060	3062	at_setup_line='testsuite.at:217'
3061	3063	at_fn_banner 1
3062		~~-at_desc="link1"~~
	3064	+at_desc="list4"
3063	3065	at_desc_line=" 31: $at_desc "
3064	3066	$at_quiet $as_echo_n "$at_desc_line"
3065	3067	at_xfail=no
—	—	@@ -3072,9 +3074,9 @@
3073	3075	_ATEOF
3074	3076
3075	3077	{ set +x
3076		~~-$as_echo "$at_srcdir/testsuite.at:220: testtext \${srcdir}/link/link1.in > tempoutput && diff \${srcdir}/link/link1.out tempoutput"~~
	3078	+$as_echo "$at_srcdir/testsuite.at:220: testtext \${srcdir}/list/list4.in > tempoutput && diff \${srcdir}/list/list4.out tempoutput"
3077	3079	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:220"
3078		~~-( $at_check_trace; testtext ${srcdir}/link/link1.in > tempoutput && diff ${srcdir}/link/link1.out tempoutput~~
	3080	+( $at_check_trace; testtext ${srcdir}/list/list4.in > tempoutput && diff ${srcdir}/list/list4.out tempoutput
3079	3081	) >>"$at_stdout" 2>>"$at_stderr"
3080	3082	at_status=$? at_failed=false
3081	3083	$at_check_filter
—	—	@@ -3091,16 +3093,16 @@
3092	3094	read at_status <"$at_status_file"
3093	3095	#AT_STOP_31
3094	3096	#AT_START_32
3095		~~-# 32. testsuite.at:225: link2~~
3096		~~-at_setup_line='testsuite.at:225'~~
	3097	+# 32. testsuite.at:224: hr
	3098	+at_setup_line='testsuite.at:224'
3097	3099	at_fn_banner 1
3098		~~-at_desc="link2"~~
3099		~~-at_desc_line=" 32: $at_desc "~~
	3100	+at_desc="hr"
	3101	+at_desc_line=" 32: $at_desc "
3100	3102	$at_quiet $as_echo_n "$at_desc_line"
3101	3103	at_xfail=no
3102	3104	echo "# -- compilation --" >> "$at_group_log"
3103	3105	(
3104		~~- $as_echo "32. testsuite.at:225: testing ..."~~
	3106	+ $as_echo "32. testsuite.at:224: testing ..."
3105	3107	$at_traceon
3106	3108
3107	3109
—	—	@@ -3108,15 +3110,15 @@
3109	3111	_ATEOF
3110	3112
3111	3113	{ set +x
3112		~~-$as_echo "$at_srcdir/testsuite.at:228: testtext \${srcdir}/link/link2.in > tempoutput && diff \${srcdir}/link/link2.out tempoutput"~~
3113		~~-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:228"~~
3114		~~-( $at_check_trace; testtext ${srcdir}/link/link2.in > tempoutput && diff ${srcdir}/link/link2.out tempoutput~~
	3114	+$as_echo "$at_srcdir/testsuite.at:227: testtext \${srcdir}/hr/hr1.in > tempoutput && diff \${srcdir}/hr/hr1.out tempoutput"
	3115	+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:227"
	3116	+( $at_check_trace; testtext ${srcdir}/hr/hr1.in > tempoutput && diff ${srcdir}/hr/hr1.out tempoutput
3115	3117	) >>"$at_stdout" 2>>"$at_stderr"
3116	3118	at_status=$? at_failed=false
3117	3119	$at_check_filter
3118	3120	at_fn_diff_devnull "$at_stderr" \|\| at_failed=:
3119	3121	at_fn_diff_devnull "$at_stdout" \|\| at_failed=:
3120		~~-at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:228"~~
	3122	+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:227"
3121	3123	$at_failed && at_fn_log_failure
3122	3124	$at_traceon; }
3123	3125
—	—	@@ -3127,16 +3129,16 @@
3128	3130	read at_status <"$at_status_file"
3129	3131	#AT_STOP_32
3130	3132	#AT_START_33
3131		~~-# 33. testsuite.at:232: link3~~
3132		~~-at_setup_line='testsuite.at:232'~~
	3133	+# 33. testsuite.at:231: link1
	3134	+at_setup_line='testsuite.at:231'
3133	3135	at_fn_banner 1
3134		~~-at_desc="link3"~~
	3136	+at_desc="link1"
3135	3137	at_desc_line=" 33: $at_desc "
3136	3138	$at_quiet $as_echo_n "$at_desc_line"
3137	3139	at_xfail=no
3138	3140	echo "# -- compilation --" >> "$at_group_log"
3139	3141	(
3140		~~- $as_echo "33. testsuite.at:232: testing ..."~~
	3142	+ $as_echo "33. testsuite.at:231: testing ..."
3141	3143	$at_traceon
3142	3144
3143	3145
—	—	@@ -3144,15 +3146,15 @@
3145	3147	_ATEOF
3146	3148
3147	3149	{ set +x
3148		~~-$as_echo "$at_srcdir/testsuite.at:235: testtext \${srcdir}/link/link3.in > tempoutput && diff \${srcdir}/link/link3.out tempoutput"~~
3149		~~-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:235"~~
3150		~~-( $at_check_trace; testtext ${srcdir}/link/link3.in > tempoutput && diff ${srcdir}/link/link3.out tempoutput~~
	3150	+$as_echo "$at_srcdir/testsuite.at:234: testtext \${srcdir}/link/link1.in > tempoutput && diff \${srcdir}/link/link1.out tempoutput"
	3151	+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:234"
	3152	+( $at_check_trace; testtext ${srcdir}/link/link1.in > tempoutput && diff ${srcdir}/link/link1.out tempoutput
3151	3153	) >>"$at_stdout" 2>>"$at_stderr"
3152	3154	at_status=$? at_failed=false
3153	3155	$at_check_filter
3154	3156	at_fn_diff_devnull "$at_stderr" \|\| at_failed=:
3155	3157	at_fn_diff_devnull "$at_stdout" \|\| at_failed=:
3156		~~-at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:235"~~
	3158	+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:234"
3157	3159	$at_failed && at_fn_log_failure
3158	3160	$at_traceon; }
3159	3161
—	—	@@ -3163,10 +3165,10 @@
3164	3166	read at_status <"$at_status_file"
3165	3167	#AT_STOP_33
3166	3168	#AT_START_34
3167		~~-# 34. testsuite.at:239: link4~~
	3169	+# 34. testsuite.at:239: link2
3168	3170	at_setup_line='testsuite.at:239'
3169	3171	at_fn_banner 1
3170		~~-at_desc="link4"~~
	3172	+at_desc="link2"
3171	3173	at_desc_line=" 34: $at_desc "
3172	3174	$at_quiet $as_echo_n "$at_desc_line"
3173	3175	at_xfail=no
—	—	@@ -3180,9 +3182,9 @@
3181	3183	_ATEOF
3182	3184
3183	3185	{ set +x
3184		~~-$as_echo "$at_srcdir/testsuite.at:242: testtext \${srcdir}/link/link4.in > tempoutput && diff \${srcdir}/link/link4.out tempoutput"~~
	3186	+$as_echo "$at_srcdir/testsuite.at:242: testtext \${srcdir}/link/link2.in > tempoutput && diff \${srcdir}/link/link2.out tempoutput"
3185	3187	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:242"
3186		~~-( $at_check_trace; testtext ${srcdir}/link/link4.in > tempoutput && diff ${srcdir}/link/link4.out tempoutput~~
	3188	+( $at_check_trace; testtext ${srcdir}/link/link2.in > tempoutput && diff ${srcdir}/link/link2.out tempoutput
3187	3189	) >>"$at_stdout" 2>>"$at_stderr"
3188	3190	at_status=$? at_failed=false
3189	3191	$at_check_filter
—	—	@@ -3199,10 +3201,10 @@
3200	3202	read at_status <"$at_status_file"
3201	3203	#AT_STOP_34
3202	3204	#AT_START_35
3203		~~-# 35. testsuite.at:246: link5~~
	3205	+# 35. testsuite.at:246: link3
3204	3206	at_setup_line='testsuite.at:246'
3205	3207	at_fn_banner 1
3206		~~-at_desc="link5"~~
	3208	+at_desc="link3"
3207	3209	at_desc_line=" 35: $at_desc "
3208	3210	$at_quiet $as_echo_n "$at_desc_line"
3209	3211	at_xfail=no
—	—	@@ -3216,9 +3218,9 @@
3217	3219	_ATEOF
3218	3220
3219	3221	{ set +x
3220		~~-$as_echo "$at_srcdir/testsuite.at:249: testtext \${srcdir}/link/link5.in > tempoutput && diff \${srcdir}/link/link5.out tempoutput"~~
	3222	+$as_echo "$at_srcdir/testsuite.at:249: testtext \${srcdir}/link/link3.in > tempoutput && diff \${srcdir}/link/link3.out tempoutput"
3221	3223	at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:249"
3222		~~-( $at_check_trace; testtext ${srcdir}/link/link5.in > tempoutput && diff ${srcdir}/link/link5.out tempoutput~~
	3224	+( $at_check_trace; testtext ${srcdir}/link/link3.in > tempoutput && diff ${srcdir}/link/link3.out tempoutput
3223	3225	) >>"$at_stdout" 2>>"$at_stderr"
3224	3226	at_status=$? at_failed=false
3225	3227	$at_check_filter
—	—	@@ -3234,3 +3236,75 @@
3235	3237	) 5>&1 2>&1 \| eval $at_tee_pipe
3236	3238	read at_status <"$at_status_file"
3237	3239	#AT_STOP_35
	3240	+#AT_START_36
	3241	+# 36. testsuite.at:253: link4
	3242	+at_setup_line='testsuite.at:253'
	3243	+at_fn_banner 1
	3244	+at_desc="link4"
	3245	+at_desc_line=" 36: $at_desc "
	3246	+$at_quiet $as_echo_n "$at_desc_line"
	3247	+at_xfail=no
	3248	+echo "# -- compilation --" >> "$at_group_log"
	3249	+(
	3250	+ $as_echo "36. testsuite.at:253: testing ..."
	3251	+ $at_traceon
	3252	+
	3253	+
	3254	+cat >tempoutput <<'_ATEOF'
	3255	+_ATEOF
	3256	+
	3257	+{ set +x
	3258	+$as_echo "$at_srcdir/testsuite.at:256: testtext \${srcdir}/link/link4.in > tempoutput && diff \${srcdir}/link/link4.out tempoutput"
	3259	+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:256"
	3260	+( $at_check_trace; testtext ${srcdir}/link/link4.in > tempoutput && diff ${srcdir}/link/link4.out tempoutput
	3261	+) >>"$at_stdout" 2>>"$at_stderr"
	3262	+at_status=$? at_failed=false
	3263	+$at_check_filter
	3264	+at_fn_diff_devnull "$at_stderr" \|\| at_failed=:
	3265	+at_fn_diff_devnull "$at_stdout" \|\| at_failed=:
	3266	+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:256"
	3267	+$at_failed && at_fn_log_failure
	3268	+$at_traceon; }
	3269	+
	3270	+
	3271	+ set +x
	3272	+ $at_times_p && times >"$at_times_file"
	3273	+) 5>&1 2>&1 \| eval $at_tee_pipe
	3274	+read at_status <"$at_status_file"
	3275	+#AT_STOP_36
	3276	+#AT_START_37
	3277	+# 37. testsuite.at:260: link5
	3278	+at_setup_line='testsuite.at:260'
	3279	+at_fn_banner 1
	3280	+at_desc="link5"
	3281	+at_desc_line=" 37: $at_desc "
	3282	+$at_quiet $as_echo_n "$at_desc_line"
	3283	+at_xfail=no
	3284	+echo "# -- compilation --" >> "$at_group_log"
	3285	+(
	3286	+ $as_echo "37. testsuite.at:260: testing ..."
	3287	+ $at_traceon
	3288	+
	3289	+
	3290	+cat >tempoutput <<'_ATEOF'
	3291	+_ATEOF
	3292	+
	3293	+{ set +x
	3294	+$as_echo "$at_srcdir/testsuite.at:263: testtext \${srcdir}/link/link5.in > tempoutput && diff \${srcdir}/link/link5.out tempoutput"
	3295	+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "testsuite.at:263"
	3296	+( $at_check_trace; testtext ${srcdir}/link/link5.in > tempoutput && diff ${srcdir}/link/link5.out tempoutput
	3297	+) >>"$at_stdout" 2>>"$at_stderr"
	3298	+at_status=$? at_failed=false
	3299	+$at_check_filter
	3300	+at_fn_diff_devnull "$at_stderr" \|\| at_failed=:
	3301	+at_fn_diff_devnull "$at_stdout" \|\| at_failed=:
	3302	+at_fn_check_status 0 $at_status "$at_srcdir/testsuite.at:263"
	3303	+$at_failed && at_fn_log_failure
	3304	+$at_traceon; }
	3305	+
	3306	+
	3307	+ set +x
	3308	+ $at_times_p && times >"$at_times_file"
	3309	+) 5>&1 2>&1 \| eval $at_tee_pipe
	3310	+read at_status <"$at_status_file"
	3311	+#AT_STOP_37
Index: trunk/parsers/libmwparser/tests/testsuite.at
—	—	@@ -53,6 +53,13 @@
54	54
55	55	AT_CLEANUP
56	56
	57	+AT_SETUP([garbage])
	58	+
	59	+AT_DATA([tempoutput], [])
	60	+AT_CHECK([testtext ${srcdir}/html/garbage.in > tempoutput && diff ${srcdir}/html/garbage.out tempoutput])
	61	+
	62	+AT_CLEANUP
	63	+
57	64	AT_SETUP([italic1])
58	65
59	66	AT_DATA([tempoutput], [])
—	—	@@ -179,6 +186,13 @@
180	187
181	188	AT_CLEANUP
182	189
	190	+AT_SETUP([table7])
	191	+
	192	+AT_DATA([tempoutput], [])
	193	+AT_CHECK([testtext ${srcdir}/table/table7.in > tempoutput && diff ${srcdir}/table/table7.out tempoutput])
	194	+
	195	+AT_CLEANUP
	196	+
183	197	AT_SETUP([list1])
184	198
185	199	AT_DATA([tempoutput], [])
Index: trunk/parsers/libmwparser/tests/link/link5.out
—	—	@@ -22,9 +22,11 @@
23	23	END ROW
24	24	END TABLE BODY
25	25	END TABLE
26		~~- SPACE[ ]~~
27		~~- WORD[foo]~~
28		~~- SPACE[ ]~~
	26	+ BEGIN PARAGRAPH
	27	+ SPACE[ ]
	28	+ WORD[foo]
	29	+ SPACE[ ]
	30	+ END PARAGRAPH
29	31	END MEDIA LINK
30	32	SPACE[ ]
31	33	WORD[bar]
Index: trunk/parsers/libmwparser/tests/html/garbage.in
—	—	@@ -0,0 +1,4 @@
	2	+<table>garbage<tbody>garbage<tr>garbage<td>cell</td>garbage</tr>garbage<tr>garbage<td>cell</td>garbage</tr>garbage</tbody>garbage</table>
	3	+
	4	+<dl>garbage<dd>dd</dd>garbage<dt>dd</dt>garbage<dd>dd</dd>garbage</dl>
	5	+
Index: trunk/parsers/libmwparser/tests/html/garbage.out
—	—	@@ -0,0 +1,66 @@
	2	+BEGIN ARTICLE
	3	+ BEGIN GARBAGE
	4	+ WORD[garbage]
	5	+ END GARBAGE
	6	+ BEGIN TABLE
	7	+ BEGIN TABLE BODY
	8	+ BEGIN GARBAGE
	9	+ WORD[garbage]
	10	+ END GARBAGE
	11	+ BEGIN GARBAGE
	12	+ WORD[garbage]
	13	+ END GARBAGE
	14	+ BEGIN ROW
	15	+ BEGIN CELL
	16	+ WORD[cell]
	17	+ END CELL
	18	+ BEGIN GARBAGE
	19	+ WORD[garbage]
	20	+ END GARBAGE
	21	+ END ROW
	22	+ BEGIN GARBAGE
	23	+ WORD[garbage]
	24	+ END GARBAGE
	25	+ BEGIN GARBAGE
	26	+ WORD[garbage]
	27	+ END GARBAGE
	28	+ BEGIN ROW
	29	+ BEGIN CELL
	30	+ WORD[cell]
	31	+ END CELL
	32	+ BEGIN GARBAGE
	33	+ WORD[garbage]
	34	+ END GARBAGE
	35	+ END ROW
	36	+ BEGIN GARBAGE
	37	+ WORD[garbage]
	38	+ END GARBAGE
	39	+ BEGIN GARBAGE
	40	+ WORD[garbage]
	41	+ END GARBAGE
	42	+ END TABLE BODY
	43	+ END TABLE
	44	+ BEGIN GARBAGE
	45	+ WORD[garbage]
	46	+ END GARBAGE
	47	+ BEGIN DEFINITION LIST
	48	+ BEGIN DEFINITION ITEM
	49	+ WORD[dd]
	50	+ END DEFINITION ITEM
	51	+ BEGIN GARBAGE
	52	+ WORD[garbage]
	53	+ END GARBAGE
	54	+ BEGIN DEFINED TERM ITEM
	55	+ WORD[dd]
	56	+ END DEFINED TERM ITEM
	57	+ BEGIN GARBAGE
	58	+ WORD[garbage]
	59	+ END GARBAGE
	60	+ BEGIN DEFINITION ITEM
	61	+ WORD[dd]
	62	+ END DEFINITION ITEM
	63	+ BEGIN GARBAGE
	64	+ WORD[garbage]
	65	+ END GARBAGE
	66	+ END DEFINITION LIST
	67	+END ARTICLE
Index: trunk/parsers/libmwparser/tests/hr/hr1.out
—	—	@@ -1,6 +1,8 @@
2	2	BEGIN ARTICLE
3	3	HORIZONTAL_RULE
4		~~- WORD[text]~~
	4	+ BEGIN GARBAGE
	5	+ WORD[text]
	6	+ END GARBAGE
5	7	BEGIN PARAGRAPH
6	8	WORD[text]
7	9	END PARAGRAPH
—	—	@@ -9,7 +11,9 @@
10	12	WORD[text]
11	13	END PARAGRAPH
12	14	HORIZONTAL_RULE
13		~~- WORD[text]~~
	15	+ BEGIN GARBAGE
	16	+ WORD[text]
	17	+ END GARBAGE
14	18	BEGIN PARAGRAPH
15	19	WORD[text]
16	20	END PARAGRAPH
Index: trunk/parsers/libmwparser/tests/list/list2.out
—	—	@@ -60,57 +60,50 @@
61	61	WORD[ul]
62	62	SPECIAL[>]
63	63	END DEFINED TERM ITEM
64		~~- BEGIN PARAGRAPH~~
65		~~- SPECIAL[<]~~
66		~~- WORD[dd]~~
67		~~- SPECIAL[>]~~
68		~~- SPECIAL[<]~~
69		~~- WORD[ul]~~
70		~~- SPECIAL[>]~~
71		~~- SPECIAL[<]~~
72		~~- WORD[li]~~
73		~~- SPECIAL[>]~~
74		~~- WORD[definition]~~
75		~~- SPECIAL[</]~~
76		~~- WORD[dd]~~
77		~~- SPECIAL[>]~~
78		~~- NEWLINE~~
79		~~- SPECIAL[</]~~
80		~~- WORD[dd]~~
81		~~- SPECIAL[>]~~
82		~~- END PARAGRAPH~~
83		~~- BEGIN BULLET LIST~~
84		~~- BEGIN BULLET LIST ITEM~~
85		~~- BEGIN BULLET LIST~~
86		~~- BEGIN BULLET LIST ITEM~~
87		~~- WORD[wikitext]~~
88		~~- SPACE[ ]~~
89		~~- WORD[list]~~
90		~~- SPACE[ ]~~
91		~~- WORD[item]~~
92		~~- END BULLET LIST ITEM~~
93		~~- END BULLET LIST~~
94		~~- END BULLET LIST ITEM~~
95		~~- END BULLET LIST~~
96		~~- BEGIN PARAGRAPH~~
97		~~- SPECIAL[</]~~
98		~~- WORD[ol]~~
99		~~- SPECIAL[>]~~
100		~~- NEWLINE~~
101		~~- SPECIAL[</]~~
102		~~- WORD[ul]~~
103		~~- SPECIAL[>]~~
104		~~- NEWLINE~~
105		~~- SPECIAL[<]~~
106		~~- WORD[li]~~
107		~~- SPECIAL[>]~~
108		~~- SPACE[ ]~~
109		~~- WORD[item]~~
110		~~- SPACE[ ]~~
111		~~- SPECIAL[</]~~
112		~~- WORD[li]~~
113		~~- SPECIAL[>]~~
114		~~- END PARAGRAPH~~
	64	+ BEGIN DEFINITION ITEM
	65	+ BEGIN BULLET LIST
	66	+ BEGIN BULLET LIST ITEM
	67	+ WORD[definition]
	68	+ SPECIAL[</]
	69	+ WORD[dd]
	70	+ SPECIAL[>]
	71	+ NEWLINE
	72	+ SPECIAL[</]
	73	+ WORD[dd]
	74	+ SPECIAL[>]
	75	+ NEWLINE
	76	+ BEGIN BULLET LIST
	77	+ BEGIN BULLET LIST ITEM
	78	+ BEGIN BULLET LIST
	79	+ BEGIN BULLET LIST ITEM
	80	+ WORD[wikitext]
	81	+ SPACE[ ]
	82	+ WORD[list]
	83	+ SPACE[ ]
	84	+ WORD[item]
	85	+ END BULLET LIST ITEM
	86	+ END BULLET LIST
	87	+ END BULLET LIST ITEM
	88	+ END BULLET LIST
	89	+ BEGIN PARAGRAPH
	90	+ SPECIAL[</]
	91	+ WORD[ol]
	92	+ SPECIAL[>]
	93	+ END PARAGRAPH
	94	+ END BULLET LIST ITEM
	95	+ END BULLET LIST
	96	+ BEGIN PARAGRAPH
	97	+ SPECIAL[<]
	98	+ WORD[li]
	99	+ SPECIAL[>]
	100	+ SPACE[ ]
	101	+ WORD[item]
	102	+ SPACE[ ]
	103	+ SPECIAL[</]
	104	+ WORD[li]
	105	+ SPECIAL[>]
	106	+ END PARAGRAPH
	107	+ END DEFINITION ITEM
115	108	END DEFINITION LIST
116	109	END ENUMERATION LIST ITEM
117	110	END ENUMERATION LIST
Index: trunk/parsers/libmwparser/Makefile.am
—	—	@@ -45,6 +45,7 @@
46	46	include/mwformats.h \
47	47	include/mwheadings.h \
48	48	include/mwhtml.h \
	49	+ include/mwgarbage.h \
49	50	include/mwkeyvalue.h \
50	51	include/mwlexercontext.h \
51	52	include/mwlinkcollection.h \
—	—	@@ -65,6 +66,7 @@
66	67	src/mwhtml.c \
67	68	src/mwlexercontext.c \
68	69	src/mwlinks.c \
	70	+ src/mwgarbage.c \
69	71	src/mwlinkresolution.c \
70	72	src/mwlinkcollection.c \
71	73	src/mwmedialinkoption.c \

Status & tagging log

18:25, 22 January 2011 Brion VIBBER (talk | contribs) changed the status of r80756 [removed: new added: deferred]