@@ -38,24 +38,28 @@ sub test_results
3838foreach my $format (@writeformats)
3939{
4040 $options = "";
41− if ($format =~ /smart\./)
42− {
43− $options = "-S ";
44− }
4541
4642 my $extension = $format;
47− $extension =~ s/smart\.//g;
48−
4943 print "Testing $format writer...";
44+
5045 `$script -r native -w $extension $options -s $source > tmp.$extension`;
5146
5247 test_results("$format writer", "tmp.$extension", "writer.$format");
48+
49+ print " $format tables...";
50+
51+ `$script -r native -w $extension tables.native > tmp.$extension`;
52+
53+ test_results("$format writer", "tmp.$extension", "tables.$format");
5354}
5455
5556print "Testing docbook writer...";
5657# remove HTML block tests, as this produces invalid docbook...
5758`sed -e '/^, Header 1 \\[Str "HTML",Space,Str "Blocks"\\]/,/^, HorizontalRule/d' testsuite.native | $script -r native -w docbook -s > tmp.docbook`;
5859test_results("docbook writer", "tmp.docbook", "writer.docbook");
60+`$script -r native -w docbook tables.native > tmp.docbook`;
61+print " docbook tables...";
62+test_results("docbook tables", "tmp.docbook", "tables.docbook");
5963
6064print "Testing s5 writer (basic)...";
6165`$script -r native -w s5 -s s5.native > tmp.html`;
@@ -73,45 +77,12 @@ print "Testing -H -B -A -c options...";
7377`$script -r native -s -w html -H insert -B insert -A insert -c main.css s5.native > tmp.html`;
7478test_results("-B, -A, -H, -c options", "tmp.html", "s5.inserts.html");
7579
76−print "Testing tables:\n";
77−print " html writer...";
78−`$script -r native -w html tables.native > tmp.html`;
79−test_results("html table writer", "tmp.html", "tables.html");
80−
81−print " latex writer...";
82−`$script -r native -w latex tables.native > tmp.tex`;
83−test_results("latex table writer", "tmp.tex", "tables.tex");
84−
85−print " docbook writer...";
86−`$script -r native -w docbook tables.native > tmp.db`;
87−test_results("docbook table writer", "tmp.db", "tables.db");
88−
89−print " rtf writer...";
90−`$script -r native -w rtf tables.native > tmp.rtf`;
91−test_results("rtf table writer", "tmp.rtf", "tables.rtf");
92−
93−print " markdown writer...";
94−`$script -r native -w markdown tables.native > tmp.markdown`;
95−test_results("markdown table writer", "tmp.markdown", "tables.markdown");
96−
97−print " rst writer...";
98−`$script -r native -w rst tables.native > tmp.rst`;
99−test_results("rst table writer", "tmp.rst", "tables.rst");
100−
101−print " man writer...";
102−`$script -r native -w man tables.native > tmp.man`;
103−test_results("man table writer", "tmp.man", "tables.man");
104−
10580print "\nReader tests:\n";
10681
10782print "Testing markdown reader...";
10883`$script -r markdown -w native -s -S testsuite.txt > tmp.native`;
10984test_results("markdown reader", "tmp.native", "testsuite.native");
11085
111−print " tables...";
112−`$script -r markdown -w native tables.txt > tmp.native`;
113−test_results("markdown table reader", "tmp.native", "tables.native");
114−
11586print "Testing rst reader...";
11687`$script -r rst -w native -s rst-reader.rst > tmp.native`;
11788test_results("rst reader", "tmp.native", "rst-reader.native");