--- a/rdf-mt/tests/convert-manifest.rb	Sat Sep 28 17:40:58 2013 -0700
+++ b/rdf-mt/tests/convert-manifest.rb	Sat Sep 28 18:06:02 2013 -0700
@@ -41,18 +41,17 @@
 
     <> rdf:type mf:Manifest ;
       rdfs:comment "RDF Schema and Semantics tests"
-      mf:entries \(
-  )[1..-1].gsub(/^\s+/, ''))
+      mf:entries \()[1..-1].gsub(/^    /, ''))
 
   QUERY.execute(g).each do |soln|
     #puts soln.inspect
     dir = soln.subject.path.split('/')[-2]
     frag = "##{dir}-#{soln.subject.fragment}"
     puts "test #{dir}/'#{frag}' already defined" if tests.has_key?(frag)
-    f.puts("  <#{frag}>")
+    f.write("\n    <#{frag}>")
     tests[frag] = soln
   end
-  f.puts(")\n")
+  f.puts("\n  ) .\n\n")
 
   tests.each_pair do |frag, test|
     # Wrap description to 40 characters and indent
@@ -74,7 +73,7 @@
         parts = path.split('/')
 
         FileUtils.mkdir(parts.first) unless Dir.exist?(parts.first)
-        unless File.exist?(path)
+        unless File.exist?(path.sub('.rdf', '.ttl'))
           if parts.last =~ /\.rdf/
             puts "Transform 2004-test-suite/#{path} to #{path.sub('.rdf', '.ttl')}"
             RDF::RDFXML::Reader.open("2004-test-suite/#{path}") do |reader|

--- a/rdf-mt/tests/manifest.ttl	Sat Sep 28 17:40:58 2013 -0700
+++ b/rdf-mt/tests/manifest.ttl	Sat Sep 28 18:06:02 2013 -0700
@@ -6,56 +6,59 @@
 ## 1. http://www.w3.org/Consortium/Legal/2008/04-testsuite-license
 ## 2. http://www.w3.org/Consortium/Legal/2008/03-bsd-license
 ## 3. http://www.w3.org/2004/10/27-testcases
+
 @prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
 @prefix rdft:   <http://www.w3.org/ns/rdftest#> .
+
 <> rdf:type mf:Manifest ;
-rdfs:comment "RDF Schema and Semantics tests"
-mf:entries (
-  <#datatypes-intensional-xsd-integer-decimal-compatible>
-  <#datatypes-intensional-xsd-integer-string-incompatible>
-  <#datatypes-non-well-formed-literal-1>
-  <#datatypes-non-well-formed-literal-2>
-  <#datatypes-semantic-equivalence-within-type-1>
-  <#datatypes-semantic-equivalence-within-type-2>
-  <#datatypes-semantic-equivalence-between-datatypes>
-  <#datatypes-range-clash>
-  <#datatypes-test008>
-  <#datatypes-test009>
-  <#datatypes-test010>
-  <#datatypes-plain-literal-and-xsd-string>
-  <#horst-01-subClassOf-intensional>
-  <#horst-01-subPropertyOf-intensional>
-  <#pfps-10-non-well-formed-literal-1>
-  <#rdf-charmod-uris-test003>
-  <#rdf-charmod-uris-test004>
-  <#rdfms-seq-representation-test002>
-  <#rdfms-seq-representation-test003>
-  <#rdfms-seq-representation-test004>
-  <#rdfms-xmllang-test007a>
-  <#rdfms-xmllang-test007b>
-  <#rdfms-xmllang-test007c>
-  <#rdfs-container-membership-superProperty-test001>
-  <#rdfs-domain-and-range-intensionality-range>
-  <#rdfs-domain-and-range-intensionality-domain>
-  <#rdfs-entailment-test001>
-  <#rdfs-entailment-test002>
-  <#rdfs-no-cycles-in-subClassOf-test001>
-  <#rdfs-no-cycles-in-subPropertyOf-test001>
-  <#rdfs-subClassOf-a-Property-test001>
-  <#rdfs-subPropertyOf-semantics-test001>
-  <#statement-entailment-test001>
-  <#statement-entailment-test002>
-  <#statement-entailment-test003>
-  <#statement-entailment-test004>
-  <#tex-01-language-tag-case-1>
-  <#tex-01-language-tag-case-2>
-  <#xmlsch-02-whitespace-facet-1>
-  <#xmlsch-02-whitespace-facet-2>
-  <#xmlsch-02-whitespace-facet-3>
-  <#xmlsch-02-whitespace-facet-4>
-)
+  rdfs:comment "RDF Schema and Semantics tests"
+  mf:entries (
+    <#datatypes-intensional-xsd-integer-decimal-compatible>
+    <#datatypes-intensional-xsd-integer-string-incompatible>
+    <#datatypes-non-well-formed-literal-1>
+    <#datatypes-non-well-formed-literal-2>
+    <#datatypes-semantic-equivalence-within-type-1>
+    <#datatypes-semantic-equivalence-within-type-2>
+    <#datatypes-semantic-equivalence-between-datatypes>
+    <#datatypes-range-clash>
+    <#datatypes-test008>
+    <#datatypes-test009>
+    <#datatypes-test010>
+    <#datatypes-plain-literal-and-xsd-string>
+    <#horst-01-subClassOf-intensional>
+    <#horst-01-subPropertyOf-intensional>
+    <#pfps-10-non-well-formed-literal-1>
+    <#rdf-charmod-uris-test003>
+    <#rdf-charmod-uris-test004>
+    <#rdfms-seq-representation-test002>
+    <#rdfms-seq-representation-test003>
+    <#rdfms-seq-representation-test004>
+    <#rdfms-xmllang-test007a>
+    <#rdfms-xmllang-test007b>
+    <#rdfms-xmllang-test007c>
+    <#rdfs-container-membership-superProperty-test001>
+    <#rdfs-domain-and-range-intensionality-range>
+    <#rdfs-domain-and-range-intensionality-domain>
+    <#rdfs-entailment-test001>
+    <#rdfs-entailment-test002>
+    <#rdfs-no-cycles-in-subClassOf-test001>
+    <#rdfs-no-cycles-in-subPropertyOf-test001>
+    <#rdfs-subClassOf-a-Property-test001>
+    <#rdfs-subPropertyOf-semantics-test001>
+    <#statement-entailment-test001>
+    <#statement-entailment-test002>
+    <#statement-entailment-test003>
+    <#statement-entailment-test004>
+    <#tex-01-language-tag-case-1>
+    <#tex-01-language-tag-case-2>
+    <#xmlsch-02-whitespace-facet-1>
+    <#xmlsch-02-whitespace-facet-2>
+    <#xmlsch-02-whitespace-facet-3>
+    <#xmlsch-02-whitespace-facet-4>
+  ) .
+
 <#datatypes-intensional-xsd-integer-decimal-compatible> a mf:NegativeEntailmentTest;
   mf:name "datatypes-intensional-xsd-integer-decimal-compatible";
   rdfs:comment """
@@ -183,8 +186,8 @@
     rdfs:subClassOf has intensional semantics, not extensional.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <horst-01/test001.ttl>;
-  mf:result <horst-01/test002.ttl> .
+  mf:action <horst-01/test001.rdf>;
+  mf:result <horst-01/test002.rdf> .
     
 <#horst-01-subPropertyOf-intensional> a mf:NegativeEntailmentTest;
   mf:name "horst-01-subPropertyOf-intensional";
@@ -192,8 +195,8 @@
     rdfs:subPropertyOf has intensional semantics, not extensional.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <horst-01/test003.ttl>;
-  mf:result <horst-01/test004.ttl> .
+  mf:action <horst-01/test003.rdf>;
+  mf:result <horst-01/test004.rdf> .
     
 <#pfps-10-non-well-formed-literal-1> a mf:PositiveEntailmentTest;
   mf:name "pfps-10-non-well-formed-literal-1";
@@ -212,8 +215,8 @@
     holds between them.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdf-charmod-uris/test001.ttl>;
-  mf:result <rdf-charmod-uris/test002.ttl> .
+  mf:action <rdf-charmod-uris/test001.rdf>;
+  mf:result <rdf-charmod-uris/test002.rdf> .
     
 <#rdf-charmod-uris-test004> a mf:NegativeEntailmentTest;
   mf:name "rdf-charmod-uris-test004";
@@ -223,8 +226,8 @@
     holds between them.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdf-charmod-uris/test002.ttl>;
-  mf:result <rdf-charmod-uris/test001.ttl> .
+  mf:action <rdf-charmod-uris/test002.rdf>;
+  mf:result <rdf-charmod-uris/test001.rdf> .
     
 <#rdfms-seq-representation-test002> a mf:PositiveEntailmentTest;
   mf:name "rdfms-seq-representation-test002";
@@ -290,8 +293,8 @@
     _:b . does NOT entail _:a <rdf:_n> _:b . for any _n.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdfs-container-membership-superProperty/not1P.ttl>;
-  mf:result <rdfs-container-membership-superProperty/not1C.ttl> .
+  mf:action <rdfs-container-membership-superProperty/not1P.rdf>;
+  mf:result <rdfs-container-membership-superProperty/not1C.rdf> .
     
 <#rdfs-domain-and-range-intensionality-range> a mf:NegativeEntailmentTest;
   mf:name "rdfs-domain-and-range-intensionality-range";
@@ -303,8 +306,8 @@
     extensions.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdfs-domain-and-range/premises005.ttl>;
-  mf:result <rdfs-domain-and-range/nonconclusions005.ttl> .
+  mf:action <rdfs-domain-and-range/premises005.rdf>;
+  mf:result <rdfs-domain-and-range/nonconclusions005.rdf> .
     
 <#rdfs-domain-and-range-intensionality-domain> a mf:NegativeEntailmentTest;
   mf:name "rdfs-domain-and-range-intensionality-domain";
@@ -316,8 +319,8 @@
     extensions.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdfs-domain-and-range/premises006.ttl>;
-  mf:result <rdfs-domain-and-range/nonconclusions006.ttl> .
+  mf:action <rdfs-domain-and-range/premises006.rdf>;
+  mf:result <rdfs-domain-and-range/nonconclusions006.rdf> .
     
 <#rdfs-entailment-test001> a mf:PositiveEntailmentTest;
   mf:name "rdfs-entailment-test001";
@@ -347,7 +350,7 @@
     and the following entailment holds trivially.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdfs-no-cycles-in-subClassOf/test001.ttl>;
+  mf:action <rdfs-no-cycles-in-subClassOf/test001.rdf>;
   mf:result <rdfs-no-cycles-in-subClassOf/test001.nt> .
     
 <#rdfs-no-cycles-in-subPropertyOf-test001> a mf:PositiveEntailmentTest;
@@ -357,7 +360,7 @@
     occurs and the following entailment holds trivially.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <rdfs-no-cycles-in-subPropertyOf/test001.ttl>;
+  mf:action <rdfs-no-cycles-in-subPropertyOf/test001.rdf>;
   mf:result <rdfs-no-cycles-in-subPropertyOf/test001.nt> .
     
 <#rdfs-subClassOf-a-Property-test001> a mf:NegativeEntailmentTest;
@@ -436,8 +439,8 @@
     The case of the language tag is not significant.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <tex-01/test001.ttl>;
-  mf:result <tex-01/test002.ttl> .
+  mf:action <tex-01/test001.rdf>;
+  mf:result <tex-01/test002.rdf> .
     
 <#tex-01-language-tag-case-2> a mf:PositiveEntailmentTest;
   mf:name "tex-01-language-tag-case-2";
@@ -445,8 +448,8 @@
     The case of the language tag is not significant.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <tex-01/test002.ttl>;
-  mf:result <tex-01/test001.ttl> .
+  mf:action <tex-01/test002.rdf>;
+  mf:result <tex-01/test001.rdf> .
     
 <#xmlsch-02-whitespace-facet-1> a mf:NegativeEntailmentTest;
   mf:name "xmlsch-02-whitespace-facet-1";
@@ -455,8 +458,8 @@
     literal. Even if they only differ by whitespace.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <xmlsch-02/test001.ttl>;
-  mf:result <xmlsch-02/test002.ttl> .
+  mf:action <xmlsch-02/test001.rdf>;
+  mf:result <xmlsch-02/test002.rdf> .
     
 <#xmlsch-02-whitespace-facet-2> a mf:NegativeEntailmentTest;
   mf:name "xmlsch-02-whitespace-facet-2";
@@ -465,8 +468,8 @@
     literal. Even if they only differ by whitespace.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <xmlsch-02/test002.ttl>;
-  mf:result <xmlsch-02/test001.ttl> .
+  mf:action <xmlsch-02/test002.rdf>;
+  mf:result <xmlsch-02/test001.rdf> .
     
 <#xmlsch-02-whitespace-facet-3> a mf:PositiveEntailmentTest;
   mf:name "xmlsch-02-whitespace-facet-3";
@@ -474,8 +477,8 @@
     A simple test for well-formedness of a typed literal.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <xmlsch-02/test001.ttl>;
-  mf:result <xmlsch-02/test003.ttl> .
+  mf:action <xmlsch-02/test001.rdf>;
+  mf:result <xmlsch-02/test003.rdf> .
     
 <#xmlsch-02-whitespace-facet-4> a mf:NegativeEntailmentTest;
   mf:name "xmlsch-02-whitespace-facet-4";
@@ -483,6 +486,6 @@
     An integer with whitespace is ill-formed.
   """;
   rdfs:approval rdft:Approved;
-  mf:action <xmlsch-02/test002.ttl>;
-  mf:result <xmlsch-02/test003.ttl> .
+  mf:action <xmlsch-02/test002.rdf>;
+  mf:result <xmlsch-02/test003.rdf> .