--- a/trig/tests/manifest.ttl	Fri Nov 08 12:34:15 2013 -0800
+++ b/trig/tests/manifest.ttl	Fri Nov 08 13:26:30 2013 -0800
@@ -29,6 +29,7 @@
     <#trig-syntax-bad-prefix-07>
     <#trig-syntax-struct-06>
     <#trig-syntax-struct-07>
+    <#trig-syntax-minimal-whitespace-01.>
 
     # From Turtle tests
     # atomic tests
@@ -376,6 +377,8 @@
 
       <#trig-turtle-bad-01>
       <#trig-turtle-bad-02>
+
+      # Tests from N-Triples/N-Quads
     ) .
 
 # TriG tests
@@ -452,6 +455,12 @@
    mf:action    <trig-syntax-struct-07.trig> ;
    .
 
+<#trig-syntax-minimal-whitespace-01.> a rdft:TestTrigPositiveSyntax ;
+   mf:name      "trig-syntax-minimal-whitespace-01" ;
+   rdfs:comment "tests absense of whitespace in various positions" ;
+   rdft:approval rdft:Proposed ;
+   mf:action    <trig-syntax-minimal-whitespace-01.trig> ;
+   .
 # Original Turtle tests
 # atomic tests
 <#IRI_subject> rdf:type rdft:TestTrigEval ;
@@ -854,7 +863,7 @@
    mf:result    <LITERAL1_ascii_boundaries.nq> ;
    .
 
-<#LITERAL1_with_UTF8_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL1_with_UTF8_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL1_with_UTF8_boundaries" ;
    rdfs:comment "LITERAL1_with_UTF8_boundaries '\\x80\\x7ff\\x800\\xfff...'" ;
    rdft:approval rdft:Approved ;
@@ -894,7 +903,7 @@
    mf:result    <LITERAL_LONG1_ascii_boundaries.nq> ;
    .
 
-<#LITERAL_LONG1_with_UTF8_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG1_with_UTF8_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG1_with_UTF8_boundaries" ;
    rdfs:comment "LITERAL_LONG1_with_UTF8_boundaries '\\x80\\x7ff\\x800\\xfff...'" ;
    rdft:approval rdft:Approved ;
@@ -934,7 +943,7 @@
    mf:result    <LITERAL2_ascii_boundaries.nq> ;
    .
 
-<#LITERAL2_with_UTF8_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL2_with_UTF8_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL2_with_UTF8_boundaries" ;
    rdfs:comment "LITERAL2_with_UTF8_boundaries '\\x80\\x7ff\\x800\\xfff...'" ;
    rdft:approval rdft:Approved ;
@@ -958,7 +967,7 @@
    mf:result    <LITERAL_LONG2_ascii_boundaries.nq> ;
    .
 
-<#LITERAL_LONG2_with_UTF8_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2_with_UTF8_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG2_with_UTF8_boundaries" ;
    rdfs:comment "LITERAL_LONG2_with_UTF8_boundaries '\\x80\\x7ff\\x800\\xfff...'" ;
    rdft:approval rdft:Approved ;
@@ -2459,7 +2468,7 @@
 
 # tests requested by Jeremy Carroll
 # http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c35
-<#comment_following_localName> rdf:type rdft:TestTurtleEval ;
+<#comment_following_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "comment_following_localName" ;
    rdfs:comment "comment following localName" ;
    rdft:approval rdft:Proposed ;
@@ -2467,7 +2476,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#number_sign_following_localName> rdf:type rdft:TestTurtleEval ;
+<#number_sign_following_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "number_sign_following_localName" ;
    rdfs:comment "number sign following localName" ;
    rdft:approval rdft:Proposed ;
@@ -2475,7 +2484,7 @@
    mf:result    <number_sign_following_localName.nq> ;
    .
 
-<#comment_following_PNAME_NS> rdf:type rdft:TestTurtleEval ;
+<#comment_following_PNAME_NS> rdf:type rdft:TestTrigEval ;
    mf:name      "comment_following_PNAME_NS" ;
    rdfs:comment "comment following PNAME_NS" ;
    rdft:approval rdft:Proposed ;
@@ -2483,7 +2492,7 @@
    mf:result    <comment_following_PNAME_NS.nq> ;
    .
 
-<#number_sign_following_PNAME_NS> rdf:type rdft:TestTurtleEval ;
+<#number_sign_following_PNAME_NS> rdf:type rdft:TestTrigEval ;
    mf:name      "number_sign_following_PNAME_NS" ;
    rdfs:comment "number sign following PNAME_NS" ;
    rdft:approval rdft:Proposed ;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trig/tests/trig-syntax-minimal-whitespace-01.trig	Fri Nov 08 13:26:30 2013 -0800
@@ -0,0 +1,18 @@
+BASE<http://example/base>
+@base<http://example/base>.
+PREFIX :<http://example/a/>
+PREFIX b:<http://example/b/>
+@prefix:<http://example/c/>.
+@prefixd:<http://example/d/>.
+
+{<http://example/s><http://example/p><http://example/o>.<http://example/s><http://example/p>"Alice".<http://example/s><http://example/p>_:o.}
+{:s :p :o .:s :p"Alice".:s :p _:o.}
+{b:s b:p b:o .b:s b:p"Alice".b:s b:p _:o.}
+{_:s:p :o ._:s:p"Alice". _:s:p _:o .}
+{[:p :o].[:p"Alice"].[:p _:o].}
+{[:p(:o)].[:p(_:o)].[:p("Alice")].[:p(<http://example/o>)].}
+{:s :p :o,:o2 .:s :p"Alice","Ted".:s :p _:o,_:o2.}
+{:s :p :o;:p2 :o2 .:s :p"Alice";:p2 "Ted".:s :p _:o;:p2 _:o2.}
+<http://example/g>{:s :p :o .:s :p"Alice".:s :p _:o.}
+:s{:s :p :o .:s :p"Alice".:s :p _:o.}
+_:s{:s :p :o .:s :p"Alice".:s :p _:o.}