diff --git a/jena-arq/Grammar/.gitignore b/jena-arq/Grammar/.gitignore
index d1648fbab98..a786afe999c 100644
--- a/jena-arq/Grammar/.gitignore
+++ b/jena-arq/Grammar/.gitignore
@@ -9,5 +9,7 @@ Y12.html
 sparql-grammar.html
 # Grammar in BNF text
 sparql.bnf
-# Grammar in HTML as a standalone web page.
+## BNF
+sparql.bnf
+## Grammar in HTML as a standalone web page.
 sparql-html.html
diff --git a/jena-arq/Grammar/RDF-Protobuf/binary-rdf.proto b/jena-arq/Grammar/RDF-Protobuf/binary-rdf.proto
index 96cb29a5036..76bc9121eaa 100644
--- a/jena-arq/Grammar/RDF-Protobuf/binary-rdf.proto
+++ b/jena-arq/Grammar/RDF-Protobuf/binary-rdf.proto
@@ -55,7 +55,8 @@ message RDF_Literal {
   string lex = 1 ;
   oneof literalKind {
     bool simple = 9 ;
-    string langtag = 2 ;
+    string langtag = 2 ;    // Language tag only literal
+    string langdir = 5 ;    // Language tag and base direction separated by "--"
     string datatype = 3 ;
     RDF_PrefixName dtPrefix = 4 ;
   }
diff --git a/jena-arq/Grammar/RDF-Thrift/BinaryRDF.thrift b/jena-arq/Grammar/RDF-Thrift/BinaryRDF.thrift
index 460b72e09b4..60b6e7d088f 100644
--- a/jena-arq/Grammar/RDF-Thrift/BinaryRDF.thrift
+++ b/jena-arq/Grammar/RDF-Thrift/BinaryRDF.thrift
@@ -44,8 +44,10 @@ struct RDF_BNode {
 // union with additional values. 
 
 struct RDF_Literal {
+// Keep this numbering.
 1: required string  lex ;
 2: optional string  langtag ;
+5: optional string  baseDirection ;
 3: optional string  datatype ;          // Either 3 or 4 but UNION is heavy.
 4: optional RDF_PrefixName dtPrefix ;   // datatype as prefix name
 }
diff --git a/jena-arq/Grammar/RDF-Thrift/gen-thrift b/jena-arq/Grammar/RDF-Thrift/gen-thrift
index fff4df66905..87daf52ca8f 100755
--- a/jena-arq/Grammar/RDF-Thrift/gen-thrift
+++ b/jena-arq/Grammar/RDF-Thrift/gen-thrift
@@ -1,11 +1,11 @@
 #!/bin/bash
 ## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
 
-if [ "$#" != 1 ]
-then
-    echo "Usage: $(basename $0) FILE" 2>&1
-    exit 1
-fi
+## if [ "$#" != 1 ]
+## then
+##     echo "Usage: $(basename $0) FILE" 2>&1
+##     exit 1
+## fi
 
 # Find the namespace
 PKG=../../src/main/java/org/apache/jena/riot/thrift/wire
@@ -16,7 +16,9 @@ rm -f "$PKG"/*.java
 ##                      undated: suppress the date at @Generated annotations
 ##                      suppress: suppress @Generated annotations entirely
 
-thrift -r -out ../../src/main/java -gen 'java:generated_annotations=suppress' "$@"
+THRIFT="${1:-BinaryRDF.thrift}"
+
+thrift -r -out ../../src/main/java -gen 'java:generated_annotations=suppress' "$THRIFT"
 
 for f in "$PKG"/*.java
 do
diff --git a/jena-arq/Grammar/README b/jena-arq/Grammar/README
new file mode 100644
index 00000000000..65c77d522a8
--- /dev/null
+++ b/jena-arq/Grammar/README
@@ -0,0 +1,31 @@
+==== SPARQL Parser
+
+Run
+
+    grammar
+
+This produces the code for the current version SPARQL
+and the ARQ (SPARQL with extensions) parsers.
+
+==
+
+To produce the HTML for the SPARQL Grammar for the W3C spec:
+produce the SPARQL 1.2 specific file
+
+    grammar
+
+which also generates Java code and can be used for checking.
+
+Then run
+
+    sparql2html
+
+The output is in sparql-grammar.html.
+
+This replaces the table between "<!-- GRAMMAR -->" in the specific HTML.
+
+Running
+
+    sparql2bnf
+
+produces a text BNF form.
diff --git a/jena-arq/Grammar/Turtle/turtle.jj b/jena-arq/Grammar/Turtle/turtle.jj
index 57296a15ed8..ca1c11e4ae5 100644
--- a/jena-arq/Grammar/Turtle/turtle.jj
+++ b/jena-arq/Grammar/Turtle/turtle.jj
@@ -80,9 +80,9 @@ void Statement() : {}
 {
     Directive()
   | DirectiveOld()
-//  | (TriplesSameSubject() (<DOT> | <EOF> ) )
+//  | (Triples() (<DOT> | <EOF> ) )
   // Strict
-  | (TriplesSameSubject() <DOT> )
+  | (Triples() <DOT> )
 }
 
 // Turtle [3] directive
@@ -106,17 +106,15 @@ void DirectiveOld() : { Token t ; String iri ; }
     { setBase(iri, t.beginLine, t.beginColumn) ; }
 }
 
-// Turtle [6] triples
-void TriplesSameSubject() : { Node s ; } 
+void Triples() : { Node n; }
 {
-  s = Subject()
-  PredicateObjectList(s) 
+  n = Subject() PredicateObjectList(n)
 |
-  s = BlankNodePropertyList()
-  ( PredicateObjectList(s) )?
+  n = BlankNodePropertyList() ( PredicateObjectList(n) )?
+|
+  n = ReifiedTriple() ( PredicateObjectList(n) )?
 }
 
-// Turtle [7] predicateObjectList
 void PredicateObjectList(Node s) : { Node p = null ; }
 {
     p = Verb()
@@ -124,7 +122,6 @@ void PredicateObjectList(Node s) : { Node p = null ; }
     (<SEMICOLON> (p = Verb() ObjectList(s, p))? )*
 }
 
-// Turtle [8] objectList
 void ObjectList(Node s, Node p): { Node o ; } 
 {
   o = Object()
@@ -137,17 +134,6 @@ void ObjectList(Node s, Node p): { Node o ; }
   )*
 }
 
-// RDF-star Annotation Syntax
-void Annotation(Node s, Node p, Node o) : {}
-{
-  (
-    <L_ANN>
-      { Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn); }
-      PredicateObjectList(x)
-    <R_ANN>
-  )?
-}
-
 // Turtle [9] verb
 Node Verb() : { Node p ; }
 {
@@ -163,13 +149,10 @@ Node Subject() : { Node s; String iri ; }
     s = BlankNode()
   |
     s = Collection()
-  |
-    s = QuotedTriple()
   )
   { return s ; }
 }
 
-
 // Turtle [11] predicate
 Node Predicate() : { String iri;}
 {
@@ -185,43 +168,12 @@ Node Object(): { Node o ; String iri; }
   | o = Collection()
   | o = BlankNodePropertyList()
   | o = Literal()
-  | o = QuotedTriple()
+  | o = TripleTerm()
+  | o = ReifiedTriple()
   )
   { return o; }
 }
 
-Node QuotedTripleSubject(): { Node o ; String iri; }
-{
-  ( iri = iri() { o = createURI(iri, token.beginLine, token.beginColumn) ; }
-  | o = BlankNode()
-  | o = QuotedTriple()
-  )
-  { return o; }
-}
-
-Node QuotedTripleObject(): { Node o ; String iri; }
-{
-  ( iri = iri() { o = createURI(iri, token.beginLine, token.beginColumn) ; }
-  | o = BlankNode()
-  | o = Literal()
-  | o = QuotedTriple()
-  )
-  { return o ; } 
-}
-
-// The syntax for RDF-star <<>>
-Node QuotedTriple() : { Node s , p , o ; Token t ; }
-{
-  t = <LT2>
-  s = QuotedTripleSubject()
-  p = Verb()
-  o = QuotedTripleObject()
-  <GT2>
-  { Node n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    return n;
-  }
-}
-
 // Turtle [13] literal
 Node Literal() : { Node n ;}
 {
@@ -302,7 +254,7 @@ Node RDFLiteral() : { Token t ; String lex = null ; }
 String LangTag() : { Token t ; }
 {
   // Enumerate the directives here because they look like language tags.
-  ( t = <LANGTAG> | t = AnyDirective() )
+  ( t = <LANG_DIR> | t = AnyDirective() )
   { String lang = stripChars(t.image, 1) ; return lang ; }
 }
 
@@ -369,6 +321,106 @@ String IRIREF() : { Token t ; }
   { return resolveQuotedIRI(t.image, t.beginLine, t.beginColumn) ; }
 }
 
+Node Reifier() : { Node n = null; String iriStr; Token t; }
+{
+  t = <TILDE>
+  (
+    iriStr = iri() { n = createURI(iriStr, token.beginLine, token.beginColumn) ; }
+  | n = BlankNode()
+  )?
+  { if ( n == null ) n = createBNode(t.beginLine, t.beginColumn) ; }
+  { return n ; }
+}
+
+Node ReifiedTriple() : { Node reifId = null ; Token tok ;  Node s; Node p ; Node o ; }
+{
+   tok = <LT2>
+   s = ReifiedTripleSubject()
+   p = Verb()
+   o = ReifiedTripleObject()
+   ( reifId = Reifier())?
+   { reifId = emitTripleReifier(tok.beginLine, tok.beginColumn, reifId, s, p, o); }
+   <GT2>
+   { return reifId ; }
+}
+
+// rtSubject
+Node ReifiedTripleSubject() : { Node s; String iri; } {
+  ( iri = iri() { s = createURI(iri, token.beginLine, token.beginColumn) ; }
+  | s = BlankNode()
+  | s = ReifiedTriple()
+  )
+  { return s; }
+}
+
+// rtObject
+Node ReifiedTripleObject() : { Node o; String iri; } {
+  ( iri = iri() { o = createURI(iri, token.beginLine, token.beginColumn) ; }
+  | o = BlankNode()
+  | o = Literal()
+  | o = TripleTerm()
+  | o = ReifiedTriple()
+  )
+  { return o; }
+}
+
+Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
+{
+  <L_TRIPLE>
+  s = TripleTermSubject()
+  p = Verb()
+  o = TripleTermObject()
+  <R_TRIPLE>
+  { return createTripleTerm(s, p, o, token.beginLine, token.beginColumn) ; }
+}
+
+// ttSubject
+Node TripleTermSubject(): { Node o ; String iri; }
+{
+  ( iri = iri() { o = createURI(iri, token.beginLine, token.beginColumn) ; }
+  | o = BlankNode()
+  )
+  { return o; }
+}
+
+// ttObject
+Node TripleTermObject(): { Node o ; String iri; }
+{
+  ( iri = iri() { o = createURI(iri, token.beginLine, token.beginColumn) ; }
+  | o = BlankNode()
+  | o = Literal()
+  | o = TripleTerm()
+  )
+  { return o ; } 
+}
+
+// RDF-star Annotation Syntax
+void Annotation(Node s, Node p, Node o) : { Node reifId = null; }
+{
+  (
+    reifId = Reifier()
+    { reifId = emitTripleReifier(token.beginLine, token.beginColumn, reifId, s, p, o) ; }
+    { setReifierId(reifId); }
+  |
+    { reifId = getOrAllocReifierId(s, p, o, token.beginLine, token.beginColumn); }
+    { clearReifierId(); }
+    AnnotationBlock(reifId)
+  ) *
+}
+
+void AnnotationBlock( Node reifId ) : {}
+{
+   <L_ANN>
+   PredicateObjectList(reifId)
+   <R_ANN>
+// (
+//     <L_ANN>
+//       { Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn); }
+//       PredicateObjectList(x)
+//     <R_ANN>
+//   )?
+}
+
 // ------------------------------------------
 // Tokens
 
@@ -457,18 +509,23 @@ TOKEN :
 | < SEMICOLON: ";" >
 | < COMMA:     "," >
 | < DOT:       "." >
+
+| < DATATYPE: "^^">
+| < AT: "@">
+
+| < L_TRIPLE:  "<<(" >
+| < R_TRIPLE:  ")>>" >
 | < LT2:       "<<" >
 | < GT2:       ">>" >
 | < L_ANN:     "{|" >
 | < R_ANN:     "|}" >
-
-| < DATATYPE: "^^">
-| < AT: "@">
+| < TILDE:     "~"  >
+| < VBAR:      "|" >
 
 |  <PNAME_NS: (<PN_PREFIX>)? ":" >
 |  <PNAME_LN: <PNAME_NS> <PN_LOCAL> >
 |  <BLANK_NODE_LABEL: "_:" (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS>|".")* <PN_CHARS>)?  >
-|  <LANGTAG: <AT> (<A2Z>)+("-" (<A2ZN>)+)* >
+|  <LANG_DIR: <AT> (<A2Z>)+("-" (<A2ZN>)+)* ( "--" (<A2Z>)* )? >
 |  <#A2Z: ["a"-"z","A"-"Z"]>
 |  <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 4ffca766a36..96c41746932 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -628,6 +628,18 @@ Element TriplesBlock(ElementPathBlock acc) : { }
   ( <DOT> (TriplesBlock(acc))? )?
     { return acc ; }
 }
+Node ReifiedTripleBlock(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyList(reifId, acc)
+  { return reifId ; }
+}
+Node ReifiedTripleBlockPath(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyListPath(reifId, acc)
+  { return reifId ; }
+}
 Element GraphPatternNotTriples() : { Element el = null ; }
 {
  (
@@ -636,6 +648,10 @@ Element GraphPatternNotTriples() : { Element el = null ; }
    el = OptionalGraphPattern()
  |
    el = LateralGraphPattern()
+ |
+   el = SemiJoinGraphPattern()
+ |
+   el = AntiJoinGraphPattern()
  |
    el = MinusGraphPattern()
  |
@@ -667,6 +683,14 @@ Element LateralGraphPattern() : { Element el ; }
 { <LATERAL> el = GroupGraphPattern()
     { return new ElementLateral(el) ; }
 }
+Element SemiJoinGraphPattern() : { Element el ; }
+{ <SEMIJOIN> el = GroupGraphPattern()
+    { return new ElementSemiJoin(el) ; }
+}
+Element AntiJoinGraphPattern() : { Element el ; }
+{ <ANTIJOIN> el = GroupGraphPattern()
+    { return new ElementAntiJoin(el) ; }
+}
 Element GraphGraphPattern() : { Element el ; Node n ;}
 {
   <GRAPH> n = VarOrIri() el = GroupGraphPattern()
@@ -756,7 +780,20 @@ Node DataBlockValue() : { Node n ; String iri ; }
 | n = NumericLiteral() { return n ; }
 | n = BooleanLiteral() { return n ; }
 | <UNDEF> { return null ; }
-| n = QuotedTripleData() { return n ; }
+| n = TripleTermData() { return n ; }
+}
+Node Reifier() : { Token tok = null ; Node reifId = null ; }
+{
+    tok = <TILDE>
+    (reifId = VarOrReifierId() )?
+    { return reifId; }
+}
+Node VarOrReifierId() : { Node n = null; String iri = null; }
+{
+   ( n = Var() { return n; }
+   | iri = iri() { return createNode(iri) ; }
+   | n = BlankNode() { return n ; }
+   )
 }
 Element Assignment() : { Var v ; Expr expr ; }
 {
@@ -833,7 +870,7 @@ Expr FunctionCall() : { String fname ; Args a ; }
   {
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -898,6 +935,8 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
   s = TriplesNode(tempAcc)
   PropertyList(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlock(acc)
 }
 void PropertyList(Node s, TripleCollector acc) : { }
 {
@@ -941,6 +980,8 @@ void TriplesSameSubjectPath(TripleCollector acc) : { Node s ; }
   s = TriplesNodePath(tempAcc)
   PropertyListPath(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlockPath(acc)
 }
 void PropertyListPath(Node s, TripleCollector acc) : { }
 {
@@ -1059,6 +1100,11 @@ Path PathMod(Path p) : { long i1 ; long i2 ; }
        )
    )
 }
+long Integer() : {Token t ;}
+{
+    t = <INTEGER>
+    { return integerValue(t.image) ; }
+}
 Path PathPrimary() : { String str ; Path p ; Node n ; }
 {
   (
@@ -1109,16 +1155,11 @@ P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
     )
   )
 }
-long Integer() : {Token t ;}
-{
-    t = <INTEGER>
-    { return integerValue(t.image) ; }
-}
 Node TriplesNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = Collection(acc) { return n ; }
+   n = Collection(acc) { return n ; }
  |
-  n = BlankNodePropertyList(acc) { return n ; }
+   n = BlankNodePropertyList(acc) { return n ; }
 }
 Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
 {
@@ -1130,9 +1171,9 @@ Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
 }
 Node TriplesNodePath(TripleCollectorMark acc) : { Node n ; }
 {
-  n = CollectionPath(acc) { return n ; }
+   n = CollectionPath(acc) { return n ; }
  |
-  n = BlankNodePropertyListPath(acc) { return n ; }
+   n = BlankNodePropertyListPath(acc) { return n ; }
 }
 Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
 {
@@ -1190,80 +1231,177 @@ Node CollectionPath(TripleCollectorMark acc) :
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
      return listHead ; }
 }
-void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : {}
+void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, pAnn, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListPathNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlockPath(acc, reifId)
+  )*
+  { clearReifierId(); }
+}
+void AnnotationBlockPath(TripleCollector acc, Node reifId) : { }
+{
+   <L_ANN>
+      PropertyListPathNotEmpty(reifId, acc)
+   <R_ANN>
 }
-void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { }
+void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlock(acc, reifId)
+  )*
+}
+void AnnotationBlock(TripleCollector acc, Node reifId) : { }
+{
+   <L_ANN>
+      PropertyListNotEmpty(reifId, acc)
+   <R_ANN>
 }
 Node GraphNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = VarOrTerm() { return n ; }
+   n = VarOrTerm() { return n ; }
  |
-  n = TriplesNode(acc) { return n ; }
+   n = TriplesNode(acc) { return n ; }
+ |
+   n = ReifiedTriple(acc) { return n ; }
 }
 Node GraphNodePath(TripleCollectorMark acc) : { Node n ; }
 {
   n = VarOrTerm() { return n ; }
- |
+|
   n = TriplesNodePath(acc) { return n ; }
+|
+  n = ReifiedTriple(acc) { return n ; }
 }
 Node VarOrTerm() : { Node n = null ; String iri ; }
 {
   ( n = Var()
   | iri = iri() { return createNode(iri) ; }
-  | n = RDFLiteral() { return n ; }
-  | n = NumericLiteral() { return n ; }
-  | n = BooleanLiteral() { return n ; }
-  | n = BlankNode() { return n ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
   | <NIL> { return nRDFnil ; }
-  | n = QuotedTriple()
-)
-  { return n ; }
+  | n = TripleTerm() { return n; }
+  )
+  { return n; }
 }
-Node QuotedTriple() : { Node n = null ; Token t ; Node s , p , o ; }
+Node ReifiedTriple(TripleCollector acc) : { Node reifId = null ; Token tok ; Node s; Node p ; Node o ; }
 {
-  t = <LT2>
-  s = VarOrTerm()
+  tok = <LT2>
+  s = ReifiedTripleSubject(acc)
   p = Verb()
-  o = VarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
+  o = ReifiedTripleObject(acc)
+  (reifId = Reifier())?
+  { reifId = insertTripleReifier(acc, reifId, s, p, o, tok.beginLine, tok.beginColumn) ; }
   <GT2>
+  { return reifId; }
+}
+Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
+{
+  ( s = Var()
+  | iri = iri() { s = createNode(iri) ; }
+  | s = RDFLiteral()
+  | s = NumericLiteral()
+  | s = BooleanLiteral()
+  | s = BlankNode()
+  | s = ReifiedTriple(acc)
+  )
+  { return s; }
+}
+Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
+{
+  ( o = Var()
+  | iri = iri() { o = createNode(iri) ; }
+  | o = RDFLiteral()
+  | o = NumericLiteral()
+  | o = BooleanLiteral()
+  | o = BlankNode()
+  | o = ReifiedTriple(acc)
+  | o = TripleTerm()
+  )
+  { return o; }
+}
+Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
+{
+    openToken = <L_TRIPLE>
+    s = TripleTermSubject()
+    p = Verb()
+    o = TripleTermObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+Node TripleTermSubject() : { Node n; String iri; }
+{
+  ( n = Var()
+  | iri = iri() { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  )
   { return n; }
 }
-Node QuotedTripleData() : { Node n = null ; Token t ; String iri ; Node s , p , o ; }
+Node TripleTermObject() : { Node n; String iri; }
 {
-  t = <LT2>
-  ( s = DataValueTerm() )
-  ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
-  ( o = DataValueTerm() )
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+  ( n = Var()
+  | iri = iri() { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  | n = TripleTerm() { return n; }
+  )
   { return n; }
 }
-Node DataValueTerm() : { Node n = null ; String iri ; Node s , p , o ; }
+Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
-  iri = iri() { return createNode(iri) ; }
-| n = RDFLiteral() { return n ; }
-| n = NumericLiteral() { return n ; }
-| n = BooleanLiteral() { return n ; }
-| n = QuotedTripleData() { return n ; }
+    openToken = <L_TRIPLE>
+    s = TripleTermDataSubject()
+    ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
+    o = TripleTermDataObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+Node TripleTermDataSubject() : { Node n = null; String iri; }
+{
+ ( iri = iri() { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ )
+ { return n; }
+}
+Node TripleTermDataObject() : { Node n = null; String iri; }
+{
+ ( iri = iri() { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ | n = TripleTermData()
+ )
+ { return n; }
 }
 Node VarOrIri() : {Node n = null ; String iri ; }
 {
@@ -1401,27 +1539,38 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   | n = NumericLiteral() { return asExpr(n) ; }
   | n = BooleanLiteral() { return asExpr(n) ; }
   | n = Var() { return asExpr(n) ; }
-  | n = ExprQuotedTriple() { return asExpr(n) ; }
+  | n = ExprTripleTerm() { return asExpr(n) ; }
   )
 }
-Node ExprVarOrTerm() : { Node n; String s;}
+Node ExprTripleTerm() : { Token t ; Node s,p,o,n; }
+{
+  t = <L_TRIPLE>
+  s = ExprTripleTermSubject()
+  p = Verb()
+  o = ExprTripleTermObject()
+  { n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn); }
+  <R_TRIPLE>
+  { return n; }
+}
+Node ExprTripleTermSubject() : { Node n; String iri; }
 {
-  ( s = iri() { n = createNode(s); }
+  ( iri = iri() { n = createNode(iri); }
   | n = RDFLiteral()
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
-  | n = ExprQuotedTriple()
   )
   { return n; }
 }
-Node ExprQuotedTriple() : { Token t ; Node s,p,o,n; }
-{ t = <LT2>
-  s = ExprVarOrTerm()
-  p = Verb()
-  o = ExprVarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+Node ExprTripleTermObject() : { Node n; String iri; }
+{
+  ( iri = iri() { n = createNode(iri); }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = Var()
+  | n = ExprTripleTerm()
+  )
   { return n; }
 }
 Expr BrackettedExpression() : { Expr expr ; }
@@ -1441,6 +1590,8 @@ Expr BuiltInCall() : { Expr expr ;
   | <LANGMATCHES>
        <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_LangMatches(expr1, expr2) ; }
+  | <LANGDIR> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_LangDir(expr) ; }
   | <DTYPE> <LPAREN> expr = Expression() <RPAREN>
     { return new E_Datatype(expr) ; }
   | <BOUND> <LPAREN> gn = Var() <RPAREN>
@@ -1514,6 +1665,10 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_Conditional(expr, expr1, expr2) ; }
   | <STRLANG> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrLang(expr1, expr2) ; }
+  | <STRLANGDIR> <LPAREN> expr1 = Expression() <COMMA>
+                          expr2 = Expression() <COMMA>
+                          expr3 = Expression() <RPAREN>
+    { return new E_StrLangDir(expr1, expr2, expr3) ; }
   | <STRDT> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrDatatype(expr1, expr2) ; }
   | <SAME_TERM> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
@@ -1528,13 +1683,19 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_IsLiteral(expr) ; }
   | <IS_NUMERIC> <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsNumeric(expr) ; }
+  | <HAS_LANG> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLang(expr) ; }
+  | <HAS_LANGDIR> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLangDir(expr) ; }
   |
     expr = RegexExpression() { return expr ; }
   | expr = ExistsFunc() { return expr ; }
   | expr = NotExistsFunc() { return expr ; }
-| <IS_TRIPLE> <LPAREN> expr = Expression() <RPAREN>
+  | <IS_TRIPLE> <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsTriple(expr) ; }
-  | <TRIPLE> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <COMMA> expr3 = Expression() <RPAREN>
+  | <TRIPLE> <LPAREN> expr1 = Expression() <COMMA>
+                       expr2 = Expression() <COMMA>
+                       expr3 = Expression() <RPAREN>
     { return new E_TripleFn(expr1, expr2, expr3) ; }
   | <SUBJECT> <LPAREN> expr = Expression() <RPAREN>
     { return new E_TripleSubject(expr) ; }
@@ -1689,7 +1850,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
        return asExpr(createNode(iri)) ;
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -1697,16 +1858,17 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
     return new E_Function(iri, a) ;
   }
 }
-Node RDFLiteral() : { Token t ; String lex = null ; }
+Node RDFLiteral() : { Token t ; String lex = null ; String uri = null ; }
 {
   lex = String()
-  { String lang = null ; String uri = null ; }
   (
-    ( t = <LANGTAG> { lang = stripChars(t.image, 1) ; } )
+    t = <LANG_DIR>
+    { return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn); }
   |
-    ( <DATATYPE> uri = iri() )
+     <DATATYPE> uri = iri()
+     { return createLiteralDT(lex, uri, token.beginLine, token.beginColumn); }
   )?
-    { return createLiteral(lex, lang, uri) ; }
+  { return createLiteralString(lex, token.beginLine, token.beginColumn) ; }
 }
 Node NumericLiteral() : { Node n ; }
 {
@@ -1802,7 +1964,7 @@ TOKEN:
 | <BLANK_NODE_LABEL: "_:" (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS>|".")* <PN_CHARS>)? >
 | <VAR1: "?" <VARNAME> >
 | <VAR2: "$" <VARNAME> >
-| <LANGTAG: <AT> (<A2Z>)+("-" (<A2ZN>)+)* >
+| <LANG_DIR: <AT> (<A2Z>)+("-" (<A2ZN>)+)* ( "--" (<A2Z>)* )? >
 | <#A2Z: ["a"-"z","A"-"Z"]>
 | <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 }
@@ -1837,7 +1999,9 @@ TOKEN [IGNORE_CASE] :
 | < BIND: "bind" >
 | < SERVICE: "service" >
 | < LET: "LET" >
-| < LATERAL: "LATERAL" >
+| < LATERAL: "lateral" >
+| < SEMIJOIN: "semijoin" >
+| < ANTIJOIN: "antijoin" >
 | < UNFOLD: "unfold" >
 | < TRIPLE: "TRIPLE" >
 | < IS_TRIPLE: "isTRIPLE" >
@@ -1881,15 +2045,19 @@ TOKEN [IGNORE_CASE] :
 | < SHORTEST: "shortest" >
 | < STR: "str" >
 | < STRLANG: "strlang" >
+| < STRLANGDIR: "strlangdir" >
 | < STRDT: "strdt" >
 | < DTYPE: "datatype" >
 | < LANG: "lang" >
 | < LANGMATCHES: "langmatches" >
+| < LANGDIR: "langdir" >
 | < IS_URI: "isURI" >
 | < IS_IRI: "isIRI" >
 | < IS_BLANK: "isBlank" >
 | < IS_LITERAL: "isLiteral" >
 | < IS_NUMERIC: "isNumeric" >
+| < HAS_LANG: "hasLang" >
+| < HAS_LANGDIR: "hasLangDir" >
 | < REGEX: "regex" >
 | < SAME_TERM: "sameTerm" >
 | < RAND: "RAND" >
@@ -2014,12 +2182,14 @@ TOKEN :
 | < LT: "<" >
 | < LE: "<=" >
 | < GE: ">=" >
-| < GT2: ">>" >
+| < L_TRIPLE: "<<(" >
+| < R_TRIPLE: ")>>" >
 | < LT2: "<<" >
-| <L_ANN: "{|" >
-| <R_ANN: "|}" >
-| < BANG: "!" >
+| < GT2: ">>" >
+| < L_ANN: "{|" >
+| < R_ANN: "|}" >
 | < TILDE: "~" >
+| < BANG: "!" >
 | < COLON: ":" >
 | < SC_OR: "||" >
 | < SC_AND: "&&" >
diff --git a/jena-arq/Grammar/grammar b/jena-arq/Grammar/grammar
index 08e07f7783a..92696e0d1dd 100755
--- a/jena-arq/Grammar/grammar
+++ b/jena-arq/Grammar/grammar
@@ -42,6 +42,7 @@ function grammar
 
 ##     echo "---- Create HTML"
 ##     jjdoc -OUTPUT_FILE=${FILE%%.jj}.html "${FILE}"
+    
     echo "---- Create text form"
     jjdoc -TEXT=true -OUTPUT_FILE=${FILE%%.jj}.txt "${FILE}"
 
diff --git a/jena-arq/Grammar/jj2bnf b/jena-arq/Grammar/jj2bnf
new file mode 100755
index 00000000000..0403e6e7dcd
--- /dev/null
+++ b/jena-arq/Grammar/jj2bnf
@@ -0,0 +1,302 @@
+#!/usr/bin/perl
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+
+## TODO (2024)
+## [ ] Why does ruleBodyStr have a newline?
+
+## Consider rewriting, preserving the inlining.
+## Parse lines (and continuation lines). Fixup.
+
+# Grammar into BNF text
+# Reads in sparql.txt and the tokens.txt file
+
+if ( $#ARGV != 1 )
+{
+    print STDERR "Usage: grammar.txt tokens.txt\n" ;
+    exit 1 ;
+}
+
+$/ = undef ;
+# Just table or full page.
+
+$grammarFile = $ARGV[0] ;
+$tokensFile = $ARGV[1] ;
+
+$grammar = &readFile($grammarFile) ;
+$tokens = &readFile($tokensFile) ;
+
+$grammar =~ s!DOCUMENT START!! ;
+# $grammar =~ s!NON-TERMINALS!! ;
+$grammar =~ s!DOCUMENT END!! ;
+$grammar =~ s!TOKENS.*NON-TERMINALS!!s ;
+
+$grammar =~ s!//.*!!g ;
+$grammar =~ s!\r!!g ;
+
+# remove leading whitespace
+$grammar =~ s!^[\n\s]*!\n! ;
+
+# Merge alts
+$grammar =~ s!\n\s*\|!\ |!g ;
+
+$tokens =~ s!//.*!!g ;
+$tokens =~ s!\r!!g ;
+
+
+## Grammar
+
+@g = split(/\n\s*/, $grammar) ;
+
+@rules = () ;
+%ruleMap = () ;
+%tokenMap = () ;
+%inline = () ;
+
+# Grammar rules
+# Direct from "jjdoc -TEXT=true"
+
+for $g (@g) {
+    ($rulename, $rulebody) = split(/:=/,$g) ;
+
+    $rulename =~ s!^\s*!! ;
+    $rulename =~ s!\s*$!! ;
+
+    $rulebody =~ s!^\s*!! ;
+    $rulebody =~ s!\s*$!! ;
+    
+    # Remove outer brackets
+#    $rulebody =~ s!^\((.*)\)$!$1! ;
+
+    next if $rulename eq '' ;
+
+    push @rules, $rulename ;
+    warn "Duplicate rule (grammar): $rulename\n" if defined($ruleMap{$rulename}) ;
+    $ruleMap{$rulename} = $rulebody ;
+
+##     print "----------\n" ;
+##     print $rulename,"\n" ;
+##     print $rulebody,"\n" ;
+}
+
+# Tokens
+# Produced by "jj2tokens"
+# Hand edited to indicate the inlines
+
+$tokens =~ s/\n+/\n/g ;
+$tokens =~ s/^\n// ;
+
+@t = split(/\n(?=\<|\[)/, $tokens) ;
+
+for $t (@t) {
+    ($tokenname,$tokenbody) = split(/::=/, $t) ;
+    $tokenname =~ s!^\s*!! ;
+    $tokenname =~ s!\s*$!! ;
+    $tokenname =~ s/#// ;
+
+    $tokenbody =~ s!^\s*!! ;
+    $tokenbody =~ s!\s*$!! ;
+
+    # Inline?
+    if ( $tokenname =~ /^\[\<\w*\>\]/ ) {
+	warn "Duplicate inline (token): $tokenname\n" if defined($inline{$tokenname}) ;
+	$tokenname =~ s/^\[//g ;
+	$tokenname =~ s/\]$//g ;
+	$tokenbody =~ s/"/'/g ; # '" -- But not literal " -- how?
+        $tokenbody =~ s/\<\>\'\{\}/\<\>\"\{\}/ ; # '" IRI fixup
+	$inline{$tokenname} = $tokenbody ;
+
+	#print "INLINE: ",$tokenname," => ",$tokenbody,"\n" ;
+    } else {
+	## Remove < > aroudn a token name.
+	my $inlinePlain = $tokenname ;
+	$inlinePlain =~ s%^<%%;
+	$inlinePlain =~ s%>$%%;
+	$inline{$tokenname} = $inlinePlain ;
+	push @rules, $tokenname ;
+	warn "Duplicate rule (token): $tokenname\n" if defined($tokenMap{$tokenname}) ;
+	$ruleMap{$tokenname} = $tokenbody ; 
+    }
+}
+
+$ruleNum = 0 ;
+
+for $r (@rules) {
+    $DEBUG = 0 ;
+    $ruleNum++ ;
+    $rulename = $r ;
+    $rulebody = $ruleMap{$rulename} ;
+
+    if ( $DEBUG ) {
+	print STDERR "\n" ;
+	print STDERR "Rule: $rulename\n" ; 
+	print STDERR "Body: $rulebody\n" ; 
+    }
+
+    $ruleBodyStr = $rulebody ;
+##    # Escape HTML chars before adding markup.
+#    $ruleBodyStr = esc($ruleBodyStr) ;
+    
+    # Inlines
+    for $k (keys %inline) {
+## 	$s = esc($inline{$k}) ;
+## 	$k = esc($k) ;
+## 	# Assumes escaped <> round tokens.
+## 	$k = quotemeta $k ;
+## 	$ruleBodyStr =~ s/$k/$s/g ;
+
+	$s = $inline{$k};
+	$ruleBodyStr =~ s/$k/$s/g ;
+    }
+
+    if ( $DEBUG ) {
+	print STDERR "After inlining\n" ;
+	print STDERR $ruleBodyStr,"\n" ; ; 
+    }
+
+    # Add hrefs - issue if one is a substring of another \W helps.
+
+    #exit if $ruleNum > 2 ;
+
+    ##$ruleId = sane("r".$rulename) ;
+
+    if($rulename eq 'IRIREF') {
+	print "\n";
+	print "\@terminals\n";
+	print "\n" ;
+    }
+    ## First part of output.
+    ## $rlabel = '[' . $ruleNum .  ']' ;
+
+    $rn = $rulename;
+    $rn =~ s!^<!!; 
+    $rn =~ s!>$!!; 
+    ## Second part of output
+    
+    ## Third part of the output.
+    $ruleBodyStr = fixupRule($rulename, $ruleBodyStr) ;
+
+    ##Why no NL needed?
+    ## printf "%-5s  %-25s ::= %s\n", $rlabel, $rn, $ruleBodyStr ;
+    printf "%-25s ::= %s\n", $rn, $ruleBodyStr ;
+
+#    $rule{$rulename, $rulebody) ;
+#    print $rulename , "\n" ;
+}
+
+sub readFile {
+    my $f = $_[0] ;
+    open(F, "$f") || die "$f: $!"; 
+    my $s = <F> ;
+    return $s ;
+}
+
+sub esc {
+    my $s = $_[0] ;
+    $s =~ s/&/&amp;/g ; 
+    $s =~ s/</&lt;/g ; 
+    $s =~ s/>/&gt;/g ; 
+    return $s ;
+}
+
+sub sane {
+   my $a = $_[0] ;
+   $a =~ s/\W//g ;
+   return $a ;
+}
+
+sub fixupRule {
+    my $head = $_[0] ;
+    my $body = $_[1] ;
+
+    # Remove unnecessary ()
+    $body =~ s/\(\s*([^()| ]*) \)/$1/g ;
+
+    # Remove outer matching () where there are no inner ()
+    $body =~ s/^\(\s+([^\(]*)\s+\)$/$1/ ;
+
+    # There aren't any of these
+##    $body =~ s!\(\s+(\S*)\s+\)!$1!g ;
+
+    # Remove <> around tokens.
+    $body =~ s/&lt;(\w+)&gt;/$1/g ;
+
+    # Specials
+    # Split long bodies
+    if ( $head eq "CallExpression" ||
+	 $head eq "UnaryExpression" ||
+ 	 $head eq "<PN_CHARS_BASE>" ||
+ 	 $head eq "PatternElement" ||
+ 	 $head eq "BuiltInCall" ||
+	 $head eq "Aggregate" )
+    {
+	## Except BNODE, STRLEN etc
+	## [138]  	RegexExpression	  ::=  	'REGEX' '(' Expression ',' Expression ( ',' Expression )? ')'
+	## [139]  	SubstringExpression	  ::=  	'SUBSTR' '(' Expression ',' Expression ( ',' Expression )? ')'
+	## [140]  	StrReplaceExpression	  ::=  	'REPLACE' '(' Expression ',' Expression ',' Expression ( ',' Expression )? ')'
+	## [141]  	ExistsFunc	  ::=  	'EXISTS' GroupGraphPattern
+	## [142]  	NotExistsFunc	  ::=  	'NOT' 'EXISTS' GroupGraphPattern
+	##        | 'BNODE' ( '(' Expression ')' | <NIL> )
+
+	print STDERR "A:",$body,"\n" if $p ;
+
+	## Fix up for BNODE that uses "|" - put in marker.
+	$body =~ s%'BNODE' \( '\(' Expression '\)' \| \<NIL\> \)%XXX-BNODE-XXX%;
+
+	## | followed by <NIL>
+	$body =~ s%\|\s*%\n                          |   %g ;
+	
+	## Replace marker
+	$body =~ s%XXX-BNODE-XXX%'BNODE' \( '(' Expression ')' \| \<NIL\> \)%;
+    }
+
+     if ( $head eq "Aggregate" )
+     {
+	 # Strip outer ()
+	 $body =~ s/^\(\s*(.*)\s*\)$/$1/ ;	
+ 	 $body =~ s/^\s+// ;
+     }
+
+    # These failed the outer () test because they have nested () in them
+    if (  $head eq "QueryPattern" ||
+          $head eq "OrderCondition" )
+    {
+	# Remove outer ()
+	$body =~ s/^\((.*)\)$/$1/ ;	
+    }
+
+    ## Split?
+##     if (  $head eq "Query" )
+##     {
+##     }
+
+    #Rules where an outer () is unnecessary.
+    if ( $head eq "GroupCondition" ||
+	 $head eq "LimitOffsetClauses" ||
+	 $head eq "GraphOrDefault" ||
+	 $head eq "ArgList" ||
+	 $head eq "ExpressionList" ||
+	 $head eq "PathPrimary" ||
+	 $head eq "PathMod" ||
+	 $head eq "PathPrimary" ||
+	 $head eq "PathNegatedPropertySet" || 
+	 $head eq "PathOneInPropertySet")
+    {
+	$body =~ s/^\(\s*(.*)\s*\)$/$1/ ;	
+    }
+
+    return $body ;
+}
diff --git a/jena-arq/Grammar/main.jj b/jena-arq/Grammar/main.jj
index 9f14ca63300..928d7d94cad 100644
--- a/jena-arq/Grammar/main.jj
+++ b/jena-arq/Grammar/main.jj
@@ -216,10 +216,6 @@ void SelectClause() : {  Var v ; Expr expr ; Node n ; }
       | n = NumericLiteral()        { getQuery().addResultVar((Var)null, NodeValue.makeNode(n)) ; }
       | n = BooleanLiteral()        { getQuery().addResultVar((Var)null, NodeValue.makeNode(n)) ; }
       )
-      // @@ PROBLEMS: expr = FunctionCall()
-      // <uri>(?x)
-      // looks like a function call and also a "<uri> ( ?v )"
-      //| expr = FunctionCall()  { getQuery().addResultVar((Var)null, expr) ; }
     |
 #endif      
         // Expressions with ()
@@ -894,21 +890,35 @@ Element TriplesBlock(ElementPathBlock acc) : { }
     { return acc ; }
 }
 
+Node ReifiedTripleBlock(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyList(reifId, acc)   // Maybe empty
+  { return reifId ; }
+}
+
+Node ReifiedTripleBlockPath(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyListPath(reifId, acc)   // Maybe empty
+  { return reifId ; }
+}
+
 // -----
 
 Element GraphPatternNotTriples() : { Element el = null ; }
 {
  (
-//    el = GroupGraphPattern()
-//  |
-//    el = UnionGraphPattern()
-//  |
    el = GroupOrUnionGraphPattern()
  |
    el = OptionalGraphPattern()
 #ifdef ARQ
  |
    el = LateralGraphPattern()
+ |
+   el = SemiJoinGraphPattern()
+ |
+   el = AntiJoinGraphPattern()
 #endif
  |
    el = MinusGraphPattern()
@@ -948,6 +958,16 @@ Element LateralGraphPattern() : { Element el ; }
 { <LATERAL> el = GroupGraphPattern()
     { return new ElementLateral(el) ; }
 }
+
+Element SemiJoinGraphPattern() : { Element el ; }
+{ <SEMIJOIN> el = GroupGraphPattern()
+    { return new ElementSemiJoin(el) ; }
+}
+
+Element AntiJoinGraphPattern() : { Element el ; }
+{ <ANTIJOIN> el = GroupGraphPattern()
+    { return new ElementAntiJoin(el) ; }
+}
 #endif
 
 Element GraphGraphPattern() : { Element el ; Node n ;}
@@ -1046,8 +1066,49 @@ Node DataBlockValue() : { Node n ; String iri ; }
 | n = NumericLiteral()  { return n ; }
 | n = BooleanLiteral()  { return n ; }
 | <UNDEF>               { return null ; }
-| n = QuotedTripleData()      { return n ; }
+| n = TripleTermData()  { return n ; }
+
+}
+
+// ---- Reifier, various cases.
+// May return null.
+
+Node Reifier() : { Token tok = null ; Node reifId = null ; }
+{
+    tok = <TILDE>
+    (reifId = VarOrReifierId() )?
+    { return reifId; }
+}
+
+// // No variables.
+// Node ReifierData() : { Token tok = null ; Node reifId = null ; }
+// {
+//     tok = <TILDE>
+//     (reifId = ReifierId() )?
+//     { return reifId; }
+// }
+// 
+// Node ReifierId() : { Node n = null ; String iri ; } 
+// {
+//   // No variable
+//   ( iri = iri()           { return createNode(iri) ; }
+//   | n = BlankNode()       { return n ; }
+//   )
+// }
+// 
+// Node VarOrReifierId() : { Node n = null; }
+// {
+//    ( n = Var()        { return n; }
+//    | n = ReifierId()  { return n; }
+//    )
+// }
 
+Node VarOrReifierId() : { Node n = null; String iri = null; }
+{
+   ( n = Var()        { return n; }
+   | iri = iri()      { return createNode(iri) ; }
+   | n = BlankNode()  { return n ; }
+   )
 }
 
 #ifdef ARQ
@@ -1152,7 +1213,7 @@ Expr FunctionCall() : { String fname ; Args a ; }
      if ( AggregateRegistry.isRegistered(fname) ) {
          // aggregates
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -1195,8 +1256,6 @@ ExprList ExpressionList() : { Expr expr = null ; ExprList exprList = new ExprLis
   { return exprList ; }
 }
 
-
-
 // -------- Construct patterns
 #ifdef ARQ
 Template ConstructTemplate() : { QuadAcc acc = new QuadAcc() ;
@@ -1251,6 +1310,8 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
   s = TriplesNode(tempAcc)
   PropertyList(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlock(acc)
 }
 
 void PropertyList(Node s, TripleCollector acc) : { }
@@ -1289,7 +1350,7 @@ void Object(Node s, Node p, Path path, TripleCollector acc): { Node o ; }
 {
   { ElementPathBlock tempAcc = new ElementPathBlock() ; int mark = tempAcc.mark() ; }
   o = GraphNode(tempAcc) 
-  { insert(tempAcc, mark, s, p, path, o) ;  insert(acc, tempAcc) ; }
+  { insert(tempAcc, mark, s, p, path, o) ; insert(acc, tempAcc) ; }
   Annotation(acc, s, p, path, o)
 }
 
@@ -1306,6 +1367,8 @@ void TriplesSameSubjectPath(TripleCollector acc) : { Node s ; }
   s = TriplesNodePath(tempAcc)
   PropertyListPath(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlockPath(acc)
 }
 
 void PropertyListPath(Node s, TripleCollector acc) : { }
@@ -1328,12 +1391,8 @@ void PropertyListPathNotEmpty(Node s, TripleCollector acc) :
       | p = VerbSimple()
       )
       ObjectListPath(s, p, path, acc)
-    )? 
+    )?
   )*
-#if 0
-  |
-  Reification(s, acc)
-#endif
 }
 
 Path VerbPath() : {Node p ; Path path ; }
@@ -1349,7 +1408,7 @@ Node VerbSimple() : { Node p ; }
   { return p ; }
 }
 
-void ObjectListPath(Node s,  Node p, Path path, TripleCollector acc): { Node o ; } 
+void ObjectListPath(Node s, Node p, Path path, TripleCollector acc): { Node o ; } 
 {
   ObjectPath(s, p, path, acc)
   ( <COMMA> ObjectPath(s, p, path, acc) )*
@@ -1461,6 +1520,16 @@ Path PathMod(Path p) : { long i1 ; long i2 ; }
    )
 }
 
+#ifdef ARQ
+long Integer() : {Token t ;}
+{
+    t = <INTEGER> 
+    { return integerValue(t.image) ; }
+}
+#endif
+
+
+
 Path PathPrimary() : { String str ; Path p ; Node n ; }
 {
   ( 
@@ -1518,12 +1587,6 @@ P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
   )
 }
 
-long Integer() : {Token t ;}
-{
-    t = <INTEGER> 
-    { return integerValue(t.image) ; }
-}
-
 // -------- Triple expansions
 
 // Anything that can stand in a node slot and which is
@@ -1531,13 +1594,9 @@ long Integer() : {Token t ;}
 
 Node TriplesNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = Collection(acc) { return n ; }
- |
-  n = BlankNodePropertyList(acc) { return n ; }
-#if 0
+   n = Collection(acc) { return n ; }
  |
-  n = Reification(null, acc) { return n ; }
-#endif
+   n = BlankNodePropertyList(acc) { return n ; }
 }
 
 Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
@@ -1551,13 +1610,9 @@ Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
 
 Node TriplesNodePath(TripleCollectorMark acc) : { Node n ; }
 {
-  n = CollectionPath(acc) { return n ; }
- |
-  n = BlankNodePropertyListPath(acc) { return n ; }
-#if 0
+   n = CollectionPath(acc) { return n ; }
  |
-  n = Reification(null, acc) { return n ; }
-#endif
+   n = BlankNodePropertyListPath(acc) { return n ; }
 }
 
 Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
@@ -1569,32 +1624,6 @@ Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
     { return n ; }
 }
 
-// << >> as reification. Allows any subject/predicate/object nodes.
-#if 0
-Node Reification(Node id, TripleCollectorMark acc) : 
-    { Node s , p , o ; int mark ; Token t ; }
-{
-  // Insert reification triple before the resulting subtriples (if any)
-  t = <LT2>
-    { int beginLine = t.beginLine; int beginColumn = t.beginColumn; t = null; }
-    { if ( id == null )
-        id = createBNode(beginLine, beginColumn() ;
-      mark = acc.mark() ; }
-  s = GraphNode(acc)
-    { insert(acc, mark, id, nRDFsubject, s) ;
-      mark = acc.mark() ; 
-    }
-  p = GraphNode(acc)
-    { insert(acc, mark, id, nRDFpredicate, p) ;
-      mark = acc.mark() ;
-    }
-  o = GraphNode(acc)
-    { insert(acc, mark, id, nRDFobject, o) ; }
-  <GT2>
-    { return id ; }
-}
-#endif
-
 // ------- RDF collections
 
 Node Collection(TripleCollectorMark acc) : 
@@ -1649,95 +1678,229 @@ Node CollectionPath(TripleCollectorMark acc) :
      return listHead ; }
 }
 
-// RDF-star Annotation Syntax
-void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : {}
+// ---- RDF-star Annotation Syntax
+// Allow paths. Query graph patterns.
+void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, pAnn, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListPathNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlockPath(acc, reifId)
+  )*
+  { clearReifierId(); }
 }
 
-// RDF-star Annotation Syntax
-void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { }
+void AnnotationBlockPath(TripleCollector acc, Node reifId) : { }
+{
+   <L_ANN>
+      PropertyListPathNotEmpty(reifId, acc)
+   <R_ANN>
+}
+
+// ---- RDF-star Annotation Syntax
+// No paths. Construct templates.
+void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
-  // path should be null.
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    // @@ Rewrite java?
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }    
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlock(acc, reifId)
+  )*
+}
+
+void AnnotationBlock(TripleCollector acc, Node reifId) : { }
+{
+   // Roll back into Annotation?
+   <L_ANN>
+      PropertyListNotEmpty(reifId, acc)
+   <R_ANN>
 }
 
 // -------- Nodes in a graph pattern or template
 
+// Object position RDF term, element of a list
+// No paths in TriplesNode
 Node GraphNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = VarOrTerm() { return n ; }
+   n = VarOrTerm() { return n ; }
+ |
+   n = TriplesNode(acc) { return n ; }
  |
-  n = TriplesNode(acc) { return n ; }
+   n = ReifiedTriple(acc)  { return n ; }
 }
 
+// Object position RDF term. NEW-SYNTAX Rename?
 Node GraphNodePath(TripleCollectorMark acc) : { Node n ; }
 {
   n = VarOrTerm() { return n ; }
- |
+|
   n = TriplesNodePath(acc) { return n ; }
+|
+  n = ReifiedTriple(acc)  { return n ; }
 }
 
 Node VarOrTerm() : { Node n = null ; String iri ; }
 {
   ( n = Var()
   | iri = iri()           { return createNode(iri) ; }
-  | n = RDFLiteral()      { return n ; }
-  | n = NumericLiteral()  { return n ; }
-  | n = BooleanLiteral()  { return n ; }
-  | n = BlankNode()       { return n ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
   //  <LPAREN> <RPAREN>     { return nRDFnil ; }
   | <NIL>  { return nRDFnil ; }
-  | n = QuotedTriple()
-)
-  { return n ; }
+  | n = TripleTerm()      { return n; }
+  )
+  { return n; }
 }
 
-Node QuotedTriple() :  { Node n = null ; Token t ; Node s , p , o ; }
+Node ReifiedTriple(TripleCollector acc) :  { Node reifId = null ; Token tok ; Node s; Node p ; Node o ; }
 {
-  t = <LT2>
-  s = VarOrTerm()
+  tok = <LT2>
+  s = ReifiedTripleSubject(acc)
   p = Verb()
-  o = VarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
+  o = ReifiedTripleObject(acc)
+  (reifId = Reifier())?
+  { reifId = insertTripleReifier(acc, reifId, s, p, o, tok.beginLine, tok.beginColumn) ; }    
   <GT2>
+  { return reifId; }
+}
+
+Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
+{
+  ( s = Var()
+  | iri = iri()           { s = createNode(iri) ; }
+  | s = RDFLiteral()
+  | s = NumericLiteral()
+  | s = BooleanLiteral()
+  | s = BlankNode()
+  | s = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { s = RDFnil ; }
+  //| <NIL>  { s = nRDFnil ; }
+  )
+  { return s; }
+}
+
+Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
+{
+  ( o = Var()
+  | iri = iri()           { o = createNode(iri) ; }
+  | o = RDFLiteral()
+  | o = NumericLiteral()
+  | o = BooleanLiteral()
+  | o = BlankNode()
+  | o = ReifiedTriple(acc)
+  //  <LPAREN> <RPAREN>     { o = nRDFnil ; }
+  //| <NIL>  { o = nRDFnil ; }
+  | o = TripleTerm()
+  )
+  { return o; }
+}
+
+Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
+{
+    openToken = <L_TRIPLE>
+    // @@ Alt name. ttSubject()?
+    s = TripleTermSubject()
+    p = Verb()
+    o = TripleTermObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+
+Node TripleTermSubject() : { Node n; String iri; }
+{
+  ( n = Var()
+  | iri = iri()           { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
+  //| n = TripleTerm()      { return n; }
+  )
   { return n; }
 }
 
-Node QuotedTripleData() :  { Node n = null ; Token t ; String iri ; Node s , p , o ; }
+Node TripleTermObject() : { Node n; String iri; }
 {
-  t = <LT2>
-  ( s = DataValueTerm() )
-  ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
-  ( o = DataValueTerm() )
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+  ( n = Var()
+  | iri = iri()           { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  //  <LPAREN> <RPAREN>     { return nRDFnil ; }
+  //| <NIL>  { return nRDFnil ; }
+  | n = TripleTerm()      { return n; }
+  )
   { return n; }
 }
 
-Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+Node TripleTermData() :  { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
-  iri = iri()           { return createNode(iri) ; }
-| n = RDFLiteral()      { return n ; }
-| n = NumericLiteral()  { return n ; }
-| n = BooleanLiteral()  { return n ; }
-| n = QuotedTripleData()  { return n ; }
+    openToken = <L_TRIPLE>
+    // @@ Alt name? ttDataValueTerm
+    s = TripleTermDataSubject()
+    ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
+    o = TripleTermDataObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+
+Node TripleTermDataSubject() : { Node n = null; String iri; }
+{
+ ( iri = iri()            { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ //| n = TripleTermData()
+ )
+ { return n; }
 }
 
+Node TripleTermDataObject() : { Node n = null; String iri; }
+{
+ ( iri = iri()            { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ | n = TripleTermData()
+ )
+ { return n; }
+}
+
+// // VarOrTerm except no var, no bnodes
+// // @@ Rename?
+// Node DataValueTerm() : {  Node n = null ; String iri ; Node s , p , o ; }
+// {
+//   iri = iri()            { return createNode(iri) ; }
+// | n = RDFLiteral()       { return n ; }
+// | n = NumericLiteral()   { return n ; }
+// | n = BooleanLiteral()   { return n ; }
+// | n = TripleTermData()   { return n; }
+// }
+
 // e.g. Property (if no bNodes) + DESCRIBE
 Node VarOrIri() : {Node n = null ; String iri ; }
 {
@@ -1893,15 +2056,14 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   ( expr = BrackettedExpression() { return expr ; }
   | expr = BuiltInCall()   { return expr ; }  
   | expr = iriOrFunction() { return expr ; }
-// NOT  | n = VarOrTerm()    { return asExpr(n) ; }
+// NOT  | n = ExprVarOrTerm()    { return asExpr(n) ; }
 // Because of iriOrFunction
 // Can't use iri() here
   | n = RDFLiteral()      { return asExpr(n) ; }
   | n = NumericLiteral()  { return asExpr(n) ; }
   | n = BooleanLiteral()  { return asExpr(n) ; }
   | n = Var()             { return asExpr(n) ; }
-  | n = ExprQuotedTriple()  { return asExpr(n) ; }
-
+  | n = ExprTripleTerm()  { return asExpr(n) ; }
 // and not SPARQL 12
 // needs checking.
 // Use this for ?var(args)
@@ -1909,28 +2071,56 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   )
 }
 
-Node ExprVarOrTerm() : { Node n; String s;}
+// Node ExprVarOrTerm() : { Node n; String s;}
+// {
+//   ( s = iri() { n = createNode(s); }
+//   | n = RDFLiteral()
+//   | n = NumericLiteral()
+//   | n = BooleanLiteral()
+//   | n = Var()
+//   | n = ExprTripleTerm()
+//   )
+//   { return n; }
+// }
+
+Node ExprTripleTerm() : { Token t ; Node s,p,o,n; }
 {
-  ( s = iri() { n = createNode(s); }
+  t = <L_TRIPLE>
+  s = ExprTripleTermSubject()
+  p = Verb()
+  o = ExprTripleTermObject()
+  { n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn); }
+  <R_TRIPLE>
+  { return n; }
+}
+
+Node ExprTripleTermSubject() : { Node n; String iri; }
+{
+  ( iri = iri() { n = createNode(iri); }
   | n = RDFLiteral()
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
-  | n = ExprQuotedTriple()
+  //| n = ExprTripleTerm()
   )
   { return n; }
 }
 
-Node ExprQuotedTriple() : { Token t ; Node s,p,o,n; }
-{ t = <LT2>
-  s = ExprVarOrTerm()
-  p = Verb()
-  o = ExprVarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+Node ExprTripleTermObject() : { Node n; String iri; }
+{
+  ( iri = iri() { n = createNode(iri); }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = Var()
+  | n = ExprTripleTerm()
+  )
   { return n; }
 }
 
+
+
+
 Expr BrackettedExpression() : { Expr expr ; }
 {
     <LPAREN> expr = Expression() <RPAREN>  { return expr ; }
@@ -1944,6 +2134,7 @@ Expr BuiltInCall() : { Expr expr ;
   |
     <STR> <LPAREN> expr = Expression() <RPAREN>
     { return new E_Str(expr) ; }
+    
   | <LANG> <LPAREN> expr = Expression() <RPAREN>
     { return new E_Lang(expr) ; }
 
@@ -1951,6 +2142,9 @@ Expr BuiltInCall() : { Expr expr ;
        <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_LangMatches(expr1, expr2) ; }
 
+  | <LANGDIR>  <LPAREN> expr = Expression() <RPAREN>
+    { return new E_LangDir(expr) ; }
+
   | <DTYPE> <LPAREN> expr = Expression() <RPAREN>
     { return new E_Datatype(expr) ; }
 
@@ -2094,6 +2288,11 @@ Expr BuiltInCall() : { Expr expr ;
   | <STRLANG> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrLang(expr1, expr2) ; }
 
+  | <STRLANGDIR> <LPAREN> expr1 = Expression() <COMMA>
+                          expr2 = Expression() <COMMA>
+                          expr3 = Expression() <RPAREN>
+    { return new E_StrLangDir(expr1, expr2, expr3) ; }
+
   | <STRDT> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrDatatype(expr1, expr2) ; }
 
@@ -2114,6 +2313,13 @@ Expr BuiltInCall() : { Expr expr ;
 
   | <IS_NUMERIC> <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsNumeric(expr) ; }
+
+  | <HAS_LANG>    <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLang(expr) ; }
+    
+  | <HAS_LANGDIR> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLangDir(expr) ; }
+    
   | // Regular expression matcher
     expr = RegexExpression() { return expr ; }
 
@@ -2121,10 +2327,12 @@ Expr BuiltInCall() : { Expr expr ;
 
   | expr = NotExistsFunc()   { return expr ; }
 
-| <IS_TRIPLE>  <LPAREN> expr = Expression() <RPAREN>
+  | <IS_TRIPLE>  <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsTriple(expr) ; }
 
-  | <TRIPLE>  <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <COMMA> expr3 = Expression() <RPAREN>
+  | <TRIPLE>  <LPAREN> expr1 = Expression() <COMMA>
+                       expr2 = Expression() <COMMA>
+                       expr3 = Expression() <RPAREN>
     { return new E_TripleFn(expr1, expr2, expr3) ; }
 
   | <SUBJECT>  <LPAREN> expr = Expression() <RPAREN>
@@ -2327,7 +2535,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
     if ( AggregateRegistry.isRegistered(iri) ) {
          // aggregates
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -2351,17 +2559,18 @@ Expr VarOrFunction() : { Var v ; ExprList a = null ; }
 #endif
 
 
-Node RDFLiteral() : { Token t ; String lex = null ; }
+Node RDFLiteral() : { Token t ; String lex = null ; String uri = null ; }
 {
   lex = String()
   // Optional lang tag and datatype.
-  { String lang = null ; String uri = null ; }
   (
-    ( t = <LANGTAG>  { lang = stripChars(t.image, 1) ; } )
+    t = <LANG_DIR>
+    { return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn); }
   |
-    ( <DATATYPE> uri = iri() )
+     <DATATYPE> uri = iri()
+     { return createLiteralDT(lex, uri, token.beginLine, token.beginColumn); }
   )?
-    { return createLiteral(lex, lang, uri) ; }
+  { return createLiteralString(lex, token.beginLine, token.beginColumn) ; }
 } 
 
 
@@ -2501,7 +2710,7 @@ TOKEN:
 |  <BLANK_NODE_LABEL: "_:" (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS>|".")* <PN_CHARS>)?  >
 |  <VAR1: "?" <VARNAME> >
 |  <VAR2: "$" <VARNAME> >
-|  <LANGTAG: <AT> (<A2Z>)+("-" (<A2ZN>)+)* >
+|  <LANG_DIR: <AT> (<A2Z>)+("-" (<A2ZN>)+)* ( "--" (<A2Z>)* )? >
 |  <#A2Z: ["a"-"z","A"-"Z"]>
 |  <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 }
@@ -2556,7 +2765,9 @@ TOKEN [IGNORE_CASE] :
 
 #ifdef ARQ
 |  < LET:         "LET" >
-|  < LATERAL:     "LATERAL" >
+|  < LATERAL:     "lateral" >
+|  < SEMIJOIN:    "semijoin" >
+|  < ANTIJOIN:    "antijoin" >
 |  < UNFOLD:      "unfold" >
 #endif
 
@@ -2615,15 +2826,20 @@ TOKEN [IGNORE_CASE] :
 
 |  < STR:         "str" >
 |  < STRLANG:     "strlang" >
+|  < STRLANGDIR:  "strlangdir" >
+
 |  < STRDT:       "strdt" >
 |  < DTYPE:       "datatype" >
 |  < LANG:        "lang" >
 |  < LANGMATCHES: "langmatches" >
+|  < LANGDIR:     "langdir" >
 |  < IS_URI:      "isURI" >
 |  < IS_IRI:      "isIRI" >
 |  < IS_BLANK:    "isBlank" >
 |  < IS_LITERAL:  "isLiteral" >
 |  < IS_NUMERIC:  "isNumeric" >
+|  < HAS_LANG:    "hasLang" >   
+|  < HAS_LANGDIR: "hasLangDir" >   
 |  < REGEX:       "regex" >
 |  < SAME_TERM:   "sameTerm" >
 
@@ -2796,13 +3012,15 @@ TOKEN :
 | < LE:      "<=" >    // Maybe: | "=>" >
 | < GE:      ">=" >    // Maybe: | "=<" >
 
-| < GT2:     ">>" >
+| < L_TRIPLE: "<<(" >
+| < R_TRIPLE: ")>>" >
 | < LT2:     "<<" >
-| <L_ANN:    "{|" >
-| <R_ANN:    "|}" >
+| < GT2:     ">>" >
+| < L_ANN:    "{|" >
+| < R_ANN:    "|}" >
 
-| < BANG:    "!" >
 | < TILDE:   "~" >
+| < BANG:    "!" >
 | < COLON:   ":" >
 
 | < SC_OR:   "||" >
diff --git a/jena-arq/Grammar/sparql2bnf b/jena-arq/Grammar/sparql2bnf
new file mode 100755
index 00000000000..74b1b9034db
--- /dev/null
+++ b/jena-arq/Grammar/sparql2bnf
@@ -0,0 +1,7 @@
+#!/usr/bin/bash
+## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
+echo "Grammar to sparql.bnf (text)"
+
+(
+    jj2bnf 'sparql_12.txt' 'tokens.txt'
+) > sparql.bnf
diff --git a/jena-arq/Grammar/sparql2html b/jena-arq/Grammar/sparql2html
index 19320cd406a..e2d449bf978 100755
--- a/jena-arq/Grammar/sparql2html
+++ b/jena-arq/Grammar/sparql2html
@@ -1,13 +1,21 @@
+#!/usr/bin/bash
 ## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-echo "Grammar to X.html, fragments file to Y.html"
+echo "Grammar output in sparql-grammar.html"
 
 ##jj2html 'sparql_11.txt' 'tokens.txt' > X11.html
 ##grammarExtracts < X11.html > Y11.html
 
-jj2html 'sparql_12.txt' 'tokens.txt' > X12.html
-grammarExtracts < X12.html > Y12.html
+(
+    echo "        <!-- GRAMMAR -->"
+    jj2html 'sparql_12.txt' 'tokens.txt'
+    echo "        <!-- GRAMMAR -->"
+) > sparql-grammar.html
+
+## Produce a standlone web page
+## mv sparql-grammar.html X12.hmtl
+## grammarExtracts < sparql-grammar.html > sparql-html.thml
 
 ## jj2html 'arq_12.txt' 'tokens.txt' > X.html
 ## grammarExtracts < X.html > Y.html
 
-echo "Check X and Y for IRI_REF because \" became '"
\ No newline at end of file
+##?? echo "Check X and Y for IRI_REF because \" became '"
diff --git a/jena-arq/Grammar/sparql_12.jj b/jena-arq/Grammar/sparql_12.jj
index 0073d7880b8..8154839f003 100644
--- a/jena-arq/Grammar/sparql_12.jj
+++ b/jena-arq/Grammar/sparql_12.jj
@@ -525,6 +525,18 @@ Element TriplesBlock(ElementPathBlock acc) : { }
   ( <DOT> (TriplesBlock(acc))? )?
     { return acc ; }
 }
+Node ReifiedTripleBlock(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyList(reifId, acc)
+  { return reifId ; }
+}
+Node ReifiedTripleBlockPath(TripleCollector acc) : { Node reifId ; }
+{
+  reifId = ReifiedTriple(acc)
+  PropertyListPath(reifId, acc)
+  { return reifId ; }
+}
 Element GraphPatternNotTriples() : { Element el = null ; }
 {
  (
@@ -639,7 +651,20 @@ Node DataBlockValue() : { Node n ; String iri ; }
 | n = NumericLiteral() { return n ; }
 | n = BooleanLiteral() { return n ; }
 | <UNDEF> { return null ; }
-| n = QuotedTripleData() { return n ; }
+| n = TripleTermData() { return n ; }
+}
+Node Reifier() : { Token tok = null ; Node reifId = null ; }
+{
+    tok = <TILDE>
+    (reifId = VarOrReifierId() )?
+    { return reifId; }
+}
+Node VarOrReifierId() : { Node n = null; String iri = null; }
+{
+   ( n = Var() { return n; }
+   | iri = iri() { return createNode(iri) ; }
+   | n = BlankNode() { return n ; }
+   )
 }
 Element MinusGraphPattern() : { Element el ; }
 {
@@ -683,7 +708,7 @@ Expr FunctionCall() : { String fname ; Args a ; }
   {
      if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -747,6 +772,8 @@ void TriplesSameSubject(TripleCollector acc) : { Node s ; }
   s = TriplesNode(tempAcc)
   PropertyList(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlock(acc)
 }
 void PropertyList(Node s, TripleCollector acc) : { }
 {
@@ -790,6 +817,8 @@ void TriplesSameSubjectPath(TripleCollector acc) : { Node s ; }
   s = TriplesNodePath(tempAcc)
   PropertyListPath(s, tempAcc)
   { insert(acc, tempAcc) ; }
+|
+  ReifiedTripleBlockPath(acc)
 }
 void PropertyListPath(Node s, TripleCollector acc) : { }
 {
@@ -911,16 +940,11 @@ P_Path0 PathOneInPropertySet() : { String str ; Node n ; }
     )
   )
 }
-long Integer() : {Token t ;}
-{
-    t = <INTEGER>
-    { return integerValue(t.image) ; }
-}
 Node TriplesNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = Collection(acc) { return n ; }
+   n = Collection(acc) { return n ; }
  |
-  n = BlankNodePropertyList(acc) { return n ; }
+   n = BlankNodePropertyList(acc) { return n ; }
 }
 Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
 {
@@ -932,9 +956,9 @@ Node BlankNodePropertyList(TripleCollector acc) : { Token t ; }
 }
 Node TriplesNodePath(TripleCollectorMark acc) : { Node n ; }
 {
-  n = CollectionPath(acc) { return n ; }
+   n = CollectionPath(acc) { return n ; }
  |
-  n = BlankNodePropertyListPath(acc) { return n ; }
+   n = BlankNodePropertyListPath(acc) { return n ; }
 }
 Node BlankNodePropertyListPath(TripleCollector acc) : { Token t ; }
 {
@@ -992,80 +1016,177 @@ Node CollectionPath(TripleCollectorMark acc) :
        insert(acc, lastCell, nRDFrest, nRDFnil) ;
      return listHead ; }
 }
-void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : {}
+void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, pAnn, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListPathNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlockPath(acc, reifId)
+  )*
+  { clearReifierId(); }
+}
+void AnnotationBlockPath(TripleCollector acc, Node reifId) : { }
+{
+   <L_ANN>
+      PropertyListPathNotEmpty(reifId, acc)
+   <R_ANN>
 }
-void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { }
+void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) : { Node reifId = null ; }
 {
   (
-    <L_ANN>
-      { Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      }
-      PropertyListNotEmpty(x, acc)
-    <R_ANN>
-  )?
+    { p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn); }
+    reifId = Reifier()
+    { reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ; }
+    { setReifierId(reifId); }
+  |
+    {
+      p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+    }
+    { clearReifierId(); }
+    AnnotationBlock(acc, reifId)
+  )*
+}
+void AnnotationBlock(TripleCollector acc, Node reifId) : { }
+{
+   <L_ANN>
+      PropertyListNotEmpty(reifId, acc)
+   <R_ANN>
 }
 Node GraphNode(TripleCollectorMark acc) : { Node n ; }
 {
-  n = VarOrTerm() { return n ; }
+   n = VarOrTerm() { return n ; }
+ |
+   n = TriplesNode(acc) { return n ; }
  |
-  n = TriplesNode(acc) { return n ; }
+   n = ReifiedTriple(acc) { return n ; }
 }
 Node GraphNodePath(TripleCollectorMark acc) : { Node n ; }
 {
   n = VarOrTerm() { return n ; }
- |
+|
   n = TriplesNodePath(acc) { return n ; }
+|
+  n = ReifiedTriple(acc) { return n ; }
 }
 Node VarOrTerm() : { Node n = null ; String iri ; }
 {
   ( n = Var()
   | iri = iri() { return createNode(iri) ; }
-  | n = RDFLiteral() { return n ; }
-  | n = NumericLiteral() { return n ; }
-  | n = BooleanLiteral() { return n ; }
-  | n = BlankNode() { return n ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
   | <NIL> { return nRDFnil ; }
-  | n = QuotedTriple()
-)
-  { return n ; }
+  | n = TripleTerm() { return n; }
+  )
+  { return n; }
 }
-Node QuotedTriple() : { Node n = null ; Token t ; Node s , p , o ; }
+Node ReifiedTriple(TripleCollector acc) : { Node reifId = null ; Token tok ; Node s; Node p ; Node o ; }
 {
-  t = <LT2>
-  s = VarOrTerm()
+  tok = <LT2>
+  s = ReifiedTripleSubject(acc)
   p = Verb()
-  o = VarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
+  o = ReifiedTripleObject(acc)
+  (reifId = Reifier())?
+  { reifId = insertTripleReifier(acc, reifId, s, p, o, tok.beginLine, tok.beginColumn) ; }
   <GT2>
+  { return reifId; }
+}
+Node ReifiedTripleSubject(TripleCollector acc) : { Node s; String iri; }
+{
+  ( s = Var()
+  | iri = iri() { s = createNode(iri) ; }
+  | s = RDFLiteral()
+  | s = NumericLiteral()
+  | s = BooleanLiteral()
+  | s = BlankNode()
+  | s = ReifiedTriple(acc)
+  )
+  { return s; }
+}
+Node ReifiedTripleObject(TripleCollector acc) : { Node o; String iri; }
+{
+  ( o = Var()
+  | iri = iri() { o = createNode(iri) ; }
+  | o = RDFLiteral()
+  | o = NumericLiteral()
+  | o = BooleanLiteral()
+  | o = BlankNode()
+  | o = ReifiedTriple(acc)
+  | o = TripleTerm()
+  )
+  { return o; }
+}
+Node TripleTerm() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
+{
+    openToken = <L_TRIPLE>
+    s = TripleTermSubject()
+    p = Verb()
+    o = TripleTermObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+Node TripleTermSubject() : { Node n; String iri; }
+{
+  ( n = Var()
+  | iri = iri() { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  )
   { return n; }
 }
-Node QuotedTripleData() : { Node n = null ; Token t ; String iri ; Node s , p , o ; }
+Node TripleTermObject() : { Node n; String iri; }
 {
-  t = <LT2>
-  ( s = DataValueTerm() )
-  ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
-  ( o = DataValueTerm() )
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+  ( n = Var()
+  | iri = iri() { n = createNode(iri) ; }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = BlankNode()
+  | n = TripleTerm() { return n; }
+  )
   { return n; }
 }
-Node DataValueTerm() : { Node n = null ; String iri ; Node s , p , o ; }
+Node TripleTermData() : { Node n = null ; Token openToken ; String iri ; Node s , p , o ; }
 {
-  iri = iri() { return createNode(iri) ; }
-| n = RDFLiteral() { return n ; }
-| n = NumericLiteral() { return n ; }
-| n = BooleanLiteral() { return n ; }
-| n = QuotedTripleData() { return n ; }
+    openToken = <L_TRIPLE>
+    s = TripleTermDataSubject()
+    ( iri = iri() { p = createNode(iri) ; } | <KW_A> { p = nRDFtype ; } )
+    o = TripleTermDataObject()
+    { n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn); }
+    <R_TRIPLE>
+    { return n ; }
+}
+Node TripleTermDataSubject() : { Node n = null; String iri; }
+{
+ ( iri = iri() { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ )
+ { return n; }
+}
+Node TripleTermDataObject() : { Node n = null; String iri; }
+{
+ ( iri = iri() { n = createNode(iri) ; }
+ | n = RDFLiteral()
+ | n = NumericLiteral()
+ | n = BooleanLiteral()
+ | n = TripleTermData()
+ )
+ { return n; }
 }
 Node VarOrIri() : {Node n = null ; String iri ; }
 {
@@ -1194,27 +1315,38 @@ Expr PrimaryExpression() : { Expr expr ; Node n ; }
   | n = NumericLiteral() { return asExpr(n) ; }
   | n = BooleanLiteral() { return asExpr(n) ; }
   | n = Var() { return asExpr(n) ; }
-  | n = ExprQuotedTriple() { return asExpr(n) ; }
+  | n = ExprTripleTerm() { return asExpr(n) ; }
   )
 }
-Node ExprVarOrTerm() : { Node n; String s;}
+Node ExprTripleTerm() : { Token t ; Node s,p,o,n; }
 {
-  ( s = iri() { n = createNode(s); }
+  t = <L_TRIPLE>
+  s = ExprTripleTermSubject()
+  p = Verb()
+  o = ExprTripleTermObject()
+  { n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn); }
+  <R_TRIPLE>
+  { return n; }
+}
+Node ExprTripleTermSubject() : { Node n; String iri; }
+{
+  ( iri = iri() { n = createNode(iri); }
   | n = RDFLiteral()
   | n = NumericLiteral()
   | n = BooleanLiteral()
   | n = Var()
-  | n = ExprQuotedTriple()
   )
   { return n; }
 }
-Node ExprQuotedTriple() : { Token t ; Node s,p,o,n; }
-{ t = <LT2>
-  s = ExprVarOrTerm()
-  p = Verb()
-  o = ExprVarOrTerm()
-  { n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn); }
-  <GT2>
+Node ExprTripleTermObject() : { Node n; String iri; }
+{
+  ( iri = iri() { n = createNode(iri); }
+  | n = RDFLiteral()
+  | n = NumericLiteral()
+  | n = BooleanLiteral()
+  | n = Var()
+  | n = ExprTripleTerm()
+  )
   { return n; }
 }
 Expr BrackettedExpression() : { Expr expr ; }
@@ -1234,6 +1366,8 @@ Expr BuiltInCall() : { Expr expr ;
   | <LANGMATCHES>
        <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_LangMatches(expr1, expr2) ; }
+  | <LANGDIR> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_LangDir(expr) ; }
   | <DTYPE> <LPAREN> expr = Expression() <RPAREN>
     { return new E_Datatype(expr) ; }
   | <BOUND> <LPAREN> gn = Var() <RPAREN>
@@ -1294,6 +1428,10 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_Conditional(expr, expr1, expr2) ; }
   | <STRLANG> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrLang(expr1, expr2) ; }
+  | <STRLANGDIR> <LPAREN> expr1 = Expression() <COMMA>
+                          expr2 = Expression() <COMMA>
+                          expr3 = Expression() <RPAREN>
+    { return new E_StrLangDir(expr1, expr2, expr3) ; }
   | <STRDT> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
     { return new E_StrDatatype(expr1, expr2) ; }
   | <SAME_TERM> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <RPAREN>
@@ -1308,13 +1446,19 @@ Expr BuiltInCall() : { Expr expr ;
     { return new E_IsLiteral(expr) ; }
   | <IS_NUMERIC> <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsNumeric(expr) ; }
+  | <HAS_LANG> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLang(expr) ; }
+  | <HAS_LANGDIR> <LPAREN> expr = Expression() <RPAREN>
+    { return new E_HasLangDir(expr) ; }
   |
     expr = RegexExpression() { return expr ; }
   | expr = ExistsFunc() { return expr ; }
   | expr = NotExistsFunc() { return expr ; }
-| <IS_TRIPLE> <LPAREN> expr = Expression() <RPAREN>
+  | <IS_TRIPLE> <LPAREN> expr = Expression() <RPAREN>
     { return new E_IsTriple(expr) ; }
-  | <TRIPLE> <LPAREN> expr1 = Expression() <COMMA> expr2 = Expression() <COMMA> expr3 = Expression() <RPAREN>
+  | <TRIPLE> <LPAREN> expr1 = Expression() <COMMA>
+                       expr2 = Expression() <COMMA>
+                       expr3 = Expression() <RPAREN>
     { return new E_TripleFn(expr1, expr2, expr3) ; }
   | <SUBJECT> <LPAREN> expr = Expression() <RPAREN>
     { return new E_TripleSubject(expr) ; }
@@ -1421,7 +1565,7 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
        return asExpr(createNode(iri)) ;
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          return exprAgg ;
@@ -1429,16 +1573,17 @@ Expr iriOrFunction() : { String iri ; Args a = null ; }
     return new E_Function(iri, a) ;
   }
 }
-Node RDFLiteral() : { Token t ; String lex = null ; }
+Node RDFLiteral() : { Token t ; String lex = null ; String uri = null ; }
 {
   lex = String()
-  { String lang = null ; String uri = null ; }
   (
-    ( t = <LANGTAG> { lang = stripChars(t.image, 1) ; } )
+    t = <LANG_DIR>
+    { return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn); }
   |
-    ( <DATATYPE> uri = iri() )
+     <DATATYPE> uri = iri()
+     { return createLiteralDT(lex, uri, token.beginLine, token.beginColumn); }
   )?
-    { return createLiteral(lex, lang, uri) ; }
+  { return createLiteralString(lex, token.beginLine, token.beginColumn) ; }
 }
 Node NumericLiteral() : { Node n ; }
 {
@@ -1532,7 +1677,7 @@ TOKEN:
 | <BLANK_NODE_LABEL: "_:" (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS>|".")* <PN_CHARS>)? >
 | <VAR1: "?" <VARNAME> >
 | <VAR2: "$" <VARNAME> >
-| <LANGTAG: <AT> (<A2Z>)+("-" (<A2ZN>)+)* >
+| <LANG_DIR: <AT> (<A2Z>)+("-" (<A2ZN>)+)* ( "--" (<A2Z>)* )? >
 | <#A2Z: ["a"-"z","A"-"Z"]>
 | <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
 }
@@ -1600,15 +1745,19 @@ TOKEN [IGNORE_CASE] :
 | < URI: "uri" >
 | < STR: "str" >
 | < STRLANG: "strlang" >
+| < STRLANGDIR: "strlangdir" >
 | < STRDT: "strdt" >
 | < DTYPE: "datatype" >
 | < LANG: "lang" >
 | < LANGMATCHES: "langmatches" >
+| < LANGDIR: "langdir" >
 | < IS_URI: "isURI" >
 | < IS_IRI: "isIRI" >
 | < IS_BLANK: "isBlank" >
 | < IS_LITERAL: "isLiteral" >
 | < IS_NUMERIC: "isNumeric" >
+| < HAS_LANG: "hasLang" >
+| < HAS_LANGDIR: "hasLangDir" >
 | < REGEX: "regex" >
 | < SAME_TERM: "sameTerm" >
 | < RAND: "RAND" >
@@ -1729,12 +1878,14 @@ TOKEN :
 | < LT: "<" >
 | < LE: "<=" >
 | < GE: ">=" >
-| < GT2: ">>" >
+| < L_TRIPLE: "<<(" >
+| < R_TRIPLE: ")>>" >
 | < LT2: "<<" >
-| <L_ANN: "{|" >
-| <R_ANN: "|}" >
-| < BANG: "!" >
+| < GT2: ">>" >
+| < L_ANN: "{|" >
+| < R_ANN: "|}" >
 | < TILDE: "~" >
+| < BANG: "!" >
 | < COLON: ":" >
 | < SC_OR: "||" >
 | < SC_AND: "&&" >
diff --git a/jena-arq/Grammar/sparql_12.txt b/jena-arq/Grammar/sparql_12.txt
deleted file mode 100644
index 98411b5f43c..00000000000
--- a/jena-arq/Grammar/sparql_12.txt
+++ /dev/null
@@ -1,486 +0,0 @@
-
-DOCUMENT START
-TOKENS
-<DEFAULT> SKIP : {
-" "
-| "\t"
-| "\n"
-| "\r"
-| "\f"
-}
-
-<DEFAULT> SPECIAL : {
-<SINGLE_LINE_COMMENT: "#" (~["\n","\r"])* ("\n" | "\r" | "\r\n")?>
-}
-
-<DEFAULT> TOKEN : {
-<#WS: " " | "\t" | "\n" | "\r" | "\f">
-| <#WSC: <WS> | <SINGLE_LINE_COMMENT>>
-}
-
-<DEFAULT> TOKEN : {
-<IRIref: "<" (~[">","<","\"","{","}","^","\\","|","`","\u0000"-" "] | <UCHAR>)* ">">
-| <PNAME_NS: (<PN_PREFIX>)? ":">
-| <PNAME_LN: <PNAME_NS> <PN_LOCAL>>
-| <BLANK_NODE_LABEL: "_:" (<PN_CHARS_U> | ["0"-"9"]) ((<PN_CHARS> | ".")* <PN_CHARS>)?>
-| <VAR1: "?" <VARNAME>>
-| <VAR2: "$" <VARNAME>>
-| <LANGTAG: <AT> (<A2Z>)+ ("-" (<A2ZN>)+)*>
-| <#A2Z: ["a"-"z","A"-"Z"]>
-| <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
-}
-
-<DEFAULT> TOKEN : {
-<KW_A: "a">
-}
-
-<DEFAULT> TOKEN [IGNORE_CASE] : {
-<BASE: "base">
-| <PREFIX: "prefix">
-| <SELECT: "select">
-| <DISTINCT: "distinct">
-| <REDUCED: "reduced">
-| <DESCRIBE: "describe">
-| <CONSTRUCT: "construct">
-| <ASK: "ask">
-| <LIMIT: "limit">
-| <OFFSET: "offset">
-| <ORDER: "order">
-| <BY: "by">
-| <VALUES: "values">
-| <UNDEF: "undef">
-| <ASC: "asc">
-| <DESC: "desc">
-| <NAMED: "named">
-| <FROM: "from">
-| <WHERE: "where">
-| <AND: "and">
-| <GRAPH: "graph">
-| <OPTIONAL: "optional">
-| <UNION: "union">
-| <MINUS_P: "minus">
-| <BIND: "bind">
-| <SERVICE: "service">
-| <TRIPLE: "TRIPLE">
-| <IS_TRIPLE: "isTRIPLE">
-| <SUBJECT: "SUBJECT">
-| <PREDICATE: "PREDICATE">
-| <OBJECT: "OBJECT">
-| <EXISTS: "exists">
-| <NOT: "not">
-| <AS: "as">
-| <GROUP: "group">
-| <HAVING: "having">
-| <SEPARATOR: "separator">
-| <AGG: "agg">
-| <COUNT: "count">
-| <MIN: "min">
-| <MAX: "max">
-| <SUM: "sum">
-| <AVG: "avg">
-| <STDEV: "stdev">
-| <STDEV_SAMP: "stdev_samp">
-| <STDEV_POP: "stdev_pop">
-| <VARIANCE: "variance">
-| <VAR_SAMP: "var_samp">
-| <VAR_POP: "var_pop">
-| <SAMPLE: "sample">
-| <GROUP_CONCAT: "group_concat">
-| <FILTER: "filter">
-| <BOUND: "bound">
-| <COALESCE: "coalesce">
-| <IN: "in">
-| <IF: "if">
-| <BNODE: "bnode">
-| <IRI: "iri">
-| <URI: "uri">
-| <STR: "str">
-| <STRLANG: "strlang">
-| <STRDT: "strdt">
-| <DTYPE: "datatype">
-| <LANG: "lang">
-| <LANGMATCHES: "langmatches">
-| <IS_URI: "isURI">
-| <IS_IRI: "isIRI">
-| <IS_BLANK: "isBlank">
-| <IS_LITERAL: "isLiteral">
-| <IS_NUMERIC: "isNumeric">
-| <REGEX: "regex">
-| <SAME_TERM: "sameTerm">
-| <RAND: "RAND">
-| <ABS: "ABS">
-| <CEIL: "CEIL">
-| <FLOOR: "FLOOR">
-| <ROUND: "ROUND">
-| <CONCAT: "CONCAT">
-| <SUBSTR: "SUBSTR">
-| <STRLEN: "STRLEN">
-| <REPLACE: "REPLACE">
-| <UCASE: "UCASE">
-| <LCASE: "LCASE">
-| <ENCODE_FOR_URI: "ENCODE_FOR_URI">
-| <CONTAINS: "CONTAINS">
-| <STRSTARTS: "STRSTARTS">
-| <STRENDS: "STRENDS">
-| <STRBEFORE: "STRBEFORE">
-| <STRAFTER: "STRAFTER">
-| <YEAR: "YEAR">
-| <MONTH: "MONTH">
-| <DAY: "DAY">
-| <HOURS: "HOURS">
-| <MINUTES: "MINUTES">
-| <SECONDS: "SECONDS">
-| <TIMEZONE: "TIMEZONE">
-| <TZ: "TZ">
-| <NOW: "NOW">
-| <UUID: "UUID">
-| <STRUUID: "STRUUID">
-| <MD5: "MD5">
-| <SHA1: "SHA1">
-| <SHA224: "SHA224">
-| <SHA256: "SHA256">
-| <SHA384: "SHA384">
-| <SHA512: "SHA512">
-| <TRUE: "true">
-| <FALSE: "false">
-}
-
-<DEFAULT> TOKEN [IGNORE_CASE] : {
-<DATA: "data">
-| <INSERT: "insert">
-| <DELETE: "delete">
-| <INSERT_DATA: <INSERT> (<WSC>)* <DATA>>
-| <DELETE_DATA: <DELETE> (<WSC>)* <DATA>>
-| <DELETE_WHERE: <DELETE> (<WSC>)* <WHERE>>
-| <LOAD: "load">
-| <CLEAR: "clear">
-| <CREATE: "create">
-| <ADD: "add">
-| <MOVE: "move">
-| <COPY: "copy">
-| <META: "meta">
-| <SILENT: "silent">
-| <DROP: "drop">
-| <INTO: "into">
-| <TO: "to">
-| <DFT: "default">
-| <ALL: "all">
-| <WITH: "with">
-| <USING: "using">
-}
-
-<DEFAULT> TOKEN : {
-<#DIGITS: (["0"-"9"])+>
-| <INTEGER: <DIGITS>>
-| <DECIMAL: (<DIGITS>)? "." <DIGITS>>
-| <DOUBLE: (["0"-"9"])+ "." (["0"-"9"])* <EXPONENT> | "." (["0"-"9"])+ <EXPONENT> | (["0"-"9"])+ <EXPONENT>>
-| <INTEGER_POSITIVE: <PLUS> <INTEGER>>
-| <DECIMAL_POSITIVE: <PLUS> <DECIMAL>>
-| <DOUBLE_POSITIVE: <PLUS> <DOUBLE>>
-| <INTEGER_NEGATIVE: <MINUS> <INTEGER>>
-| <DECIMAL_NEGATIVE: <MINUS> <DECIMAL>>
-| <DOUBLE_NEGATIVE: <MINUS> <DOUBLE>>
-| <#EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+>
-| <#QUOTE_3D: "\"\"\"">
-| <#QUOTE_3S: "\'\'\'">
-| <ECHAR: "\\" ("t" | "b" | "n" | "r" | "f" | "\\" | "\"" | "\'")>
-| <#UCHAR: <UCHAR8>>
-| <#UCHAR4: "\\" "u" <HEX> <HEX> <HEX> <HEX>>
-| <#UCHAR8: "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX>>
-| <STRING_LITERAL1: "\'" (~["\'","\\","\n","\r"] | <ECHAR> | <UCHAR>)* "\'">
-| <STRING_LITERAL2: "\"" (~["\"","\\","\n","\r"] | <ECHAR> | <UCHAR>)* "\"">
-| <STRING_LITERAL_LONG1: <QUOTE_3S> (("\'" | "\'\'")? (~["\'","\\"] | <ECHAR> | <UCHAR>))* <QUOTE_3S>>
-| <STRING_LITERAL_LONG2: <QUOTE_3D> (("\"" | "\"\"")? (~["\"","\\"] | <ECHAR> | <UCHAR>))* <QUOTE_3D>>
-}
-
-<DEFAULT> TOKEN : {
-<LPAREN: "(">
-| <RPAREN: ")">
-| <NIL: <LPAREN> (<WSC>)* <RPAREN>>
-| <LBRACE: "{">
-| <RBRACE: "}">
-| <LBRACKET: "[">
-| <RBRACKET: "]">
-| <ANON: <LBRACKET> (<WSC>)* <RBRACKET>>
-| <SEMICOLON: ";">
-| <COMMA: ",">
-| <DOT: ".">
-| <EQ: "=">
-| <NE: "!=">
-| <GT: ">">
-| <LT: "<">
-| <LE: "<=">
-| <GE: ">=">
-| <GT2: ">>">
-| <LT2: "<<">
-| <L_ANN: "{|">
-| <R_ANN: "|}">
-| <BANG: "!">
-| <TILDE: "~">
-| <COLON: ":">
-| <SC_OR: "||">
-| <SC_AND: "&&">
-| <PLUS: "+">
-| <MINUS: "-">
-| <STAR: "*">
-| <SLASH: "/">
-| <DATATYPE: "^^">
-| <AT: "@">
-| <VBAR: "|">
-| <CARAT: "^">
-| <FPATH: "->">
-| <RPATH: "<-">
-| <QMARK: "?">
-}
-
-<DEFAULT> TOKEN : {
-<#PN_CHARS_BASE: ["A"-"Z"] | ["a"-"z"] | ["\u00c0"-"\u00d6"] | ["\u00d8"-"\u00f6"] | ["\u00f8"-"\u02ff"] | ["\u0370"-"\u037d"] | ["\u037f"-"\u1fff"] | ["\u200c"-"\u200d"] | ["\u2070"-"\u218f"] | ["\u2c00"-"\u2fef"] | ["\u3001"-"\ud7ff"] | ["\uf900"-"\ufffd"]>
-| <#PN_CHARS_U: <PN_CHARS_BASE> | "_">
-| <#PN_CHARS: <PN_CHARS_U> | "-" | ["0"-"9"] | "\u00b7" | ["\u0300"-"\u036f"] | ["\u203f"-"\u2040"]>
-| <#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS> | ".")* <PN_CHARS>)?>
-| <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX>) ((<PN_CHARS> | "." | ":" | <PLX>)* (<PN_CHARS> | ":" | <PLX>))?>
-| <#VARNAME: (<PN_CHARS_U> | ["0"-"9"]) (<PN_CHARS_U> | ["0"-"9"] | "\u00b7" | ["\u0300"-"\u036f"] | ["\u203f"-"\u2040"])*>
-| <#PN_LOCAL_ESC: "\\" ("_" | "~" | "." | "-" | "!" | "$" | "&" | "\'" | "(" | ")" | "*" | "+" | "," | ";" | "=" | "/" | "?" | "#" | "@" | "%")>
-| <#PLX: <PERCENT> | <PN_LOCAL_ESC>>
-| <#HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"]>
-| <#PERCENT: "%" <HEX> <HEX>>
-}
-
-<DEFAULT> TOKEN : {
-<#UNKNOWN: (~[" ","\t","\n","\r","\f"])+>
-}
-
-NON-TERMINALS
-	QueryUnit	:=	Query <EOF>
-	Query	:=	Prologue ( SelectQuery | ConstructQuery | DescribeQuery | AskQuery ) ValuesClause
-	UpdateUnit	:=	Update <EOF>
-	Prologue	:=	( BaseDecl | PrefixDecl )*
-	BaseDecl	:=	<BASE> IRIREF
-	PrefixDecl	:=	<PREFIX> <PNAME_NS> IRIREF
-	SelectQuery	:=	SelectClause ( DatasetClause )* WhereClause SolutionModifier
-	SubSelect	:=	SelectClause WhereClause SolutionModifier ValuesClause
-	SelectClause	:=	<SELECT> ( <DISTINCT> | <REDUCED> )? ( ( Var | ( <LPAREN> Expression <AS> Var <RPAREN> ) )+ | <STAR> )
-	ConstructQuery	:=	<CONSTRUCT> ( ConstructTemplate ( DatasetClause )* WhereClause SolutionModifier | ( DatasetClause )* <WHERE> <LBRACE> ( TriplesTemplate )? <RBRACE> SolutionModifier )
-	DescribeQuery	:=	<DESCRIBE> ( ( VarOrIri )+ | <STAR> ) ( DatasetClause )* ( WhereClause )? SolutionModifier
-	AskQuery	:=	<ASK> ( DatasetClause )* WhereClause SolutionModifier
-	DatasetClause	:=	<FROM> ( DefaultGraphClause | NamedGraphClause )
-	DefaultGraphClause	:=	SourceSelector
-	NamedGraphClause	:=	<NAMED> SourceSelector
-	SourceSelector	:=	iri
-	WhereClause	:=	( <WHERE> )? GroupGraphPattern
-	SolutionModifier	:=	( GroupClause )? ( HavingClause )? ( OrderClause )? ( LimitOffsetClauses )?
-	GroupClause	:=	<GROUP> <BY> ( GroupCondition )+
-	GroupCondition	:=	( BuiltInCall | FunctionCall | <LPAREN> Expression ( <AS> Var )? <RPAREN> | Var )
-	HavingClause	:=	<HAVING> ( HavingCondition )+
-	HavingCondition	:=	Constraint
-	OrderClause	:=	<ORDER> <BY> ( OrderCondition )+
-	OrderCondition	:=	( ( ( <ASC> | <DESC> ) BrackettedExpression ) | ( Constraint | Var ) )
-	LimitOffsetClauses	:=	( LimitClause ( OffsetClause )? | OffsetClause ( LimitClause )? )
-	LimitClause	:=	<LIMIT> <INTEGER>
-	OffsetClause	:=	<OFFSET> <INTEGER>
-	ValuesClause	:=	( <VALUES> DataBlock )?
-	Update	:=	Prologue ( Update1 ( <SEMICOLON> Update )? )?
-	Update1	:=	( Load | Clear | Drop | Add | Move | Copy | Create | DeleteWhere | Modify | InsertData | DeleteData )
-	Load	:=	<LOAD> ( <SILENT> )? iri ( <INTO> GraphRef )?
-	Clear	:=	<CLEAR> ( <SILENT> )? GraphRefAll
-	Drop	:=	<DROP> ( <SILENT> )? GraphRefAll
-	Create	:=	<CREATE> ( <SILENT> )? GraphRef
-	Add	:=	<ADD> ( <SILENT> )? GraphOrDefault <TO> GraphOrDefault
-	Move	:=	<MOVE> ( <SILENT> )? GraphOrDefault <TO> GraphOrDefault
-	Copy	:=	<COPY> ( <SILENT> )? GraphOrDefault <TO> GraphOrDefault
-	InsertData	:=	<INSERT_DATA> QuadData
-	DeleteData	:=	<DELETE_DATA> QuadData
-	DeleteWhere	:=	<DELETE_WHERE> QuadPattern
-	Modify	:=	( <WITH> iri )? ( DeleteClause ( InsertClause )? | InsertClause ) ( UsingClause )* <WHERE> GroupGraphPattern
-	DeleteClause	:=	<DELETE> QuadPattern
-	InsertClause	:=	<INSERT> QuadPattern
-	UsingClause	:=	<USING> ( iri | <NAMED> iri )
-	GraphOrDefault	:=	( <DFT> | ( <GRAPH> )? iri )
-	GraphRef	:=	<GRAPH> iri
-	GraphRefAll	:=	( GraphRef | <DFT> | <NAMED> | <ALL> )
-	QuadPattern	:=	<LBRACE> Quads <RBRACE>
-	QuadData	:=	<LBRACE> Quads <RBRACE>
-	Quads	:=	( TriplesTemplate )? ( QuadsNotTriples ( <DOT> )? ( TriplesTemplate )? )*
-	QuadsNotTriples	:=	<GRAPH> VarOrIri <LBRACE> ( TriplesTemplate )? <RBRACE>
-	TriplesTemplate	:=	TriplesSameSubject ( <DOT> ( TriplesTemplate )? )?
-	GroupGraphPattern	:=	<LBRACE> ( SubSelect | GroupGraphPatternSub ) <RBRACE>
-	GroupGraphPatternSub	:=	( TriplesBlock )? ( GraphPatternNotTriples ( <DOT> )? ( TriplesBlock )? )*
-	TriplesBlock	:=	TriplesSameSubjectPath ( <DOT> ( TriplesBlock )? )?
-	GraphPatternNotTriples	:=	( GroupOrUnionGraphPattern | OptionalGraphPattern | MinusGraphPattern | GraphGraphPattern | ServiceGraphPattern | Filter | Bind | InlineData )
-	OptionalGraphPattern	:=	<OPTIONAL> GroupGraphPattern
-	GraphGraphPattern	:=	<GRAPH> VarOrIri GroupGraphPattern
-	ServiceGraphPattern	:=	<SERVICE> ( <SILENT> )? VarOrIri GroupGraphPattern
-	Bind	:=	<BIND> <LPAREN> Expression <AS> Var <RPAREN>
-	InlineData	:=	<VALUES> DataBlock
-	DataBlock	:=	( InlineDataOneVar | InlineDataFull )
-	InlineDataOneVar	:=	Var <LBRACE> ( DataBlockValue )* <RBRACE>
-	InlineDataFull	:=	( <NIL> | <LPAREN> ( Var )* <RPAREN> ) <LBRACE> ( <LPAREN> ( DataBlockValue )* <RPAREN> | <NIL> )* <RBRACE>
-	DataBlockValue	:=	iri
-		|	RDFLiteral
-		|	NumericLiteral
-		|	BooleanLiteral
-		|	<UNDEF>
-		|	QuotedTripleData
-	MinusGraphPattern	:=	<MINUS_P> GroupGraphPattern
-	GroupOrUnionGraphPattern	:=	GroupGraphPattern ( <UNION> GroupGraphPattern )*
-	Filter	:=	<FILTER> Constraint
-	Constraint	:=	( BrackettedExpression | BuiltInCall | FunctionCall )
-	FunctionCall	:=	iri ArgList
-	ArgList	:=	( <NIL> | <LPAREN> ( <DISTINCT> )? Expression ( <COMMA> Expression )* <RPAREN> )
-	ExpressionList	:=	( <NIL> | <LPAREN> Expression ( <COMMA> Expression )* <RPAREN> )
-	ConstructTemplate	:=	<LBRACE> ( ConstructTriples )? <RBRACE>
-	ConstructTriples	:=	TriplesSameSubject ( <DOT> ( ConstructTriples )? )?
-	TriplesSameSubject	:=	VarOrTerm PropertyListNotEmpty
-		|	TriplesNode PropertyList
-	PropertyList	:=	( PropertyListNotEmpty )?
-	PropertyListNotEmpty	:=	Verb ObjectList ( <SEMICOLON> ( Verb ObjectList )? )*
-	Verb	:=	( VarOrIri | <KW_A> )
-	ObjectList	:=	Object ( <COMMA> Object )*
-	Object	:=	GraphNode Annotation
-	TriplesSameSubjectPath	:=	VarOrTerm PropertyListPathNotEmpty
-		|	TriplesNodePath PropertyListPath
-	PropertyListPath	:=	( PropertyListPathNotEmpty )?
-	PropertyListPathNotEmpty	:=	( VerbPath | VerbSimple ) ObjectListPath ( <SEMICOLON> ( ( VerbPath | VerbSimple ) ObjectListPath )? )*
-	VerbPath	:=	Path
-	VerbSimple	:=	Var
-	ObjectListPath	:=	ObjectPath ( <COMMA> ObjectPath )*
-	ObjectPath	:=	GraphNodePath AnnotationPath
-	Path	:=	PathAlternative
-	PathAlternative	:=	PathSequence ( <VBAR> PathSequence )*
-	PathSequence	:=	PathEltOrInverse ( <SLASH> PathEltOrInverse )*
-	PathElt	:=	PathPrimary ( PathMod )?
-	PathEltOrInverse	:=	( PathElt | <CARAT> PathElt )
-	PathMod	:=	( <QMARK> | <STAR> | <PLUS> )
-	PathPrimary	:=	( iri | <KW_A> | <BANG> PathNegatedPropertySet | <LPAREN> Path <RPAREN> )
-	PathNegatedPropertySet	:=	( PathOneInPropertySet | <LPAREN> ( PathOneInPropertySet ( <VBAR> PathOneInPropertySet )* )? <RPAREN> )
-	PathOneInPropertySet	:=	( iri | <KW_A> | <CARAT> ( iri | <KW_A> ) )
-	Integer	:=	<INTEGER>
-	TriplesNode	:=	Collection
-		|	BlankNodePropertyList
-	BlankNodePropertyList	:=	<LBRACKET> PropertyListNotEmpty <RBRACKET>
-	TriplesNodePath	:=	CollectionPath
-		|	BlankNodePropertyListPath
-	BlankNodePropertyListPath	:=	<LBRACKET> PropertyListPathNotEmpty <RBRACKET>
-	Collection	:=	<LPAREN> ( GraphNode )+ <RPAREN>
-	CollectionPath	:=	<LPAREN> ( GraphNodePath )+ <RPAREN>
-	AnnotationPath	:=	( <L_ANN> PropertyListPathNotEmpty <R_ANN> )?
-	Annotation	:=	( <L_ANN> PropertyListNotEmpty <R_ANN> )?
-	GraphNode	:=	VarOrTerm
-		|	TriplesNode
-	GraphNodePath	:=	VarOrTerm
-		|	TriplesNodePath
-	VarOrTerm	:=	( Var | iri | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | <NIL> | QuotedTriple )
-	QuotedTriple	:=	<LT2> VarOrTerm Verb VarOrTerm <GT2>
-	QuotedTripleData	:=	<LT2> ( DataValueTerm ) ( iri | <KW_A> ) ( DataValueTerm ) <GT2>
-	DataValueTerm	:=	iri
-		|	RDFLiteral
-		|	NumericLiteral
-		|	BooleanLiteral
-		|	QuotedTripleData
-	VarOrIri	:=	( Var | iri )
-	Var	:=	( <VAR1> | <VAR2> )
-	Expression	:=	ConditionalOrExpression
-	ConditionalOrExpression	:=	ConditionalAndExpression ( <SC_OR> ConditionalAndExpression )*
-	ConditionalAndExpression	:=	ValueLogical ( <SC_AND> ValueLogical )*
-	ValueLogical	:=	RelationalExpression
-	RelationalExpression	:=	NumericExpression ( <EQ> NumericExpression | <NE> NumericExpression | <LT> NumericExpression | <GT> NumericExpression | <LE> NumericExpression | <GE> NumericExpression | <IN> ExpressionList | <NOT> <IN> ExpressionList )?
-	NumericExpression	:=	AdditiveExpression
-	AdditiveExpression	:=	MultiplicativeExpression ( <PLUS> MultiplicativeExpression | <MINUS> MultiplicativeExpression | ( NumericLiteralPositive | NumericLiteralNegative ) ( ( <STAR> UnaryExpression ) | ( <SLASH> UnaryExpression ) )* )*
-	MultiplicativeExpression	:=	UnaryExpression ( <STAR> UnaryExpression | <SLASH> UnaryExpression )*
-	UnaryExpression	:=	<BANG> PrimaryExpression
-		|	<PLUS> PrimaryExpression
-		|	<MINUS> PrimaryExpression
-		|	PrimaryExpression
-	PrimaryExpression	:=	( BrackettedExpression | BuiltInCall | iriOrFunction | RDFLiteral | NumericLiteral | BooleanLiteral | Var | ExprQuotedTriple )
-	ExprVarOrTerm	:=	( iri | RDFLiteral | NumericLiteral | BooleanLiteral | Var | ExprQuotedTriple )
-	ExprQuotedTriple	:=	<LT2> ExprVarOrTerm Verb ExprVarOrTerm <GT2>
-	BrackettedExpression	:=	<LPAREN> Expression <RPAREN>
-	BuiltInCall	:=	Aggregate
-		|	<STR> <LPAREN> Expression <RPAREN>
-		|	<LANG> <LPAREN> Expression <RPAREN>
-		|	<LANGMATCHES> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<DTYPE> <LPAREN> Expression <RPAREN>
-		|	<BOUND> <LPAREN> Var <RPAREN>
-		|	<IRI> <LPAREN> Expression <RPAREN>
-		|	<URI> <LPAREN> Expression <RPAREN>
-		|	<BNODE> ( <LPAREN> Expression <RPAREN> | <NIL> )
-		|	<RAND> <NIL>
-		|	<ABS> <LPAREN> Expression <RPAREN>
-		|	<CEIL> <LPAREN> Expression <RPAREN>
-		|	<FLOOR> <LPAREN> Expression <RPAREN>
-		|	<ROUND> <LPAREN> Expression <RPAREN>
-		|	<CONCAT> ExpressionList
-		|	SubstringExpression
-		|	<STRLEN> <LPAREN> Expression <RPAREN>
-		|	StrReplaceExpression
-		|	<UCASE> <LPAREN> Expression <RPAREN>
-		|	<LCASE> <LPAREN> Expression <RPAREN>
-		|	<ENCODE_FOR_URI> <LPAREN> Expression <RPAREN>
-		|	<CONTAINS> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<STRSTARTS> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<STRENDS> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<STRBEFORE> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<STRAFTER> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<YEAR> <LPAREN> Expression <RPAREN>
-		|	<MONTH> <LPAREN> Expression <RPAREN>
-		|	<DAY> <LPAREN> Expression <RPAREN>
-		|	<HOURS> <LPAREN> Expression <RPAREN>
-		|	<MINUTES> <LPAREN> Expression <RPAREN>
-		|	<SECONDS> <LPAREN> Expression <RPAREN>
-		|	<TIMEZONE> <LPAREN> Expression <RPAREN>
-		|	<TZ> <LPAREN> Expression <RPAREN>
-		|	<NOW> <NIL>
-		|	<UUID> <NIL>
-		|	<STRUUID> <NIL>
-		|	<MD5> <LPAREN> Expression <RPAREN>
-		|	<SHA1> <LPAREN> Expression <RPAREN>
-		|	<SHA256> <LPAREN> Expression <RPAREN>
-		|	<SHA384> <LPAREN> Expression <RPAREN>
-		|	<SHA512> <LPAREN> Expression <RPAREN>
-		|	<COALESCE> ExpressionList
-		|	<IF> <LPAREN> Expression <COMMA> Expression <COMMA> Expression <RPAREN>
-		|	<STRLANG> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<STRDT> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<SAME_TERM> <LPAREN> Expression <COMMA> Expression <RPAREN>
-		|	<IS_IRI> <LPAREN> Expression <RPAREN>
-		|	<IS_URI> <LPAREN> Expression <RPAREN>
-		|	<IS_BLANK> <LPAREN> Expression <RPAREN>
-		|	<IS_LITERAL> <LPAREN> Expression <RPAREN>
-		|	<IS_NUMERIC> <LPAREN> Expression <RPAREN>
-		|	RegexExpression
-		|	ExistsFunc
-		|	NotExistsFunc
-		|	<IS_TRIPLE> <LPAREN> Expression <RPAREN>
-		|	<TRIPLE> <LPAREN> Expression <COMMA> Expression <COMMA> Expression <RPAREN>
-		|	<SUBJECT> <LPAREN> Expression <RPAREN>
-		|	<PREDICATE> <LPAREN> Expression <RPAREN>
-		|	<OBJECT> <LPAREN> Expression <RPAREN>
-	RegexExpression	:=	<REGEX> <LPAREN> Expression <COMMA> Expression ( <COMMA> Expression )? <RPAREN>
-	SubstringExpression	:=	<SUBSTR> <LPAREN> Expression <COMMA> Expression ( <COMMA> Expression )? <RPAREN>
-	StrReplaceExpression	:=	<REPLACE> <LPAREN> Expression <COMMA> Expression <COMMA> Expression ( <COMMA> Expression )? <RPAREN>
-	ExistsFunc	:=	<EXISTS> GroupGraphPattern
-	NotExistsFunc	:=	<NOT> <EXISTS> GroupGraphPattern
-	Aggregate	:=	( <COUNT> <LPAREN> ( <DISTINCT> )? ( <STAR> | Expression ) <RPAREN> | <SUM> <LPAREN> ( <DISTINCT> )? Expression <RPAREN> | <MIN> <LPAREN> ( <DISTINCT> )? Expression <RPAREN> | <MAX> <LPAREN> ( <DISTINCT> )? Expression <RPAREN> | <AVG> <LPAREN> ( <DISTINCT> )? Expression <RPAREN> | <SAMPLE> <LPAREN> ( <DISTINCT> )? Expression <RPAREN> | <GROUP_CONCAT> <LPAREN> ( <DISTINCT> )? Expression ( <SEMICOLON> <SEPARATOR> <EQ> String )? <RPAREN> )
-	iriOrFunction	:=	iri ( ArgList )?
-	RDFLiteral	:=	String ( ( <LANGTAG> ) | ( <DATATYPE> iri ) )?
-	NumericLiteral	:=	( NumericLiteralUnsigned | NumericLiteralPositive | NumericLiteralNegative )
-	NumericLiteralUnsigned	:=	<INTEGER>
-		|	<DECIMAL>
-		|	<DOUBLE>
-	NumericLiteralPositive	:=	<INTEGER_POSITIVE>
-		|	<DECIMAL_POSITIVE>
-		|	<DOUBLE_POSITIVE>
-	NumericLiteralNegative	:=	<INTEGER_NEGATIVE>
-		|	<DECIMAL_NEGATIVE>
-		|	<DOUBLE_NEGATIVE>
-	BooleanLiteral	:=	<TRUE>
-		|	<FALSE>
-	String	:=	( <STRING_LITERAL1> | <STRING_LITERAL2> | <STRING_LITERAL_LONG1> | <STRING_LITERAL_LONG2> )
-	iri	:=	IRIREF
-		|	PrefixedName
-	PrefixedName	:=	( <PNAME_LN> | <PNAME_NS> )
-	BlankNode	:=	<BLANK_NODE_LABEL>
-		|	<ANON>
-	IRIREF	:=	<IRIref>
-
-DOCUMENT END
diff --git a/jena-arq/Grammar/sse/grammar-sse b/jena-arq/Grammar/sse/grammar-sse
index 3567de44b0d..d7d35f95278 100755
--- a/jena-arq/Grammar/sse/grammar-sse
+++ b/jena-arq/Grammar/sse/grammar-sse
@@ -40,8 +40,8 @@ function grammar
 
 ##     echo "---- Create HTML"
 ##     jjdoc -OUTPUT_FILE=${FILE%%.jj}.html "${FILE}"
-    echo "---- Create text form"
-    jjdoc -TEXT=true -OUTPUT_FILE=${FILE%%.jj}.txt "${FILE}"
+##     echo "---- Create text form"
+##     jjdoc -TEXT=true -OUTPUT_FILE=${FILE%%.jj}.txt "${FILE}"
 
     echo "---- Fixing Java warnings in TokenMgrError"
     F="$DIR/TokenMgrError.java"
@@ -57,19 +57,18 @@ function grammar
 if [ $# == 0 ]
 then
     set -- unisyn
-    ## echo "Usage: grammar [arq|sparql|rdql]" 1>&2
-    ## exit 1
-    fi
+fi
 
 for G in "$@"
 do
     case "$G" in
 	unisyn)
-	    cp ../header.jj parser.jj
-	    # The parser that is exactly the working group grammar
-	    cat "$GRAMMAR" | cpp -P >> parser.jj
-	    grammar parser.jj sse/lang/parser SSE_ParserCore
-	    [ "$RC" = 0 ] && rm parser.jj
+## 	    cp ../header.jj parser.jj
+## 	    # The parser that is exactly the working group grammar
+## 	    cat "$GRAMMAR" | cpp -P >> parser.jj
+## 	    grammar parser.jj sse/lang/parser SSE_ParserCore
+## 	    [ "$RC" = 0 ] && rm parser.jj
+	    grammar sse.jj sse/lang/parser SSE_ParserCore
 	    ;;
 	*)    echo "**** Unknown grammar: $G" 1>&2
 	      ;;
diff --git a/jena-arq/Grammar/sse/jj2html b/jena-arq/Grammar/sse/jj2html
deleted file mode 100644
index 0f83ee7a9bb..00000000000
--- a/jena-arq/Grammar/sse/jj2html
+++ /dev/null
@@ -1,469 +0,0 @@
-#!/bin/perl
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements.  See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership.  The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License.  You may obtain a copy of the License at
-##
-##     http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-
-# Grammar into HTML
-# Read in sparql.txt and the tokens.txt file
-
-## ToDo:
-## Check tokens exist and are used
-## Validate
-
-
-if ( $#ARGV != 1 )
-{
-    print STDERR "Usage: grammar.txt tokens.txt\n" ;
-    exit 1 ;
-}
-
-
-
-$/ = undef ;
-# Just table or full page.
-$TABLE = 1 ;
-
-$grammarFile = $ARGV[0] ;
-$tokensFile = $ARGV[1] ;
-
-## $grammarFile = 's.txt' ;
-## $tokensFile = 't.txt' ;
-
-
-$grammar = &readFile($grammarFile) ;
-$tokens = &readFile($tokensFile) ;
-
-$grammar =~ s!DOCUMENT START!! ;
-$grammar =~ s!NON-TERMINALS!! ;
-$grammar =~ s!DOCUMENT END!! ;
-
-$grammar =~ s!//.*!!g ;
-$grammar =~ s!\r!!g ;
-
-# remove leading whitespace
-$grammar =~ s!^[\n\s]*!\n! ;
-
-# Merge alts
-$grammar =~ s!\n\s*\|!\ |!g ;
-
-$tokens =~ s!//.*!!g ;
-$tokens =~ s!\r!!g ;
-
-
-## Grammar
-#print "GRAMMAR\n" ;
-
-@g = split(/\n\s*/, $grammar) ;
-
-@rules = () ;
-%ruleMap = () ;
-%tokenMap = () ;
-%inline = () ;
-
-# Grammar rules
-# Direct from "jjdoc -TEXT=true"
-
-for $g (@g)
-{
-    ($rulename, $rulebody) = split(/:=/,$g) ;
-
-    $rulename =~ s!^\s*!! ;
-    $rulename =~ s!\s*$!! ;
-
-    $rulebody =~ s!^\s*!! ;
-    $rulebody =~ s!\s*$!! ;
-    
-    # Remove outer brackets
-#    $rulebody =~ s!^\((.*)\)$!$1! ;
-
-    # Remove <> around tokens in grammar.
-    ## Now done very late (as &lt;&gt;) in fixups.
-    ## $rulebody =~ s/\<(\w+)\>/$1/g ;
-    # Leave in - so tokens distinguished from rules
-
-    next if $rulename eq '' ;
-    #next if $rulebody eq '' ;
-
-    # Skip the root rule.
-    next if ( $rulename eq 'CompilationUnit' ) ;
-
-    $rulebody = 'Perl 5 regular expression'
-	if ( $rulename eq 'PatternLiteral' ) ;
-
-    push @rules, $rulename ;
-    warn "Duplicate rule (grammar): $rulename\n" if defined($ruleMap{$rulename}) ;
-    $ruleMap{$rulename} = $rulebody ;
-
-##     print "----------\n" ;
-##     print $rulename,"\n" ;
-##     print $rulebody,"\n" ;
-
-}
-
-
-# Tokens
-# Produced by "jj2tokens"
-# Hand edited to indicate the inlines
-
-$tokens =~ s/\n+/\n/g ;
-$tokens =~ s/^\n// ;
-
-@t = split(/\n(?=\<|\[)/, $tokens) ;
-
-for $t (@t)
-{
-    ($tokenname,$tokenbody) = split(/::=/, $t) ;
-    $tokenname =~ s!^\s*!! ;
-    $tokenname =~ s!\s*$!! ;
-
-##     # remove <> around tokens
-## Do very late as a formatting fix up.
-##     $tokenname =~ s/^\<// ;
-##     $tokenname =~ s/\>$// ;
-
-    $tokenname =~ s/#// ;
-    
-    $tokenbody =~ s!^\s*!! ;
-    $tokenbody =~ s!\s*$!! ;
-    
-    # <> round tokens
-    # Remove at last minute.
-
-    # Remove outer ()
-    # $tokenbody =~ s!^\((.*)\)$!$1! ;
-
-    # Inline?
-    if ( $tokenname =~ /^\[\<\w*\>\]/ )
-    {
-	warn "Duplicate inline (token): $tokenname\n" if defined($inline{$tokenname}) ;
-	$tokenname =~ s/^\[//g ;
-	$tokenname =~ s/\]$//g ;
-	$tokenbody =~ s/"/'/g ; # '" -- But not literal " -- how?
-        $tokenbody =~ s/\<\>\'\{\}/\<\>\"\{\}/ ; # '" IRI fixup
-
-	$inline{$tokenname} = $tokenbody ;
-
-	#print "INLINE: ",$tokenname," => ",$tokenbody,"\n" ;
-    }
-    else
-    {
-	push @rules, $tokenname ;
-	warn "Duplicate rule (token): $tokenname\n" if defined($tokenMap{$tokenname}) ;
-	$ruleMap{$tokenname} = $tokenbody ; 
-    }
-}
-
-# Table
-
-if ( ! $TABLE )
-{
-    print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" ;
-    print "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n" ;
-    print "    \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" ;
-    print "\n" ;
-
-    print "<html>\n";
-    print "<head>\n";
-    print "<title>SPARQL Grammar</title>\n" ;
-    print "<style type=\"text/css\">\n" ;
-
- # .token inline
- # .ruleHead
- # .ruleBody
-
-    print <<'EOF' ;
-div.grammarTable table * { border-width: 0 ; }
-div.grammarTable table * tr { border: 1px solid black ; }
-
-.grammar     { text-align: left ; vertical-align: top ; }
-.token       { color: #3f3f5f; }
-.gRuleHead   { font-style: italic ; font-family: monospace ; }
-.gRuleBody   { font-family: monospace ; }
-.gRuleLabel  { font-family: monospace ; }
-EOF
-
-     print "</style>\n" ;
-     print "</head>\n";
-     print "<body>\n";
-
-    print "\n" ;
-}
-
-print "<div class=\"grammarTable\">\n" ;
-print "  <table><tbody>\n" ;
-
-$ruleNum = 0 ;
-
-for $r (@rules)
-{
-    $DEBUG = 0 ;
-    $ruleNum++ ;
-    $rulename = $r ;
-    
-    $rulebody = $ruleMap{$rulename} ;
-
-##    $DEBUG = 1 if ( $rulename =~ /Prolog/ ) ;
-
-    $rb = $rulebody ;
-
-    if ( $DEBUG )
-    {
-	print STDERR "\n" ;
-	print STDERR "Rule: $rulename\n" ; 
-	print STDERR "Body: $rulebody\n" ; 
-    }
-
-    ## Do before '||' substitution
-    # Not perfect - some fixups later.
-    #$rb =~ s%\|%\<br/\>\|%g ;
-
-    # Escape HTML chars before adding markup.
-    $rb = esc($rb) ;
-    
-    # Inlines
-    for $k (keys %inline)
-    {
-	$s = span('token', $inline{$k}) ;
-	$k = esc($k) ;
-	# Assumes escaped <> round tokens.
-	$k = quotemeta $k ;
-	$rb =~ s/$k/$s/g ;
-
-    }
-
-    if ( $DEBUG )
-    {
-	print STDERR "After inlining\n" ;
-	print STDERR $rb,"\n" ; ; 
-    }
-
-
-    # Add hrefs - issue if one is a substring of another \W helps.
-
-    for $k (keys %ruleMap)
-    {
-	$s = href("r-".$k,$k) ;
-
-	$k = esc($k) ;
-	$k = quotemeta $k ;
-
-## 	if ( $DEBUG )
-## 	{
-## 	  print STDERR "K:$k\n" ;  
-## 	}
-
-
-	$rb =~ s/(?=\W)(\s*)$k(\s*)(?=\W)/$1$s$2/g ;
-	$rb =~ s/^$k(\s*)(?=\W)/$s$1/g ;
-	$rb =~ s/(?=\W)(\s*)$k$/$1$s/g ;
-	$rb =~ s/^$k$/$s/g ;
-    }
-    
-    if ( $DEBUG )
-    {
-	print STDERR "After hrefs\n" ;
-	print STDERR $rb,"\n" ; ; 
-    }
-
-    #exit if $ruleNum > 2 ;
-
-    $rn = anchor("r-".$rulename, $rulename) ;
-    $rn = fixupHead($rn) ;
-
-    print "\n" ;
-    print "<tr valign=\"baseline\">\n" ;
-    $rlabel = '[' . $ruleNum .  ']&nbsp;&nbsp;' ;
-
-    print "  <td>",code('gRuleLabel', $rlabel),"</td>\n" ;
-
-    #print "  <td>",span('gRuleHead', $rn),"</td>\n" ;
-    print "  <td>",code('gRuleHead',$rn),"</td>\n" ;
-
-    print "  <td>&nbsp;&nbsp;::=&nbsp;&nbsp;</td>\n" ;
-    
-    $rb = fixupRule($rulename, $rb) ;
-    print "  <td>",code('gRuleBody',$rb),"</td>\n" ;
-
-    print "</tr>\n" ;
-
-#    $rule{$rulename, $rulebody) ;
-#    print $rulename , "\n" ;
-}
-
-print "  </tbody></table>\n" ;
-print "</div>\n" ;
-
-if ( !$TABLE )
-{
-    print "\n" ;
-    print "</body>\n" ;
-    print "</html>\n" ;
-}
-
-sub readFile
-{
-    my $f = $_[0] ;
-    open(F, "$f") || die "$!"; 
-    my $s = <F> ;
-    return $s ;
-}
-
-sub esc
-{
-    my $s = $_[0] ;
-    $s =~ s/&/&amp;/g ; 
-    $s =~ s/</&lt;/g ; 
-    $s =~ s/>/&gt;/g ; 
-    return $s ;
-}
-
-sub span
-{
-    my $c = $_[0] ;
-    my $t = $_[1] ;
-    $t = esc($t) ;
-    my $s = '<span class="' . $c . '">' . $t . '</span>' ;
-    return $s ;
-}
-
-sub href
-{
-    my $a = $_[0] ;
-    my $t = $_[1] ;
-    $a = sane($a) ;
-    $t = esc($t) ;
-    my $s = '<a href="#' . $a . '">' . $t . '</a>' ;
-    return $s ;
-}
-
-sub anchor
-{
-    my $a = $_[0] ;
-    my $t = $_[1] ;
-    $a = sane($a) ;
-    $t = esc($t) ;
-    my $s = '<a id="' . $a . '" name="' . $a . '">' . $t . '</a>' ;
-    return $s ;
-}
-
-sub sane
-{
-   my $a = $_[0] ;
-   $a =~ s/\W//g ;
-   return $a ;
-}
-
-sub code
-{
-    my $c = $_[0] ;
-    my $t = $_[1] ;
-    return '<code class="' . $c . '">' . $t . '</code>' ;
-}
-
-sub fixupHead
-{
-    my $head = $_[0] ;
-    # Remove <> around tokens.
-    $head =~ s/&lt;(\w+)&gt;/$1/g ;
-    return $head ;
-}
-
-sub fixupRule
-{
-    my $head = $_[0] ;
-    my $body = $_[1] ;
-
-    # Remove unnecessary ()
-    $body =~ s/\(\s*([^()| ]*) \)/$1/g ;
-
-##     if ( $body =~ m!\(\s+(\<a[^>]*\>[^<>]*\</a\>)\s+\)! )
-##     {
-## 	$b = $body ;
-## 	print "================================\n" ;
-## 	print STDERR "$b\n" ;
-## 	print STDERR "--------\n" ;
-## 	$b =~ s!\(\s+(\<a[^>]*\>[^<>]*\</a\>)\s+\)!$1!g ;
-## 	$b =~ s!\(\s+(\<span[^>]*\>[^<>]*\</span\>)\s+\)!$1!g ;
-## 	print STDERR "$b\n" ;
-## 	print STDERR "=====\n" ;
-## 	print STDERR "\n" ;
-##     }
-
-
-    # Remove outer matching () where there are no inner ()
-    $body =~ s/^\(\s+([^\(]*)\s+\)$/$1/ ;
-
-    # ( A )* => A* and for + and ? where A is a linked or spanned object
-    $body =~ s!\(\s+(\<a[^>]*\>[^<>]*\</a\>)\s+\)!$1!g ;
-    $body =~ s!\(\s+(\<span[^>]*\>[^<>]*\</span\>)\s+\)!$1!g ;
-
-    # There aren't any of these
-##    $body =~ s!\(\s+(\S*)\s+\)!$1!g ;
-
-    # Remove <> around tokens.
-    $body =~ s/&lt;(\w+)&gt;/$1/g ;
-
-    # Specials
-    # Split long bodies
-    if ( $head eq "CallExpression" ||
-	 $head eq "UnaryExpression" ||
-	 $head eq "<NCCHAR1p>" ||
-	 $head eq "PatternElement" ||
-	 $head eq "BuiltInCall" )
-    {
-	$body =~ s%\|%\<br/\>\|%g ;
-	$body =~ s/^\s+// ;
-	$body = "&nbsp;&nbsp;".$body ;
-    }
-
-    if ( $head eq "RelationalExpression" ||
-	 $head eq "AdditiveExpression" ||
-	 $head eq "MultiplicativeExpression" ||
-	 $head eq "ConditionalOrExpression")
-    {
-	$body =~ s%\*\(%<br/>\(% ;
-    }
-
-    # These failed the outer () test because they have nested () in them
-    if (  $head eq "QueryPattern" ||
-          $head eq "OrderCondition" )
-    {
-	# Remove outer ()
-	$body =~ s/^\((.*)\)$/$1/ ;	
-    }
-
-    if (  $head eq "Query" )
-    {
-	$body =~ s! \(!<br/>\(! ;
-	$body =~ s!\) !\)<br/>! ;
-    }
-
-    if (  $head =~ m/(Select|Construct|Describe|Ask)Query/ )
-    {
-	# Put a line break before the DatasetClause
-	# <a href="#rDatasetClause">DatasetClause</a>
-	$c = '<a href="#rDatasetClause">DatasetClause</a>' ;
-	$c = quotemeta $c ;
-	# Expects the dataset clause to be unbracketted
-	$body =~ s!(\(\s*$c)!<br/>$1! ;
-    }
-
-    if ( $head eq "OrderCondition" )
-    {
-	$body =~ s!\)\s*\|\s*\(!\)<br/>\| \(! ;
-	$body = "  ".$body ;
-    }
-    return $body ;
-}
diff --git a/jena-arq/Grammar/sse/sse.jj b/jena-arq/Grammar/sse/sse.jj
index b0dbd9df6ec..889ec82f26e 100644
--- a/jena-arq/Grammar/sse/sse.jj
+++ b/jena-arq/Grammar/sse/sse.jj
@@ -197,7 +197,7 @@ void BlankNode() : { Token t ; }
 
 void TripleTerm() :     { Token t1 = null ; Token t2 = null ; }
 {
-    t1 = <LT2>
+    t1 = <L_TRIPLE>
     (<WS>)*
     { tripleTermStart(t1.beginLine, t1.beginColumn); }
     RDFTermAtom()
@@ -206,7 +206,7 @@ void TripleTerm() :     { Token t1 = null ; Token t2 = null ; }
     (<WS>)*
     RDFTermAtom()
     (<WS>)*
-    t2 = <GT2>
+    t2 = <R_TRIPLE>
     { tripleTermFinish(t2.beginLine, t2.beginColumn); }
 }
 
@@ -225,7 +225,7 @@ void RDFLiteral() : { Token t = null ; int currLine ; int currColumn ;
 
   // Optional lang tag and datatype.
   (
-     t = <LANGTAG> { lang = stripChars(t.image, 1) ; }
+     t = <LANG_DIR> { lang = stripChars(t.image, 1) ; }
   |
     <DATATYPE> 
     ( t = <IRIref> { dt_iri  = stripQuotes(t.image) ; }
@@ -245,7 +245,6 @@ void NumericLiteral() : { Token t ; }
    { emitLiteralDouble(t.beginLine, t.beginColumn, t.image) ; }
 }
 
-// Symbol!
 // Node BooleanLiteral() : {}
 // {
 //   <TRUE> { return XSD_TRUE ; }
@@ -253,9 +252,177 @@ void NumericLiteral() : { Token t ; }
 //   <FALSE> { return XSD_FALSE ; }
 // }
 
+TOKEN: { <WS: " " | "\t" | "\n" | "\r" | "\f"> }
+
 // No whitespace skipping.
-#undef SKIP
-#include "tokens.inc"
+// SKIP : { <WS> }    //" " | "\t" | "\n" | "\r" | "\f" }
+
+SPECIAL_TOKEN :
+{
+    <SINGLE_LINE_COMMENT1: "#" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? > 
+|
+    // Lisp-style comments (makes Emacs lisp-mode more useful)
+    <SINGLE_LINE_COMMENT2: ";" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? >
+}
+
+TOKEN:
+{
+   <IRIref:  "<"
+               ( ~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`","\u0000"-"\u0020"]
+               | <UCHAR>
+               )*
+             ">" >
+
+|  <PNAME: (<PN_PREFIX>)? ":" (<PN_LOCAL>)? >
+|  <BLANK_NODE_LABEL: "_:" (<PN_LOCAL>)? >  // Allows no label
+
+    // Co-ordinate with ARQConstants
+    // Named variable - allows no name
+|  <VAR_NAMED:   "?" (<VARNAME>)?>
+
+//     // Non-distinguished variable (BNode in SPARQL)
+// |  <VAR_NAMED2:   "?." (~[" " , "\t" , "\n" , "\r" , "\f",
+//                             "(", ")", "[", "]", "{", "}"])* >
+// 
+// |  <VAR_ANON:     "??" (~[ " " , "\t" , "\n" , "\r" , "\f",
+//                            "(", ")", "[", "]", "{", "}"])* >
+
+| <VAR_OTHER: "?" (<SYM>)+ >
+}
+
+TOKEN :
+{
+  < BOM:     "\uFEFF">
+| < #DIGITS: (["0"-"9"])+>
+| < INTEGER: (["+","-"])? <DIGITS> >
+| < DECIMAL: (["+","-"])? ( <DIGITS> "." (<DIGITS>)* | "." <DIGITS> ) >
+| < DOUBLE:   // Required exponent.
+      ( (["+","-"])? 
+        (["0"-"9"])+ "." (["0"-"9"])* <EXPONENT>
+        | "." (["0"-"9"])+ (<EXPONENT>)
+        | (["0"-"9"])+ <EXPONENT>
+      )
+      >
+| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
+| < #QUOTE_3D: "\"\"\"">
+| < #QUOTE_3S: "'''">
+
+| < #ECHAR:      "\\" ( "t"|"b"|"n"|"r"|"f"|"\\"|"\""|"'") >
+| < #UCHAR:      <UCHAR4> | <UCHAR8> >
+| < #UCHAR4:     "\\" "u" <HEX> <HEX> <HEX> <HEX> >
+| < #UCHAR8:     "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >
+
+| < STRING_LITERAL1: 
+      // Single quoted string
+      "'" ( (~["'","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "'" >
+| < STRING_LITERAL2:
+    // Double quoted string
+      "\"" ( (~["\"","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "\"" >
+| < STRING_LITERAL_LONG1:
+     <QUOTE_3S> 
+      ( ("'" | "''")? (~["'","\\"] | <ECHAR> | <UCHAR> ))*
+     <QUOTE_3S> >
+| < STRING_LITERAL_LONG2: 
+     <QUOTE_3D> 
+      ( ("\"" | "\"\"")? (~["\"","\\"] | <ECHAR> | <UCHAR> ))*
+     <QUOTE_3D> >
+}
+
+TOKEN :
+{
+  < LPAREN:    "(" >
+| < RPAREN:    ")" >
+
+| < LBRACE:    "{" >
+| < RBRACE:    "}" >
+
+| < LBRACKET:  "[" >
+| < RBRACKET:  "]" >
+
+// RDF 1.2 triple term.
+| < L_TRIPLE : "<<(" >
+| < R_TRIPLE : ")>>" >
+}
+
+// Specials for literals trailing parts
+// Otherwise include in Symbol() rule for when out of position.
+TOKEN :
+{
+  < DATATYPE: "^^" >
+|  <LANG_DIR: <AT> (<A2Z>)+("-" (<A2ZN>)+)* ( "--" (<A2Z>)* )? >
+| < #AT: "@">
+|  <#A2Z: ["a"-"z","A"-"Z"]>
+|  <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
+}
+
+TOKEN:
+{
+  <#PN_CHARS_BASE:
+          ["A"-"Z"] | ["a"-"z"] |
+          ["\u00C0"-"\u00D6"] | ["\u00D8"-"\u00F6"] | ["\u00F8"-"\u02FF"] |
+          ["\u0370"-"\u037D"] | ["\u037F"-"\u1FFF"] |
+          ["\u200C"-"\u200D"] | ["\u2070"-"\u218F"] | ["\u2C00"-"\u2FEF"] |
+          ["\u3001"-"\uD7FF"] | ["\uF900"-"\uFFFD"]
+          // | [#x10000-#xEFFFF]
+          >
+|
+  // With underscore
+  <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
+|
+  <#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
+              ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
+|
+  // No leading "_", no trailing ".", can have dot inside prefix name.
+  <#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)?  >
+|
+  // Local part.
+  <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> ) 
+              ( (<PN_CHARS> | "." |":" | <PLX> )* 
+                (<PN_CHARS> | ":" | <PLX>) )?  >
+|
+  <#VARNAME: ( <PN_CHARS_U> | ["0"-"9"] )
+             ( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
+               ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
+|
+  < #PN_LOCAL_ESC: "\\" 
+          ( "_" | 
+            "~" | "." | "-" | "!" | "$" | "&" | "'" | 
+           "(" | ")" | "*" | "+" | "," | ";" | "=" | 
+           "/" | "?" | "#" | "@" | "%" ) >
+|
+  <#PLX:  <PERCENT> | <PN_LOCAL_ESC> >
+|
+  < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
+|
+  < #PERCENT: "%" <HEX> <HEX> >
+
+}
+
+TOKEN:
+{
+  // Anything left that isn't structural
+  // Excludes:
+  //   LPAREN and RPAREN / LBRACKET/RBRACKET / LBRACE/RBRACE
+  //   Quotes, Whitespace
+  <#SYM:  (~["<", ">", "(", ")", "[", "]", "{", "}", "'", "\"", " ", "\t","\n","\r","\f" ])>
+|
+  <#SYM1: (~["^", "@",
+             "(", ")", "[", "]", "{", "}", "'", "\"", " ", "\t","\n","\r","\f" ])>
+| <#SYM_ESC: "\\" ( " " | "'" | "\"" ) >
+|
+  <SYMBOL: ( "<" | ">" 
+           | (<SYM1> (<SYM>)*)
+           ) >
+}
+
+// Catch-all tokens.  Must be last.  
+// Any non-whitespace.  Causes a parser exception, rather than a
+// token manager error (with hidden line numbers).
+// Only bad IRIs (e.g. spaces) now give unhelpful parse errors.
+TOKEN:
+{
+  <#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
+}
 
 /*
 # Local Variables:
diff --git a/jena-arq/Grammar/sse/tokens.inc b/jena-arq/Grammar/sse/tokens.inc
deleted file mode 100644
index 211dfaff036..00000000000
--- a/jena-arq/Grammar/sse/tokens.inc
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Basic tokens for SPARQL / RDF terms.
-// SSE - SPARQL S-Expressions
-// Not the keywords.
-
-
-TOKEN: { <WS: " " | "\t" | "\n" | "\r" | "\f"> }
-
-#ifdef SKIP
-SKIP : { <WS> }    //" " | "\t" | "\n" | "\r" | "\f" }
-#endif
-
-SPECIAL_TOKEN :
-{
-    <SINGLE_LINE_COMMENT1: "#" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? > 
-|
-    // Lisp-style comments (makes Emacs lisp-mode more useful
-    <SINGLE_LINE_COMMENT2: ";" (~["\n","\r"])* ("\n"|"\r"|"\r\n")? >
-}
-
-TOKEN:
-{
-   <IRIref:  "<"
-               ( ~[ ">","<", "\"", "{", "}", "^", "\\", "|", "`","\u0000"-"\u0020"]
-               | <UCHAR>
-               )*
-             ">" >
-
-|  <PNAME: (<PN_PREFIX>)? ":" (<PN_LOCAL>)? >
-|  <BLANK_NODE_LABEL: "_:" (<PN_LOCAL>)? >  // Allows no label
-
-    // Co-ordinate with ARQConstants
-    // Named variable - allows no name
-|  <VAR_NAMED:   "?" (<VARNAME>)?>
-
-//     // Non-distinguished variable (BNode in SPARQL)
-// |  <VAR_NAMED2:   "?." (~[" " , "\t" , "\n" , "\r" , "\f",
-//                             "(", ")", "[", "]", "{", "}"])* >
-// 
-// |  <VAR_ANON:     "??" (~[ " " , "\t" , "\n" , "\r" , "\f",
-//                            "(", ")", "[", "]", "{", "}"])* >
-
-| <VAR_OTHER: "?" (<SYM>)+ >
-}
-
-TOKEN :
-{
-  < BOM:     "\uFEFF">
-| < #DIGITS: (["0"-"9"])+>
-| < INTEGER: (["+","-"])? <DIGITS> >
-| < DECIMAL: (["+","-"])? ( <DIGITS> "." (<DIGITS>)* | "." <DIGITS> ) >
-| < DOUBLE:   // Required exponent.
-      ( (["+","-"])? 
-        (["0"-"9"])+ "." (["0"-"9"])* <EXPONENT>
-        | "." (["0"-"9"])+ (<EXPONENT>)
-        | (["0"-"9"])+ <EXPONENT>
-      )
-      >
-| < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
-| < #QUOTE_3D: "\"\"\"">
-| < #QUOTE_3S: "'''">
-
-| < #ECHAR:      "\\" ( "t"|"b"|"n"|"r"|"f"|"\\"|"\""|"'") >
-| < #UCHAR:      <UCHAR4> | <UCHAR8> >
-| < #UCHAR4:     "\\" "u" <HEX> <HEX> <HEX> <HEX> >
-| < #UCHAR8:     "\\" "U" <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> <HEX> >
-
-| < STRING_LITERAL1: 
-      // Single quoted string
-      "'" ( (~["'","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "'" >
-| < STRING_LITERAL2:
-    // Double quoted string
-      "\"" ( (~["\"","\\","\n","\r"]) | <ECHAR> | <UCHAR> )* "\"" >
-| < STRING_LITERAL_LONG1:
-     <QUOTE_3S> 
-      ( ("'" | "''")? (~["'","\\"] | <ECHAR> | <UCHAR> ))*
-     <QUOTE_3S> >
-| < STRING_LITERAL_LONG2: 
-     <QUOTE_3D> 
-      ( ("\"" | "\"\"")? (~["\"","\\"] | <ECHAR> | <UCHAR> ))*
-     <QUOTE_3D> >
-}
-
-TOKEN :
-{
-  < LPAREN:    "(" >
-| < RPAREN:    ")" >
-
-| < LBRACE:    "{" >
-| < RBRACE:    "}" >
-
-| < LBRACKET:  "[" >
-| < RBRACKET:  "]" >
-
-// RDF-start quoted triple. written with <<>>.,not (qtriple...)
-| < LT2 : "<<" >
-| < GT2 : ">>" >
-}
-
-// Specials for literals trailing parts
-// Otherwise include in Symbol() rule for when out of position.
-TOKEN :
-{
-  < DATATYPE: "^^" >
-|  <LANGTAG: <AT> (<A2Z>)+("-" (<A2ZN>)+)* > : DEFAULT
-| < #AT: "@">
-|  <#A2Z: ["a"-"z","A"-"Z"]>
-|  <#A2ZN: ["a"-"z","A"-"Z","0"-"9"]>
-}
-
-TOKEN:
-{
-  <#PN_CHARS_BASE:
-          ["A"-"Z"] | ["a"-"z"] |
-          ["\u00C0"-"\u00D6"] | ["\u00D8"-"\u00F6"] | ["\u00F8"-"\u02FF"] |
-          ["\u0370"-"\u037D"] | ["\u037F"-"\u1FFF"] |
-          ["\u200C"-"\u200D"] | ["\u2070"-"\u218F"] | ["\u2C00"-"\u2FEF"] |
-          ["\u3001"-"\uD7FF"] | ["\uF900"-"\uFFFD"]
-          // | [#x10000-#xEFFFF]
-          >
-|
-  // With underscore
-  <#PN_CHARS_U: <PN_CHARS_BASE> | "_" >
-|
-  <#PN_CHARS: (<PN_CHARS_U> | "-" | ["0"-"9"] | "\u00B7" |
-              ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] ) >
-|
-  // No leading "_", no trailing ".", can have dot inside prefix name.
-  <#PN_PREFIX: <PN_CHARS_BASE> ((<PN_CHARS>|".")* <PN_CHARS>)?  >
-|
-  // Local part.
-  <#PN_LOCAL: (<PN_CHARS_U> | ":" | ["0"-"9"] | <PLX> ) 
-              ( (<PN_CHARS> | "." |":" | <PLX> )* 
-                (<PN_CHARS> | ":" | <PLX>) )?  >
-|
-  <#VARNAME: ( <PN_CHARS_U> | ["0"-"9"] )
-             ( <PN_CHARS_U> | ["0"-"9"] | "\u00B7" |
-               ["\u0300"-"\u036F"] | ["\u203F"-"\u2040"] )* >
-|
-  < #PN_LOCAL_ESC: "\\" 
-          ( "_" | 
-            "~" | "." | "-" | "!" | "$" | "&" | "'" | 
-           "(" | ")" | "*" | "+" | "," | ";" | "=" | 
-           "/" | "?" | "#" | "@" | "%" ) >
-|
-  <#PLX:  <PERCENT> | <PN_LOCAL_ESC> >
-|
-  < #HEX: ["0"-"9"] | ["A"-"F"] | ["a"-"f"] >
-|
-  < #PERCENT: "%" <HEX> <HEX> >
-
-}
-
-TOKEN:
-{
-  // Anything left that isn't structural
-  // Excludes:
-  //   LPAREN and RPAREN / LBRACKET/RBRACKET / LBRACE/RBRACE
-  //   Quotes, Whitespace
-  <#SYM:  (~["<", ">", "(", ")", "[", "]", "{", "}", "'", "\"", " ", "\t","\n","\r","\f" ])>
-|
-  <#SYM1: (~["^", "@",
-             "(", ")", "[", "]", "{", "}", "'", "\"", " ", "\t","\n","\r","\f" ])>
-| <#SYM_ESC: "\\" ( " " | "'" | "\"" ) >
-|
-  <SYMBOL: ( "<" | ">" 
-           | (<SYM1> (<SYM>)*)
-           ) >
-}
-
-// Catch-all tokens.  Must be last.  
-// Any non-whitespace.  Causes a parser exception, rather than a
-// token manager error (with hidden line numbers).
-// Only bad IRIs (e.g. spaces) now give unhelpful parse errors.
-TOKEN:
-{
-  <#UNKNOWN: (~[" ","\t","\n","\r","\f" ])+ >
-}
-
-/*
-# Local Variables:
-# tab-width: 4
-# indent-tabs-mode: nil
-# comment-default-style: "//"
-# End:
-*/
diff --git a/jena-arq/Grammar/tokens.txt b/jena-arq/Grammar/tokens.txt
index 83a45a1c070..9e706184fe7 100644
--- a/jena-arq/Grammar/tokens.txt
+++ b/jena-arq/Grammar/tokens.txt
@@ -12,7 +12,11 @@
 
 <VAR1>       ::= '?' <VARNAME>
 <VAR2>       ::= '$' <VARNAME>
-<LANGTAG>    ::= '@' [a-zA-Z]+ ('-' [a-zA-Z0-9]+)*
+
+// SPARQL 1.1
+// <LANGTAG>    ::= '@' [a-zA-Z]+ ('-' [a-zA-Z0-9]+)*
+// SPARQL 1.2
+<LANG_DIR>    ::= '@' [a-zA-Z]+ ('-' [a-zA-Z0-9]+)* ('--' [a-zA-Z]+)?
 
 <INTEGER>	::= [0-9]+
 <DECIMAL>   ::= ( [0-9]* '.' [0-9]+ )
@@ -91,20 +95,26 @@
 
 [<SERVICE>]    ::=    'SERVICE'
 [<MINUS_P>]    ::=    'MINUS'
-[<DIFF>]       ::=    'DIFF'
 [<EXISTS>]     ::=    'EXISTS'
 [<NOT>]        ::=    'NOT'
-[<UNSAID>]     ::=    'UNSAID'
+// [<DIFF>]       ::=    'DIFF'
+// [<UNSAID>]     ::=    'UNSAID'
 [<LET>]        ::=    'LET'
 [<BIND>]       ::=    'BIND'
-[<FIND>]       ::=    'FIND'
+// [<FIND>]       ::=    'FIND'
 
 [<FILTER>]     ::= 'FILTER'
 [<REGEXP>]     ::= 'REGEXP'
 [<GRAPH>]      ::= 'GRAPH'
 [<UNION>]      ::= 'UNION'
 [<OPTIONAL>]   ::= 'OPTIONAL'
+
 [<LATERAL>]    ::= 'LATERAL'
+[<SEMIJOIN>]   ::= 'SEMIJOIN'
+[<ANTIJOIN>]   ::= 'ANTIJOIN'
+
+[<UNFOLD>]     ::= 'UNFOLD'
+
 [<BOUND>]      ::= 'BOUND'
 [<COALESCE>]   ::= 'COALESCE'
 [<IF>]         ::= 'IF'
@@ -114,10 +124,14 @@
 [<BNODE>]      ::= 'BNODE'
 [<LITERAL>]    ::= 'LITERAL'
 [<DTYPE>]      ::= 'DATATYPE'
+[<isLANG>]     ::= 'isLANG'
+[<isLANGDIR>]  ::= 'isLANGDIR'
 [<LANG>]       ::= 'LANG'
-[<LANGMATCHES>] ::= 'LANGMATCHES'
+[<LANGMATCHES>]  ::= 'LANGMATCHES'
+[<LANGDIR>]    ::= 'LANGDIR'
 
 [<STRLANG>]     ::= 'STRLANG'
+[<STRLANGDIR>]  ::= 'STRLANGDIR'
 [<STRDT>]       ::= 'STRDT'
 [<IN>]          ::= 'IN'
 
@@ -174,6 +188,8 @@
 [<IS_BLANK>]   ::= 'isBLANK'
 [<IS_LITERAL>] ::= 'isLITERAL'
 [<IS_NUMERIC>] ::= 'isNUMERIC'
+[<HAS_LANG>]     ::= 'hasLANG'
+[<HAS_LANGDIR>]  ::= 'hasLANGDIR'
 [<SAME_TERM>]  ::= 'sameTerm'
 [<REGEX>]      ::= 'REGEX'
 [<TRUE>]       ::= 'true'
@@ -238,10 +254,14 @@
 [<DOT>]        ::= '.'
 [<GT>]         ::= '>'
 [<LT>]         ::= '<'
+[<L_TRIPLE>]   ::= '<<('
+[<R_TRIPLE>]   ::= ')>>'
 [<GT2>]        ::= '>>'
 [<LT2>]        ::= '<<'
 [<L_ANN>]      ::= '{|'
 [<R_ANN>]      ::= '|}'
+[<TILDE>]      ::= '~'
+
 [<BANG>]       ::= '!'
 [<HOOK>]       ::= '?'
 [<COLON>]      ::= ':'
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java b/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
index b74f635cb91..e15f6b6fb4f 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ParameterizedSparqlString.java
@@ -483,7 +483,7 @@ public void appendIri(IRIx iri) {
      *            Lexical Value
      */
     public void appendLiteral(String value) {
-        this.appendNode(NodeFactoryExtra.createLiteralNode(value, null, null));
+        this.appendNode(NodeFactory.createLiteralString(value));
     }
 
     /**
@@ -496,7 +496,22 @@ public void appendLiteral(String value) {
      *            Language
      */
     public void appendLiteral(String value, String lang) {
-        this.appendNode(NodeFactoryExtra.createLiteralNode(value, lang, null));
+        this.appendNode(NodeFactory.createLiteralLang(value, lang));
+    }
+
+    /**
+     * Appends a literal with a lexical value, language and base direction to the command text
+     * as a constant using appropriate formatting
+     *
+     * @param value
+     *            Lexical Value
+     * @param lang
+     *            Language
+     * @param direction
+     *            Base direction
+     */
+    public void appendLiteral(String value, String lang, String direction) {
+        this.appendNode(NodeFactory.createLiteralDirLang(value, lang, direction));
     }
 
     /**
@@ -509,7 +524,7 @@ public void appendLiteral(String value, String lang) {
      *            Datatype
      */
     public void appendLiteral(String value, RDFDatatype datatype) {
-        this.appendNode(NodeFactoryExtra.createLiteralNode(value, null, datatype.getURI()));
+        this.appendNode(NodeFactory.createLiteralDT(value, datatype));
     }
 
     /**
@@ -866,7 +881,7 @@ public void setLiteral(String var, Literal lit) {
      *
      */
     public void setLiteral(int index, String value) {
-        this.setParam(index, NodeFactoryExtra.createLiteralNode(value, null, null));
+        this.setParam(index, NodeFactory.createLiteralString(value));
     }
 
     /**
@@ -883,7 +898,7 @@ public void setLiteral(int index, String value) {
      *
      */
     public void setLiteral(String var, String value) {
-        this.setParam(var, NodeFactoryExtra.createLiteralNode(value, null, null));
+        this.setParam(var, NodeFactory.createLiteralString(value));
     }
 
     /**
@@ -902,7 +917,47 @@ public void setLiteral(String var, String value) {
      *
      */
     public void setLiteral(int index, String value, String lang) {
-        this.setParam(index, NodeFactoryExtra.createLiteralNode(value, lang, null));
+        this.setParam(index, NodeFactory.createLiteralLang(value, lang));
+    }
+
+    /**
+     * Sets a variable parameter to a literal with a language
+     * <p>
+     * Setting a parameter to null is equivalent to calling
+     * {@link #clearParam(String)} for the given variable
+     * </p>
+     *
+     * @param var
+     *            Variable
+     * @param value
+     *            Lexical Value
+     * @param lang
+     *            Language
+     * @param baseDirection
+     *            Base direction
+     */
+    public void setLiteral(String var, String value, String lang, String baseDirection) {
+        this.setParam(var, NodeFactory.createLiteralDirLang(value, lang, baseDirection));
+    }
+
+    /**
+     * Sets a positional parameter to a literal with a language and base direction
+     * <p>
+     * Setting a parameter to null is equivalent to calling
+     * {@link #clearParam(int)} for the given index
+     * </p>
+     *
+     * @param index
+     *            Positional index
+     * @param value
+     *            Lexical Value
+     * @param lang
+     *            Language
+     * @param baseDirection
+     *            Base direction
+     */
+    public void setLiteral(int index, String value, String lang, String baseDirection) {
+        this.setParam(index, NodeFactory.createLiteralDirLang(value, lang, baseDirection));
     }
 
     /**
@@ -921,7 +976,7 @@ public void setLiteral(int index, String value, String lang) {
      *
      */
     public void setLiteral(String var, String value, String lang) {
-        this.setParam(var, NodeFactoryExtra.createLiteralNode(value, lang, null));
+        this.setParam(var, NodeFactory.createLiteralLang(value, lang));
     }
 
     /**
@@ -940,7 +995,7 @@ public void setLiteral(String var, String value, String lang) {
      *
      */
     public void setLiteral(int index, String value, RDFDatatype datatype) {
-        this.setParam(index, this.model.createTypedLiteral(value, datatype));
+        this.setParam(index, NodeFactory.createLiteralDT(value, datatype));
     }
 
     /**
@@ -959,7 +1014,7 @@ public void setLiteral(int index, String value, RDFDatatype datatype) {
      *
      */
     public void setLiteral(String var, String value, RDFDatatype datatype) {
-        this.setParam(var, this.model.createTypedLiteral(value, datatype));
+        this.setParam(var, NodeFactory.createLiteralDT(value, datatype));
     }
 
     /**
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java
index 1141767fb2a..f1c0a3e0cf6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java
@@ -58,6 +58,16 @@ protected final Token peekToken() {
         return peekIter.peek();
     }
 
+    // Development!
+    protected final void printToken() {
+        if ( tokenEOF != null ) {
+            System.out.println("<EOF>");
+            return;
+        }
+        Token token = peekToken();
+        System.out.println(token);
+    }
+
     // Set when we get to EOF to record line/col of the EOF.
     private Token tokenEOF = null;
 
@@ -134,11 +144,17 @@ protected final void expect(String msg, TokenType ttype) {
 
     protected final void exception(Token token, String msg, Object... args) {
         if ( token != null )
-            exceptionDirect(String.format(msg, args), token.getLine(), token.getColumn());
+            exception(String.format(msg, args), token.getLine(), token.getColumn());
         else
-            exceptionDirect(String.format(msg, args), -1, -1);
+            exception(String.format(msg, args), -1, -1);
+    }
+
+    protected final void exception(String msg, long line, long col) {
+        raiseException(new RiotParseException(msg, line, col));
     }
 
+    /** @deprecated use {@link #exception(String, long, long)}*/
+    @Deprecated(forRemoval = true)
     protected final void exceptionDirect(String msg, long line, long col) {
         raiseException(new RiotParseException(msg, line, col));
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java
index 76c66043501..3b35dd241ab 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java
@@ -58,33 +58,10 @@ protected final void runParser() {
 
     @Override
     protected final Quad parseOne() {
-        Token sToken = nextToken();
-        if ( sToken.isEOF() )
-            exception(sToken, "Premature end of file: %s", sToken);
-        Node s;
-        if ( sToken.hasType(TokenType.LT2) )
-            s = parseTripleTerm();
-        else {
-            checkIRIOrBNode(sToken);
-            s = tokenAsNode(sToken);
-        }
-
-        Token pToken = nextToken();
-        if ( pToken.isEOF() )
-            exception(pToken, "Premature end of file: %s", pToken);
-        checkIRI(pToken);
-        Node p = tokenAsNode(pToken);
-
-        Token oToken = nextToken();
-        if ( oToken.isEOF() )
-            exception(oToken, "Premature end of file: %s", oToken);
-        Node o;
-        if ( oToken.hasType(TokenType.LT2) )
-            o = parseTripleTerm();
-        else {
-            checkRDFTerm(oToken);
-            o = tokenAsNode(oToken);
-        }
+        Token token = peekToken();
+        Node s = parseSubject();
+        Node p = parsePredicate();
+        Node o = parseObject();
 
         Token xToken = nextToken();    // Maybe DOT
         if ( xToken.getType() == TokenType.EOF )
@@ -97,8 +74,6 @@ protected final Quad parseOne() {
         if ( xToken.getType() != TokenType.DOT ) {
             // Allow bNodes for graph names.
             checkIRIOrBNode(xToken);
-            // Allow only IRIs
-            // checkIRI(xToken) ;
             c = tokenAsNode(xToken);
             xToken = nextToken();
             currentGraph = c;
@@ -111,7 +86,7 @@ protected final Quad parseOne() {
         if ( xToken.getType() != TokenType.DOT )
             exception(xToken, "Quad not terminated by DOT: %s", xToken);
 
-        return profile.createQuad(c, s, p, o, sToken.getLine(), sToken.getColumn());
+        return profile.createQuad(c, s, p, o, token.getLine(), token.getColumn());
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
index ff65640dbb6..c90e0f9fa87 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTuple.java
@@ -81,43 +81,63 @@ protected void skipOne(X object, String printForm, long line, long col) {
 
     // One triple, not including terminator.
     protected final Triple parseTriple() {
+        Token token = peekToken();
+        Node s = parseSubject();
+        Node p = parsePredicate();
+        Node o = parseObject();
+        return profile.createTriple(s, p, o, token.getLine(), token.getColumn());
+    }
+
+    protected final Node parseSubject() {
+        // If we allow triple term in the subject position.
+        // These would be rejected when the triple is created by the standard parser profile.
+        //Node s = parseRDFTerm("subject");
+
         Token sToken = nextToken();
         if ( sToken.isEOF() )
             exception(sToken, "Premature end of file: %s", sToken);
-        Node s;
-        if ( sToken.hasType(TokenType.LT2) )
-            s = parseTripleTerm();
-        else {
-            checkIRIOrBNode(sToken);
-            s = tokenAsNode(sToken);
-        }
+        checkIRIOrBNode(sToken);
+        Node s = tokenAsNode(sToken);
+        return s;
+    }
 
+    // Parse, must be a URI.
+    protected final Node parsePredicate() {
         Token pToken = nextToken();
         if ( pToken.isEOF() )
             exception(pToken, "Premature end of file: %s", pToken);
         checkIRI(pToken);
         Node p = tokenAsNode(pToken);
+        return p;
+    }
+
+    // Parse, must be a URI.
+    protected final Node parseObject() {
+        return parseRDFTerm("object");
+    }
 
-        Token oToken = nextToken();
-        if ( oToken.isEOF() )
-            exception(oToken, "Premature end of file: %s", oToken);
-        Node o;
-        if ( oToken.hasType(TokenType.LT2) )
-            o = parseTripleTerm();
+    // General subject/object term
+    protected final Node parseRDFTerm(String posn) {
+        Token token = nextToken();
+        if ( token.isEOF() )
+            exception(token, "Premature end of file: %s", token);
+        Node term;
+        if ( token.hasType(TokenType.L_TRIPLE) )
+            term = parseTripleTerm();
         else {
-            checkRDFTerm(oToken);
-            o = tokenAsNode(oToken);
+            checkRDFTerm(posn, token);
+            term = tokenAsNode(token);
         }
-        return profile.createTriple(s, p, o, sToken.getLine(), sToken.getColumn());
+        return term;
     }
 
-    // Looking at "<<" (LT2)
-    final protected Node parseTripleTerm() {
+    // Looking at "<<(" (L_TRIPLE)
+    protected final Node parseTripleTerm() {
         Triple t = parseTriple();
         Token x = nextToken();
-        if ( x.getType() != TokenType.GT2 )
-            exception(x, "Triple term not terminated by >>: %s", x);
-        return NodeFactory.createTripleNode(t);
+        if ( x.getType() != TokenType.R_TRIPLE )
+            exception(x, "Triple term not terminated by )>>: %s", x);
+        return NodeFactory.createTripleTerm(t);
     }
 
     protected final void checkIRIOrBNode(Token token) {
@@ -134,7 +154,7 @@ protected final void checkIRI(Token token) {
         exception(token, "Expected IRI: Got: %s", token);
     }
 
-    protected final void checkRDFTerm(Token token) {
+    protected final void checkRDFTerm(String posn, Token token) {
         switch (token.getType()) {
             case IRI:
             case BNODE:
@@ -147,7 +167,7 @@ protected final void checkRDFTerm(Token token) {
                 checkString(token.getSubToken1());
                 return ;
             default:
-                exception(token, "Illegal object: %s", token) ;
+                exception(token, "Illegal %s: %s", posn, token) ;
         }
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
index 4b35158057d..15982c4d1cf 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
@@ -45,12 +45,14 @@ public Lang getLang() {
 
     @Override
     protected final void oneTopLevelElement() {
-        //oneNamedGraphBlock() ;
-        oneNamedGraphBlock2() ;
+        //oneNamedGraphBlockOriginal() ;
+        oneNamedGraphBlock() ;
     }
 
-    // Version for proposed Turtle-in-TriG and keyword GRAPH
-    protected final void oneNamedGraphBlock2() {
+    // RDF 1.1 TriG
+    //   Default graph can Turtle (i.e. no braces)
+    //   keyword GRAPH
+    protected final void oneNamedGraphBlock() {
         // Which may not be a graph block.
         Node graphNode = null ;
         Token token = peekToken() ;
@@ -99,7 +101,6 @@ protected final void oneNamedGraphBlock2() {
             } else {
                 // [ :p ... ]
                 // [ :p ... ] :p ...
-                // XXX This fragment must be in Turtle somewhere
                 if ( mustBeNamedGraph )
                     exception(t, "Keyword 'GRAPH' must start a named graph") ;
                 triplesBlankNode(blank) ;
@@ -113,7 +114,6 @@ protected final void oneNamedGraphBlock2() {
         } else if ( token.isNode() ) {
             // Either :s :p :o or :g { ... }
             Node n = node() ;
-            nextToken() ;
             token = peekToken() ;
             if ( lookingAt(LBRACE) )
                 graphNode = n ;
@@ -147,36 +147,36 @@ protected final void turtle(Node n) {
 
     protected final void turtle() {
         // This does expectEndOfTriplesTurtle() ;
-        triplesSameSubject() ;
+        triples() ;
     }
 
-    // Old version , tradition trig with RDF 1.1 Turtle tokens.
-    protected final void oneNamedGraphBlock() {
-        // Directives are only between graph blocks.
-        Node graphNode = null ;
-        Token token = peekToken() ;
-        Token t = token ; // Keep for error message.
-
-        // [ ] { ... }
-        if ( lookingAt(LBRACKET) ) {
-            nextToken() ;
-            token = peekToken() ;
-            if ( lookingAt(RBRACKET) )
-                exception(t, "Broken term: [ not followed by ]") ;
-
-            graphNode = profile.createBlankNode(graphNode, t.getLine(), t.getColumn()) ;
-            nextToken() ;
-        } else {
-            // <uri> { ... }
-            // { ... }
-            if ( token.isNode() ) {
-                graphNode = node() ;
-                nextToken() ;
-            }
-        }
-
-        bracedGraph(t, graphNode) ;
-    }
+//    // Pre RDF 1.1 standardization. Tradition trig with RDF 1.1 Turtle tokens.
+//    // Default graph is always { ... }
+//    protected final void oneNamedGraphBlockOriginal() {
+//        // Directives are only between graph blocks.
+//        Node graphNode = null ;
+//        Token token = peekToken() ;
+//        Token t = token ; // Keep for error message.
+//
+//        // [ ] { ... }
+//        if ( lookingAt(LBRACKET) ) {
+//            nextToken() ;
+//            token = peekToken() ;
+//            if ( lookingAt(RBRACKET) )
+//                exception(t, "Broken term: [ not followed by ]") ;
+//
+//            graphNode = profile.createBlankNode(graphNode, t.getLine(), t.getColumn()) ;
+//            nextToken() ;
+//        } else {
+//            // <uri> { ... }
+//            // { ... }
+//            if ( token.isNode() ) {
+//                graphNode = node() ;
+//            }
+//        }
+//
+//        bracedGraph(t, graphNode) ;
+//    }
 
     private void bracedGraph(Token t, Node graphNode) {
         if ( graphNode != null ) {
@@ -213,7 +213,7 @@ private void bracedGraph(Token t, Node graphNode) {
             // this does not assume that we are definitely entering
             // this state and can throw an error if the first token
             // is not acceptable.
-            triplesSameSubject() ;
+            triples() ;
         }
 
         // **** Turtle.
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java
index f8a947032b4..373a3e77904 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java
@@ -43,7 +43,7 @@ public Lang getLang() {
 
     @Override
     protected final void oneTopLevelElement() {
-        triplesSameSubject() ;
+        triples() ;
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
index 863d5042610..ef8cb2264a3 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
@@ -30,7 +30,15 @@
 import org.apache.jena.riot.tokens.Tokenizer;
 import org.apache.jena.sparql.graph.NodeConst;
 
-/** The main engine for all things Turtle-ish (Turtle, TriG). */
+/**
+ * The main engine for all things Turtle-ish (Turtle, TriG).
+ * <p>
+ * This parser generates a form of generalized RDF
+ * with literals and triple terms as subjects,
+ * but not arbitrary predicates.
+ * <p>
+ * The additional conditions area applied when the triples are created by the {@link ParserProfile}
+ */
 public abstract class LangTurtleBase extends LangBase {
     // See http://www.w3.org/TR/turtle/
     // Some predicates (if accepted)
@@ -165,32 +173,33 @@ protected final void directiveBase() {
         nextToken();
     }
 
+    // [8] triples ::= subject predicateObjectList
+    //               | blankNodePropertyList predicateObjectList?
+    //               | reifiedTriple predicateObjectList?
+    //
     // Unlike many operations in this parser suite
     // this does not assume that we are definitely
     // entering this state. It does checks and may
     // signal a parse exception.
 
-    protected final void triplesSameSubject() {
+    protected final void triples() {
         // Either a IRI/prefixed name or a construct that generates triples
-
-        // TriplesSameSubject -> Term PropertyListNotEmpty
+        //     subject predicateObjectList
         if ( lookingAt(NODE) ) {
-            triples();
+            triplesSameSubject();
             return;
         }
 
         boolean maybeList = lookingAt(LPAREN);
 
-        // Turtle: TriplesSameSubject -> TriplesNode PropertyList?
-        // TriG:   (blankNodePropertyList | collection) predicateObjectList? '.'
-        //         labelOrSubject (wrappedGraph | predicateObjectList '.')
-        if ( peekTriplesNodeCompound() ) {
+        //     blankNodePropertyList predicateObjectList?
+        if ( peekTriplesNodeCompound() ) { // LBRACKET, LBRACE, LPAREN
             Node n = triplesNodeCompound();
 
             // May be followed by:
-            // A predicateObject list
-            // A DOT or EOF.
-            // But if a DOT or EOF, then it can't have been () or [].
+            //   A predicateObject list
+            //   A DOT or EOF.
+            //   But if a DOT or EOF, then it can't have been () or [].
 
             // Turtle, as spec'ed does not allow
             // (1 2 3 4) .
@@ -224,61 +233,221 @@ protected final void triplesSameSubject() {
             return;
         }
 
+        // RDF 1.2
+        // reified triple,possible a declaration (empty predicateObjectList).
+        //     reifiedTriple predicateObjectList?
         // <<>> subject position. Rule [10]
         if ( lookingAt(LT2) ) {
-            Node subject = parseTripleTerm();
+            Node subject = parseReifiedTriple();
+            // predicateObjectList may be empty - peek for DOT.
+            if ( lookingAt(DOT) ) {
+                // ReifiedTriple declaration.
+                nextToken();
+                return;
+            }
             predicateObjectList(subject);
             expectEndOfTriples();
             return;
         }
 
+        // Triple Term in the subject position.
+        // This generates an error as the triple is created.
+        // The parser is more general.
+        if ( lookingAt(L_TRIPLE) ) {
+            // [RDF-1.2]
+            // ttSubject
+            // predicate
+            // ttObject
+            Node subject = parseTripleTerm();
+            // XXX Cleaner error handling to be general.
+            exception(peekToken(), "Subject is a triple term");
+//            predicateObjectList(subject);
+//            expectEndOfTriples();
+            return;
+        }
         exception(peekToken(), "Out of place: %s", peekToken());
     }
 
-    // Parse a << >> : RDF-star
-    // XXX Update grammar extract to RDF-star CG report.
-    /* The Turtle grammar is:
-            tripleX ::= ’<<’ subjectX predicate objectX ’>>’
-            subjectX ::= iri | BlankNode | tripleX
-            objectX ::= iri | BlankNode | literal | tripleX
-            [10x]    subject ::= iri | BlankNode | collection | tripleX
-            [12x]    object ::= iri | BlankNode | collection | blankNodePropertyList | literal | tripleX
-       i.e. no compounds inside <<>>
-     */
-
+    // RDF 1.2
+    // [26]  reifiedTriple ::= '<<' (subject | reifiedTriple) verb object reifier? '>>'
+    // [26]  reifiedTriple ::= '<<' rtSubject verb rtObject reifier? '>>'
     // Assumes looking at << (LT2) on entry
-    // node() or nodeX
-    private Node parseTripleTerm() {
-        Token token = nextToken();
-        Node s = subjectX();
+    private Node parseReifiedTriple() {
+        Token startToken = nextToken(); // LT2
+        long startLine = startToken.getLine();
+        long startColumn = startToken.getColumn();
 
-        Node p = predicate();  // predicate() == node();nextToken();
-        nextToken();
+        Node s = rtSubject(startToken);
+        Node p = predicate();
+        // rtObject - no blankPredicateObjectList or collection.
+        Node o = rtObject(startToken);
 
-        Node o = objectX();
+        Node reif = possibleReifier(s, p, o, startLine, startColumn);
 
         if ( ! lookingAt(GT2) )
             exception(peekToken(), "Expected >>, found %s", peekToken().text());
         nextToken();
 
-        return profile.createTripleNode(s, p, o, token.getLine(), token.getColumn());
+        Node tripleTerm = profile.createTripleTerm(s, p, o, startLine, startColumn);
+        // XXX profile.createTripleReifier
+        // emitTripleReifier(s, p, o, startReifiedTripleToken.getLine(), startReifiedTripleToken.getColumn());
+        emitTriple(reif, NodeConst.nodeReifies, tripleTerm);
+
+        return reif;
+    }
+
+    // -- rtSubject rules
+    // ??? profile.isValidTriple(s,p,o);
+    //profile.createTriple(s, p, o, token.getLine(), token.getColumn());
+
+    private Node rtSubject(Token startToken) {
+        if ( lookingAt(LT2) )
+            return parseReifiedTriple();
+        Node s = possibleAnon() ;
+        if ( s != null )
+            return s;
+        s = node();
+        if ( ! (s.isURI() || s.isBlank() ) )
+            // ReifiedTriple covered by branch.
+            exception(peekToken(), "Subject in a reified triple is not a URI, blank node or a nested reified triple: %s", s);
+        return s;
+    }
+
+    // -- rtObject rules
+    private Node rtObject(Token startToken) {
+        if (lookingAt(LT2) )
+            return parseReifiedTriple();
+        Node o = possibleAnon() ;
+        if ( o != null )
+            return o;
+        // Not compound triples (blankPredicateObjectList, collections).
+        o = object();
+        if ( ! (o.isURI() || o.isBlank() || o.isLiteral() || o.isTripleTerm() ) )
+            exception(startToken, "Illgeal object in a reified triple: %s", o);
+        return o;
+    }
+
+    // Possible [], not [ :p 123 ]
+    private Node possibleAnon() {
+        if ( ! lookingAt(LBRACKET) )
+            return null;
+        // Consume LBRACKET
+        nextToken();
+        if ( ! lookingAt(RBRACKET) )
+            exception(peekToken(), "Found '[' in reified triple. It must be followed by ']' but got: "+peekToken());
+        // Consume RBRACKET
+        Token token = nextToken();
+        Node x = profile.createBlankNode(currentGraph, token.getLine(), token.getColumn());
+        return x;
+    }
+
+//    // XXX Checker.validateTriple
+//    // XXX TripleTerm
+//    private void validateTriple(Node s, Node p, Node o, String usage, Token token) {
+//        if ( ! (s.isURI() || s.isBlank() ) )
+//            // ReifiedTriple covered by branch.
+//            exception(token, "Subject in a %s is not a URI, blank node or a nested reified triple: %s", usage, s);
+//        if ( ! p.isURI() )
+//            exception(token, "Predicate in a %s is not a URI: %s", usage, p);
+//        if ( ! (o.isURI() || o.isBlank() || o.isLiteral() || o.isNodeTriple() ) )
+//            exception(token, "Object in a %s is not a URI, blank node, nested reified triple or triple term : %s", usage, o);
+//    }
+
+    private Node parseTripleTerm() {
+        Token entryToken = nextToken();
+        Node s = ttSubject();
+        if ( s.isTripleTerm() )
+            exception(entryToken, "Subject of a triple term is a triple term");
+        Node p = predicate();
+        Node o = ttObject();
+        if ( ! lookingAt(R_TRIPLE) )
+            exception(peekToken(), "Expected )>>, found %s", peekToken().text());
+        nextToken();
+        return profile.createTripleTerm(s, p, o, entryToken.getLine(), entryToken.getColumn());
+    }
+
+    protected Node possibleReifier(Node s, Node p, Node o, long line, long column) {
+        if ( lookingAt(TokenType.VBAR) )
+            exception(peekToken(), "Bad syntax: reifiers are '~', not '|'");
+
+        if ( ! lookingAt(TokenType.TILDE) )
+            return profile.createBlankNode(currentGraph, line, column);
+        // XXX Check BNF
+        return Reifier(s, p, o, line, column);
+    }
+
+    protected Node Reifier(Node s, Node p, Node o, long line, long column) {
+        // Tilde
+        Token tildeToken = nextToken();
+        Token tokenReif = peekToken();
+
+        if ( lookingAt(TokenType.LITERAL_DT) || lookingAt(TokenType.LITERAL_LANG) ) {
+            nextToken();
+            exception(tildeToken, "Reifiers are URIs or blank nodes: found %s", tokenReif);
+        }
+
+        Node reif;
+        // URI or bNode
+        if ( lookingAtIRIorBNode() ) {
+            // XXX   and use elsewhere : nodeURIorBLankNode()
+            nextToken();
+            reif = tokenAsNode(tokenReif);
+        } else if ( lookingAt(LBRACKET) ) {
+            // ANON
+            nextToken();
+            Token t = peekToken();
+            if ( ! lookingAt(RBRACKET) )
+                exception(peekToken(), "Bad %s in RDF triple. Expected ] after [", "riefier", peekToken().text());
+            nextToken();
+            reif = profile.createBlankNode(currentGraph, t.getLine(), t.getColumn());
+        } else {
+            // Just "~" No reifier id
+            // or some syntax error we will detect later.
+            reif = profile.createBlankNode(currentGraph, tildeToken.getLine(), tildeToken.getColumn());
+        }
+        return reif;
     }
 
-    private Node subjectX() {
-        Node node = nodeX("subject");
+    private Node ttSubject() {
+        Node node = term("subject");
+        // XXX Maybe allow but restrict later.
         if ( node.isLiteral() )
-            exception(peekToken(), "Literal as subject in RDF-star triple");
+            exception(peekToken(), "Literals are not legal in the subject position.");
+        if ( node.isTripleTerm() ) {
+            exception(peekToken(), "Triple terms are not legal in the subject position.");
+        }
         return node;
     }
 
-    private Node objectX() {
-        Node node = nodeX("object");
+    private Node ttObject() {
+        Node node = term("object");
         return node;
     }
 
-    // Does consume the token.
-    private Node nodeX(String posnLabel) {
+    // Generalized.
+    // Triples with, for example, literals in the subject position, are rejected when the triple is created.
+    private Node subject() {
+        return nodeTerm();
+    }
+
+    private Node object() {
+        return nodeTerm();
+    }
+
+    // Single token terms, triple terms and reified triples.
+    private Node nodeTerm() {
         if ( lookingAt(LT2) )
+            return parseReifiedTriple();
+        if ( lookingAt(L_TRIPLE) )
+            return parseTripleTerm();
+        Node node = node();
+        return node;
+    }
+
+    /** Any RDFTerm, including compound structures but not reified triples. */
+    // XXX RENAME
+    private Node term(String posnLabel) {
+        if ( lookingAt(L_TRIPLE) )
             return parseTripleTerm();
 
         // ANON
@@ -287,30 +456,33 @@ private Node nodeX(String posnLabel) {
         // Method triplesNodeCompound ()-> triplesBlankNode(subject)
         //    can cope with zero length, covering grammar token ANON and rule [7] predicateObjectList cases
         // But here, in RDF-star, only [] is legal.
+
+        // XXX Generalize and reuse in Reifier.
+        // []
         if ( lookingAt(LBRACKET) ) {
             nextToken();
             Token t = peekToken();
             if ( ! lookingAt(RBRACKET) )
-                exception(peekToken(), "Bad %s in RDF-star triple after [, expected ]", posnLabel, peekToken().text());
+                exception(peekToken(), "Bad %s in RDF triple. Expected ] after [", posnLabel, peekToken().text());
             nextToken();
             return profile.createBlankNode(currentGraph, t.getLine(), t.getColumn());
         }
 
+        // Single token terms
         if ( ! lookingAt(NODE) )
-            exception(peekToken(), "Bad %s in RDF-star triple", posnLabel, peekToken().text());
+            exception(peekToken(), "Bad %s in RDF-star triple: %s", posnLabel, peekToken().text());
         Node node = node();
-        nextToken();
         return node;
     }
 
     // Must be at least one triple.
-    protected final void triples() {
+    //   Not reifiedTriple
+    protected final void triplesSameSubject() {
         // Looking at a node.
-        Node subject = node();
+        Node subject = subject();
         if ( subject == null )
             exception(peekToken(), "Not recognized: expected node: %s", peekToken().text());
 
-        nextToken();
         predicateObjectList(subject);
         expectEndOfTriples();
     }
@@ -329,13 +501,21 @@ protected void expectEndOfTriplesTurtle() {
             expectOrEOF("Triples not terminated by DOT", DOT);
     }
 
+    protected final boolean lookingAtIRIorBNode() {
+        if ( eof() )
+            return false;
+        Token t = peekToken();
+        // Does not cover "[ ]"
+        return t.isIRI() || t.isBNode();
+    }
+
     protected final void predicateObjectList(Node subject) {
         predicateObjectItem(subject);
 
         for (;;) {
             if ( !lookingAt(SEMICOLON) )
                 break;
-            // predicatelist continues - move over all ";"
+            // predicateList continues - move over all ";"
             while (lookingAt(SEMICOLON))
                 nextToken();
             if ( !peekPredicate() )
@@ -348,34 +528,38 @@ protected final void predicateObjectList(Node subject) {
 
     protected final void predicateObjectItem(Node subject) {
         Node predicate = predicate();
-        nextToken();
         objectList(subject, predicate);
     }
 
     static protected final Node nodeSameAs     = NodeConst.nodeOwlSameAs;
     static protected final Node nodeLogImplies = NodeFactory.createURI("http://www.w3.org/2000/10/swap/log#implies");
 
-    /** Get predicate - maybe null for "illegal" */
-    protected final Node predicate() {
-        Token t = peekToken();
+    // XXX verb()
 
-        if ( t.hasType(TokenType.KEYWORD) ) {
-            Token tErr = peekToken();
-            String image = peekToken().getImage();
+    // [11]  verb  ::= predicate | 'a'
+    // [12]  subject ::= iri | BlankNode | collection
+    // [13]  predicate ::= iri
+    // and '=' (owl:sameAs),
+    /** Get predicate - return null for "illegal" */
+    protected final Node predicate() {
+        if ( lookingAt(TokenType.KEYWORD) ) {
+            Token kwToken = nextToken();
+            String image = kwToken.getImage();
             if ( image.equals(KW_A) )
                 return NodeConst.nodeRDFType;
             // N3-isms
             if ( !isStrictMode() && image.equals(KW_SAME_AS) )
                 return nodeSameAs;
             // Relationship between two formulae in N3.
-//            if ( !strict && image.equals(KW_LOG_IMPLIES) )
+//            if ( !isStrictMode() && image.equals(KW_LOG_IMPLIES) )
 //                return log:implies;
-            exception(tErr, "Unrecognized keyword: " + image);
+            exception(kwToken, "Unrecognized keyword: " + image);
         }
 
+        Token token = peekToken();
         Node n = node();
         if ( n == null || !n.isURI() )
-            exception(t, "Expected IRI for predicate: got: %s", t);
+            exception(token, "Expected IRI for predicate: got: %s", token);
         return n;
     }
 
@@ -400,34 +584,30 @@ protected final boolean peekPredicate() {
         return false;
     }
 
-    /** Create a Node for the current token.
-     *  Does not create nodes/triples for compound structures.
-     *  May return "null" for not-a-node.
-     *  Does not consume the token.
+    /**
+     *  Create a Node for the current single token.
+     *  <p>
+     *  It does not cover tripleTerms, which involves multiple tokens,
+     *  nodes/triples for compound structures, {@code ()} nor {@code []}.
+     *  Returns "null" for not-a-node.
      */
     protected final Node node() {
-        // Token to Node
         Node n = tokenAsNode(peekToken());
         if ( n == null )
             return null;
+        nextToken();
         return n;
     }
 
+    // XXX Update for RDF 1.2
     protected final void objectList(Node subject, Node predicate) {
         for (;;) {
             // object ::=
             Node object = triplesNode();
             emitTriple(subject, predicate, object);
-            // RDF-star annotation syntax
-            if ( lookingAt(L_ANN) ) {
-                Token tNext = nextToken();
-                if ( lookingAt(R_ANN) )
-                    exception(tNext, "Empty annotation");
-                Node x = profile.createTripleNode(subject, predicate, object, currLine, currCol);
-                predicateObjectList(x);
-                expect("Missing end annotation", R_ANN);
-            }
 
+            // Maybe annotation.
+            possibleAnnotations(subject, predicate, object);
             if ( !moreTokens() )
                 break;
             if ( !lookingAt(COMMA) )
@@ -437,13 +617,35 @@ protected final void objectList(Node subject, Node predicate) {
         }
     }
 
+    private void possibleAnnotations(Node subject, Node predicate, Node object) {
+        for(;;) {
+            if ( !lookingAt(TokenType.TILDE) && !lookingAt(L_ANN) && /*old style, not adopted*/ !lookingAt(TokenType.VBAR) )
+                return;
+
+            Token tokenReifer = peekToken();
+            // Always allocate. TILDE or L_ANN.
+            Node reif = possibleReifier(subject, predicate, object, tokenReifer.getLine(), tokenReifer.getColumn());
+            Node tripleTerm = profile.createTripleTerm(subject, predicate, object, tokenReifer.getLine(), tokenReifer.getColumn());
+            emit(reif, NodeConst.nodeReifies, tripleTerm);
+
+            // RDF-star annotation syntax
+            if ( lookingAt(L_ANN) ) {
+                Token tNext = nextToken();
+                if ( lookingAt(R_ANN) )
+                    exception(tNext, "Empty annotation");
+                predicateObjectList(reif);
+                expect("Missing end annotation", R_ANN);
+            }
+        }
+    }
+
     // A structure of triples that itself generates a node.
     // Special checks for [] and ().
 
+    // XXX Use object()
     protected final Node triplesNode() { // == [12] object in the grammar.
         if ( lookingAt(NODE) ) {
             Node n = node();
-            nextToken();
             return n;
         }
 
@@ -464,6 +666,9 @@ protected final Node triplesNode() { // == [12] object in the grammar.
         }
 
         if ( lookingAt(LT2) )
+            return parseReifiedTriple();
+
+        if ( lookingAt(L_TRIPLE) )
             return parseTripleTerm();
 
         return triplesNodeCompound();
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
index 2cc9f9c17fe..7792fe52189 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
@@ -51,7 +51,7 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
 
-import static org.apache.jena.riot.lang.ReaderTriX.State.E_TRIPLE;
+import static org.apache.jena.riot.lang.ReaderTriX.State.TRIPLE_TERM;
 import static org.apache.jena.riot.lang.ReaderTriX.State.GRAPH;
 import static org.apache.jena.riot.lang.ReaderTriX.State.OUTER;
 import static org.apache.jena.riot.lang.ReaderTriX.State.TRIPLE;
@@ -119,8 +119,8 @@ public void read(Reader reader, String baseURI, ContentType ct, StreamRDF output
     private static String rdfXMLLiteral = RDF.xmlLiteral.getURI();
 
     // State TRIPLE is "asserted triple" - a triple that will go into the output.
-    // State E_TRIPLE is an "embedded triple" (<<>>) that will be term in another triple/quad.
-    enum State { OUTER, TRIX, GRAPH, TRIPLE, E_TRIPLE }
+    // State TRIPLE_TERM is a triple term (<<()>>) that will be term in another triple/quad.
+    enum State { OUTER, TRIX, GRAPH, TRIPLE, TRIPLE_TERM }
 
     private static class NodeMarker extends Node_Marker {
         protected NodeMarker(String label) {
@@ -129,14 +129,14 @@ protected NodeMarker(String label) {
     }
 
     private static Node nAssertedTriple = new NodeMarker("asserted triple");
-    private static Node nEmbeddedTriple = new NodeMarker("embedded triple");
+    private static Node nTripleTerm = new NodeMarker("triple term");
 
     private void read(XMLStreamReader parser, String baseURI, StreamRDF output) {
         State state = OUTER;
         Node g = null;
         Deque<Node> terms = new ArrayDeque<>();
-        // Depth of embedded triple nesting. 0 - not in an embedded triple
-        int embeddedTripleDepth = 0;
+        // Depth of triple term nesting. 0 - not in a triple term
+        int tripleTermDepth = 0;
         try {
             while(parser.hasNext()) {
                 int event = parser.next();
@@ -173,13 +173,13 @@ private void read(XMLStreamReader parser, String baseURI, StreamRDF output) {
                                         state = TRIPLE;
                                         push(terms, nAssertedTriple);
                                         break;
-                                    // Embedded triple. If E_TRIPLE nested embedded triple.
+                                    // If TRIPLE_TERM,  nested triple term
                                     case TRIPLE:
-                                        state = E_TRIPLE;
+                                        state = TRIPLE_TERM;
                                         // fall through.
-                                    case E_TRIPLE:
-                                        embeddedTripleDepth++;
-                                        push(terms, nEmbeddedTriple);
+                                    case TRIPLE_TERM:
+                                        tripleTermDepth++;
+                                        push(terms, nTripleTerm);
                                         break;
                                     default: staxErrorOutOfPlaceElement(parser);
                                 }
@@ -189,7 +189,7 @@ private void read(XMLStreamReader parser, String baseURI, StreamRDF output) {
                             case TriX.tagId:
                             case TriX.tagQName:
                             case TriX.tagURI: {
-                                if ( state != GRAPH && state != TRIPLE && state != E_TRIPLE )
+                                if ( state != GRAPH && state != TRIPLE && state != TRIPLE_TERM )
                                     staxErrorOutOfPlaceElement(parser);
                                 Node n = term(parser, profile);
 
@@ -272,17 +272,15 @@ private void read(XMLStreamReader parser, String baseURI, StreamRDF output) {
                                             break;
                                         }
 
-                                        case E_TRIPLE: {
-                                            if ( ! nEmbeddedTriple.equals(marker) )
+                                        case TRIPLE_TERM: {
+                                            if ( ! nTripleTerm.equals(marker) )
                                                 // Internal error.
-                                                staxError(parser.getLocation(), "Misaligned embedded triple.");
-                                            //System.out.println("Embedded: Terms: "+terms.size());
-                                            // Embedded triple.
-                                            Node nt = NodeFactory.createTripleNode(s, p, o);
+                                                staxError(parser.getLocation(), "Misaligned triple term.");
+                                            // Triple term.
+                                            Node nt = profile.createTripleTerm(s, p, o, line, col);
                                             push(terms, nt);
-                                            embeddedTripleDepth--;
-                                            if ( embeddedTripleDepth == 0 )
-                                                // Did this complete an embedded triple?
+                                            tripleTermDepth--;
+                                            if ( tripleTermDepth == 0 )
                                                 state = TRIPLE;
                                             break;
                                         }
@@ -293,7 +291,6 @@ private void read(XMLStreamReader parser, String baseURI, StreamRDF output) {
                                 } catch (NoSuchElementException ex) {
                                     staxError(parser.getLocation(), "Too few terms for a triple.");
                                 }
-
                             }
                             case TriX.tagGraph:
                                 state = TRIX;
@@ -383,13 +380,14 @@ private Node term(XMLStreamReader parser, ParserProfile profile) throws XMLStrea
                     : parser.getElementText();
                 return profile.createTypedLiteral(lex, rdt, line, col);
             }
-            case TriX.tagTriple: {
-                Node s = term(parser, profile);
-                Node p = term(parser, profile);
-                Node o = term(parser, profile);
-                Node n = profile.createTripleNode(s, p, o, line, col);
-                return n;
-            }
+            // Triple term done elswwhere
+//            case TriX.tagTriple: {
+//                Node s = term(parser, profile);
+//                Node p = term(parser, profile);
+//                Node o = term(parser, profile);
+//                Node n = profile.createTripleTerm(s, p, o, line, col);
+//                return n;
+//            }
             default: {
                 QName qname = parser.getName();
                 staxError(parser.getLocation(), "Unrecognized tag -- "+qnameAsString(qname));
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java
index 521a5871190..a3948ff7923 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/LangParserBase.java
@@ -55,6 +55,8 @@ public class LangParserBase {
     protected final Node nRDFpredicate  = RDF.Nodes.predicate ;
     protected final Node nRDFobject     = RDF.Nodes.object ;
 
+    protected final Node nRDFreifies = RDF.Nodes.reifies;
+
     protected StreamRDF stream;
     protected ParserProfile profile;
 
@@ -130,8 +132,8 @@ protected Node createLiteral(String lexicalForm, String langTag, String datatype
         return n ;
     }
 
-    protected Node createQuotedTriple(Node s, Node p, Node o, int line, int column) {
-        return profile.createTripleNode(s, p, o, line, column);
+    protected Node createTripleTerm(Node s, Node p, Node o, int line, int column) {
+        return profile.createTripleTerm(s, p, o, line, column);
     }
 
     protected Node createLiteralInteger(String lexicalForm, int line, int column) {
@@ -188,11 +190,37 @@ protected void setPrefix(String prefix, String iri, int line, int column) {
         profile.getPrefixMap().add(prefix,iri);
         stream.prefix(prefix, iri);
     }
-
     protected void emitTriple(int line, int column, Node s, Node p, Node o) {
         stream.triple(Triple.create(s, p, o));
     }
 
+    protected Node emitTripleReifier(int line, int column, Node reifierId, Node s, Node p, Node o) {
+        Node tripleTerm = createTripleTerm(s, p, o, line, column);
+        if ( reifierId == null )
+            reifierId = createBNode(line, column);
+        Triple reifiedTriple = Triple.create(reifierId, nRDFreifies, tripleTerm);
+        stream.triple(reifiedTriple);
+        return reifierId;
+    }
+
+    private Node annotationReifierId = null;
+
+    protected void setReifierId(Node reifId) {
+        annotationReifierId = reifId;
+    }
+
+    protected Node getOrAllocReifierId(Node s, Node p, Node o, int line, int column) {
+        if ( annotationReifierId != null )
+            return annotationReifierId;
+        Node reifierId = createBNode(line, column);
+        emitTripleReifier(line, column, reifierId, s, p, o);
+        return reifierId;
+    }
+
+    protected void clearReifierId() {
+        annotationReifierId = null;
+    }
+
     protected String unescapeIRI(String iriStr) {
         try {
             return EscapeStr.unescape(iriStr, '\\', true);
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java
index 93284fd5908..403ac258b1a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavacc.java
@@ -89,7 +89,7 @@ final public void Statement() throws ParseException {
     case PNAME_NS:
     case PNAME_LN:
     case BLANK_NODE_LABEL:{
-      TriplesSameSubject();
+      Triples();
       jj_consume_token(DOT);
       break;
       }
@@ -149,28 +149,26 @@ final public void Statement() throws ParseException {
     }
 }
 
-// Turtle [6] triples
-  final public void TriplesSameSubject() throws ParseException {Node s ;
+  final public void Triples() throws ParseException {Node n;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case LPAREN:
     case ANON:
-    case LT2:
     case PNAME_NS:
     case PNAME_LN:
     case BLANK_NODE_LABEL:{
-      s = Subject();
-      PredicateObjectList(s);
+      n = Subject();
+      PredicateObjectList(n);
       break;
       }
     case LBRACKET:{
-      s = BlankNodePropertyList();
+      n = BlankNodePropertyList();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case KW_A:
       case IRIref:
       case PNAME_NS:
       case PNAME_LN:{
-        PredicateObjectList(s);
+        PredicateObjectList(n);
         break;
         }
       default:
@@ -179,14 +177,29 @@ final public void Statement() throws ParseException {
       }
       break;
       }
+    case LT2:{
+      n = ReifiedTriple();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case KW_A:
+      case IRIref:
+      case PNAME_NS:
+      case PNAME_LN:{
+        PredicateObjectList(n);
+        break;
+        }
+      default:
+        jj_la1[6] = jj_gen;
+        ;
+      }
+      break;
+      }
     default:
-      jj_la1[6] = jj_gen;
+      jj_la1[7] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
 }
 
-// Turtle [7] predicateObjectList
   final public void PredicateObjectList(Node s) throws ParseException {Node p = null ;
     p = Verb();
     ObjectList(s, p);
@@ -198,7 +211,7 @@ final public void Statement() throws ParseException {
         break;
         }
       default:
-        jj_la1[7] = jj_gen;
+        jj_la1[8] = jj_gen;
         break label_2;
       }
       jj_consume_token(SEMICOLON);
@@ -212,13 +225,12 @@ final public void Statement() throws ParseException {
         break;
         }
       default:
-        jj_la1[8] = jj_gen;
+        jj_la1[9] = jj_gen;
         ;
       }
     }
 }
 
-// Turtle [8] objectList
   final public void ObjectList(Node s, Node p) throws ParseException {Node o ;
     o = Object();
 emitTriple(token.beginLine, token.beginColumn, s, p, o) ;
@@ -231,7 +243,7 @@ final public void Statement() throws ParseException {
         break;
         }
       default:
-        jj_la1[9] = jj_gen;
+        jj_la1[10] = jj_gen;
         break label_3;
       }
       jj_consume_token(COMMA);
@@ -241,22 +253,6 @@ final public void Statement() throws ParseException {
     }
 }
 
-// RDF-star Annotation Syntax
-  final public void Annotation(Node s, Node p, Node o) throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case L_ANN:{
-      jj_consume_token(L_ANN);
-Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      PredicateObjectList(x);
-      jj_consume_token(R_ANN);
-      break;
-      }
-    default:
-      jj_la1[10] = jj_gen;
-      ;
-    }
-}
-
 // Turtle [9] verb
   final public Node Verb() throws ParseException {Node p ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -298,10 +294,6 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       s = Collection();
       break;
       }
-    case LT2:{
-      s = QuotedTriple();
-      break;
-      }
     default:
       jj_la1[12] = jj_gen;
       jj_consume_token(-1);
@@ -353,39 +345,16 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       o = Literal();
       break;
       }
-    case LT2:{
-      o = QuotedTriple();
-      break;
-      }
-    default:
-      jj_la1[13] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-{if ("" != null) return o;}
-    throw new Error("Missing return statement in function");
-}
-
-  final public Node QuotedTripleSubject() throws ParseException {Node o ; String iri;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IRIref:
-    case PNAME_NS:
-    case PNAME_LN:{
-      iri = iri();
-o = createURI(iri, token.beginLine, token.beginColumn) ;
-      break;
-      }
-    case ANON:
-    case BLANK_NODE_LABEL:{
-      o = BlankNode();
+    case L_TRIPLE:{
+      o = TripleTerm();
       break;
       }
     case LT2:{
-      o = QuotedTriple();
+      o = ReifiedTriple();
       break;
       }
     default:
-      jj_la1[14] = jj_gen;
+      jj_la1[13] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -393,57 +362,6 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
-  final public Node QuotedTripleObject() throws ParseException {Node o ; String iri;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IRIref:
-    case PNAME_NS:
-    case PNAME_LN:{
-      iri = iri();
-o = createURI(iri, token.beginLine, token.beginColumn) ;
-      break;
-      }
-    case ANON:
-    case BLANK_NODE_LABEL:{
-      o = BlankNode();
-      break;
-      }
-    case TRUE:
-    case FALSE:
-    case INTEGER:
-    case DECIMAL:
-    case DOUBLE:
-    case STRING_LITERAL1:
-    case STRING_LITERAL2:
-    case STRING_LITERAL_LONG1:
-    case STRING_LITERAL_LONG2:{
-      o = Literal();
-      break;
-      }
-    case LT2:{
-      o = QuotedTriple();
-      break;
-      }
-    default:
-      jj_la1[15] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-{if ("" != null) return o ;}
-    throw new Error("Missing return statement in function");
-}
-
-// The syntax for RDF-star <<>>
-  final public Node QuotedTriple() throws ParseException {Node s , p , o ; Token t ;
-    t = jj_consume_token(LT2);
-    s = QuotedTripleSubject();
-    p = Verb();
-    o = QuotedTripleObject();
-    jj_consume_token(GT2);
-Node n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    {if ("" != null) return n;}
-    throw new Error("Missing return statement in function");
-}
-
 // Turtle [13] literal
   final public Node Literal() throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -469,7 +387,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       break;
       }
     default:
-      jj_la1[16] = jj_gen;
+      jj_la1[14] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -507,6 +425,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       case LPAREN:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:
       case PNAME_NS:
       case PNAME_LN:
@@ -515,7 +434,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
         break;
         }
       default:
-        jj_la1[17] = jj_gen;
+        jj_la1[15] = jj_gen;
         break label_4;
       }
 Node cell = createListNode(line, column) ;
@@ -561,7 +480,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       break;
       }
     default:
-      jj_la1[18] = jj_gen;
+      jj_la1[16] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -576,11 +495,11 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
     case BASE:
     case PREFIX:
     case DATATYPE:
-    case LANGTAG:{
+    case LANG_DIR:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case BASE:
       case PREFIX:
-      case LANGTAG:{
+      case LANG_DIR:{
         lang = LangTag();
         break;
         }
@@ -590,14 +509,14 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
         break;
         }
       default:
-        jj_la1[19] = jj_gen;
+        jj_la1[17] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[20] = jj_gen;
+      jj_la1[18] = jj_gen;
       ;
     }
 {if ("" != null) return createLiteral(lex, lang, uri, token.beginLine, token.beginColumn) ;}
@@ -606,8 +525,8 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
 
   final public String LangTag() throws ParseException {Token t ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LANGTAG:{
-      t = jj_consume_token(LANGTAG);
+    case LANG_DIR:{
+      t = jj_consume_token(LANG_DIR);
       break;
       }
     case BASE:
@@ -616,7 +535,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       break;
       }
     default:
-      jj_la1[21] = jj_gen;
+      jj_la1[19] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -635,7 +554,7 @@ final public void Annotation(Node s, Node p, Node o) throws ParseException {
       break;
       }
     default:
-      jj_la1[22] = jj_gen;
+      jj_la1[20] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -657,7 +576,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[23] = jj_gen;
+      jj_la1[21] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -688,7 +607,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[24] = jj_gen;
+      jj_la1[22] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -713,7 +632,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[25] = jj_gen;
+      jj_la1[23] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -734,7 +653,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[26] = jj_gen;
+      jj_la1[24] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -755,7 +674,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[27] = jj_gen;
+      jj_la1[25] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -768,6 +687,250 @@ final public Node BooleanLiteral() throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Node Reifier() throws ParseException {Node n = null; String iriStr; Token t;
+    t = jj_consume_token(TILDE);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case ANON:
+    case PNAME_NS:
+    case PNAME_LN:
+    case BLANK_NODE_LABEL:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IRIref:
+      case PNAME_NS:
+      case PNAME_LN:{
+        iriStr = iri();
+n = createURI(iriStr, token.beginLine, token.beginColumn) ;
+        break;
+        }
+      case ANON:
+      case BLANK_NODE_LABEL:{
+        n = BlankNode();
+        break;
+        }
+      default:
+        jj_la1[26] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+      }
+    default:
+      jj_la1[27] = jj_gen;
+      ;
+    }
+if ( n == null ) n = createBNode(t.beginLine, t.beginColumn) ;
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTriple() throws ParseException {Node reifId = null ; Token tok ;  Node s; Node p ; Node o ;
+    tok = jj_consume_token(LT2);
+    s = ReifiedTripleSubject();
+    p = Verb();
+    o = ReifiedTripleObject();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TILDE:{
+      reifId = Reifier();
+      break;
+      }
+    default:
+      jj_la1[28] = jj_gen;
+      ;
+    }
+reifId = emitTripleReifier(tok.beginLine, tok.beginColumn, reifId, s, p, o);
+    jj_consume_token(GT2);
+{if ("" != null) return reifId ;}
+    throw new Error("Missing return statement in function");
+}
+
+// rtSubject
+  final public Node ReifiedTripleSubject() throws ParseException {Node s; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+s = createURI(iri, token.beginLine, token.beginColumn) ;
+      break;
+      }
+    case ANON:
+    case BLANK_NODE_LABEL:{
+      s = BlankNode();
+      break;
+      }
+    case LT2:{
+      s = ReifiedTriple();
+      break;
+      }
+    default:
+      jj_la1[29] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return s;}
+    throw new Error("Missing return statement in function");
+}
+
+// rtObject
+  final public Node ReifiedTripleObject() throws ParseException {Node o; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+o = createURI(iri, token.beginLine, token.beginColumn) ;
+      break;
+      }
+    case ANON:
+    case BLANK_NODE_LABEL:{
+      o = BlankNode();
+      break;
+      }
+    case TRUE:
+    case FALSE:
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      o = Literal();
+      break;
+      }
+    case L_TRIPLE:{
+      o = TripleTerm();
+      break;
+      }
+    case LT2:{
+      o = ReifiedTriple();
+      break;
+      }
+    default:
+      jj_la1[30] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return o;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTerm() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
+    jj_consume_token(L_TRIPLE);
+    s = TripleTermSubject();
+    p = Verb();
+    o = TripleTermObject();
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return createTripleTerm(s, p, o, token.beginLine, token.beginColumn) ;}
+    throw new Error("Missing return statement in function");
+}
+
+// ttSubject
+  final public Node TripleTermSubject() throws ParseException {Node o ; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+o = createURI(iri, token.beginLine, token.beginColumn) ;
+      break;
+      }
+    case ANON:
+    case BLANK_NODE_LABEL:{
+      o = BlankNode();
+      break;
+      }
+    default:
+      jj_la1[31] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return o;}
+    throw new Error("Missing return statement in function");
+}
+
+// ttObject
+  final public Node TripleTermObject() throws ParseException {Node o ; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+o = createURI(iri, token.beginLine, token.beginColumn) ;
+      break;
+      }
+    case ANON:
+    case BLANK_NODE_LABEL:{
+      o = BlankNode();
+      break;
+      }
+    case TRUE:
+    case FALSE:
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      o = Literal();
+      break;
+      }
+    case L_TRIPLE:{
+      o = TripleTerm();
+      break;
+      }
+    default:
+      jj_la1[32] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return o ;}
+    throw new Error("Missing return statement in function");
+}
+
+// RDF-star Annotation Syntax
+  final public void Annotation(Node s, Node p, Node o) throws ParseException {Node reifId = null;
+    label_5:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case L_ANN:
+      case TILDE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[33] = jj_gen;
+        break label_5;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+        reifId = Reifier();
+reifId = emitTripleReifier(token.beginLine, token.beginColumn, reifId, s, p, o) ;
+setReifierId(reifId);
+        break;
+        }
+      case L_ANN:{
+reifId = getOrAllocReifierId(s, p, o, token.beginLine, token.beginColumn);
+clearReifierId();
+        AnnotationBlock(reifId);
+        break;
+        }
+      default:
+        jj_la1[34] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+}
+
+  final public void AnnotationBlock(Node reifId) throws ParseException {
+    jj_consume_token(L_ANN);
+    PredicateObjectList(reifId);
+    jj_consume_token(R_ANN);
+}
+
   /** Generated Token Manager. */
   public TurtleJavaccTokenManager token_source;
   SimpleCharStream jj_input_stream;
@@ -777,7 +940,7 @@ final public Node BooleanLiteral() throws ParseException {
   public Token jj_nt;
   private int jj_ntk;
   private int jj_gen;
-  final private int[] jj_la1 = new int[28];
+  final private int[] jj_la1 = new int[35];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -787,13 +950,13 @@ final public Node BooleanLiteral() throws ParseException {
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x21e00,0x10000,0x21e00,0x1800,0x600,0x20100,0x20000,0x0,0x20100,0x0,0x0,0x20100,0x20000,0x80e26000,0x20000,0x80e26000,0x80e06000,0x80e26000,0xe00000,0x1800,0x1800,0x1800,0x1800,0x6000,0x80000000,0x20000,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x21e00,0x10000,0x21e00,0x1800,0x600,0x20100,0x20100,0x20000,0x0,0x20100,0x0,0x20100,0x20000,0x80e26000,0x80e06000,0x80e26000,0xe00000,0x1800,0x1800,0x1800,0x1800,0x6000,0x80000000,0x20000,0x0,0x0,0x20000,0x20000,0x0,0x20000,0x80e26000,0x20000,0x80e26000,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x382288,0x0,0x382288,0x0,0x0,0x180000,0x382288,0x400,0x180000,0x800,0x8000,0x180000,0x382208,0x38228f,0x382200,0x382207,0x7,0x38228f,0x0,0x420000,0x420000,0x400000,0x0,0x0,0x7,0x180000,0x180000,0x200200,};
+	   jj_la1_1 = new int[] {0x3820288,0x0,0x3820288,0x0,0x0,0x1800000,0x1800000,0x3820288,0x400,0x1800000,0x800,0x1800000,0x3800208,0x382828f,0x7,0x382828f,0x0,0x4002000,0x4002000,0x4000000,0x0,0x0,0x7,0x1800000,0x1800000,0x2000200,0x3800200,0x3800200,0x200000,0x3820200,0x3828207,0x3800200,0x3808207,0x280000,0x280000,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 
   /** Constructor with InputStream. */
@@ -807,7 +970,7 @@ public TurtleJavacc(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -821,7 +984,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   /** Constructor. */
@@ -831,7 +994,7 @@ public TurtleJavacc(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -849,7 +1012,7 @@ public void ReInit(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   /** Constructor with generated Token Manager. */
@@ -858,7 +1021,7 @@ public TurtleJavacc(TurtleJavaccTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -867,7 +1030,7 @@ public void ReInit(TurtleJavaccTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 28; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 35; i++) jj_la1[i] = -1;
   }
 
   private Token jj_consume_token(int kind) throws ParseException {
@@ -918,12 +1081,12 @@ private int jj_ntk_f() {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[69];
+	 boolean[] la1tokens = new boolean[73];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 28; i++) {
+	 for (int i = 0; i < 35; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -938,7 +1101,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 69; i++) {
+	 for (int i = 0; i < 73; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java
index 9051257c26e..f6b80ecbcd8 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccConstants.java
@@ -107,53 +107,61 @@ public interface TurtleJavaccConstants {
   /** RegularExpression Id. */
   int DOT = 44;
   /** RegularExpression Id. */
-  int LT2 = 45;
+  int DATATYPE = 45;
   /** RegularExpression Id. */
-  int GT2 = 46;
+  int AT = 46;
   /** RegularExpression Id. */
-  int L_ANN = 47;
+  int L_TRIPLE = 47;
   /** RegularExpression Id. */
-  int R_ANN = 48;
+  int R_TRIPLE = 48;
   /** RegularExpression Id. */
-  int DATATYPE = 49;
+  int LT2 = 49;
   /** RegularExpression Id. */
-  int AT = 50;
+  int GT2 = 50;
   /** RegularExpression Id. */
-  int PNAME_NS = 51;
+  int L_ANN = 51;
   /** RegularExpression Id. */
-  int PNAME_LN = 52;
+  int R_ANN = 52;
   /** RegularExpression Id. */
-  int BLANK_NODE_LABEL = 53;
+  int TILDE = 53;
   /** RegularExpression Id. */
-  int LANGTAG = 54;
+  int VBAR = 54;
   /** RegularExpression Id. */
-  int A2Z = 55;
+  int PNAME_NS = 55;
   /** RegularExpression Id. */
-  int A2ZN = 56;
+  int PNAME_LN = 56;
   /** RegularExpression Id. */
-  int SURROGATE_PAIR = 57;
+  int BLANK_NODE_LABEL = 57;
   /** RegularExpression Id. */
-  int PN_CHARS_BASE = 58;
+  int LANG_DIR = 58;
   /** RegularExpression Id. */
-  int PN_CHARS_U = 59;
+  int A2Z = 59;
   /** RegularExpression Id. */
-  int PN_CHARS = 60;
+  int A2ZN = 60;
   /** RegularExpression Id. */
-  int PN_PREFIX = 61;
+  int SURROGATE_PAIR = 61;
   /** RegularExpression Id. */
-  int PN_LOCAL = 62;
+  int PN_CHARS_BASE = 62;
   /** RegularExpression Id. */
-  int VARNAME = 63;
+  int PN_CHARS_U = 63;
   /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 64;
+  int PN_CHARS = 64;
   /** RegularExpression Id. */
-  int PLX = 65;
+  int PN_PREFIX = 65;
   /** RegularExpression Id. */
-  int HEX = 66;
+  int PN_LOCAL = 66;
   /** RegularExpression Id. */
-  int PERCENT = 67;
+  int VARNAME = 67;
   /** RegularExpression Id. */
-  int UNKNOWN = 68;
+  int PN_LOCAL_ESC = 68;
+  /** RegularExpression Id. */
+  int PLX = 69;
+  /** RegularExpression Id. */
+  int HEX = 70;
+  /** RegularExpression Id. */
+  int PERCENT = 71;
+  /** RegularExpression Id. */
+  int UNKNOWN = 72;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -205,16 +213,20 @@ public interface TurtleJavaccConstants {
     "\";\"",
     "\",\"",
     "\".\"",
+    "\"^^\"",
+    "\"@\"",
+    "\"<<(\"",
+    "\")>>\"",
     "\"<<\"",
     "\">>\"",
     "\"{|\"",
     "\"|}\"",
-    "\"^^\"",
-    "\"@\"",
+    "\"~\"",
+    "\"|\"",
     "<PNAME_NS>",
     "<PNAME_LN>",
     "<BLANK_NODE_LABEL>",
-    "<LANGTAG>",
+    "<LANG_DIR>",
     "<A2Z>",
     "<A2ZN>",
     "<SURROGATE_PAIR>",
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java
index a9f0f5c7760..d1f85309f1c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/extra/javacc/TurtleJavaccTokenManager.java
@@ -19,8 +19,12 @@
  */
 
 package org.apache.jena.riot.lang.extra.javacc;
+import org.apache.jena.graph.*;
+import org.apache.jena.riot.lang.extra.* ;
+import static org.apache.jena.riot.lang.extra.LangParserLib.*;
 
 /** Token Manager. */
+@SuppressWarnings ("unused")
 public class TurtleJavaccTokenManager implements TurtleJavaccConstants {
 
   /** Debug output. */
@@ -56,7 +60,7 @@ private int jjMoveStringLiteralDfa0_0(){
          return jjMoveNfa_0(0, 0);
       case 41:
          jjmatchedKind = 36;
-         return jjMoveNfa_0(0, 0);
+         return jjMoveStringLiteralDfa1_0(0x1000000000000L);
       case 43:
          jjmatchedKind = 18;
          return jjMoveNfa_0(0, 0);
@@ -73,11 +77,11 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 42;
          return jjMoveNfa_0(0, 0);
       case 60:
-         return jjMoveStringLiteralDfa1_0(0x200000000000L);
+         return jjMoveStringLiteralDfa1_0(0x2800000000000L);
       case 62:
-         return jjMoveStringLiteralDfa1_0(0x400000000000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000000L);
       case 64:
-         jjmatchedKind = 50;
+         jjmatchedKind = 46;
          return jjMoveStringLiteralDfa1_0(0x600L);
       case 66:
          return jjMoveStringLiteralDfa1_0(0x800L);
@@ -94,7 +98,7 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 40;
          return jjMoveNfa_0(0, 0);
       case 94:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000L);
       case 97:
          jjmatchedKind = 8;
          return jjMoveNfa_0(0, 0);
@@ -108,12 +112,16 @@ private int jjMoveStringLiteralDfa0_0(){
          return jjMoveStringLiteralDfa1_0(0x2000L);
       case 123:
          jjmatchedKind = 37;
-         return jjMoveStringLiteralDfa1_0(0x800000000000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000L);
       case 124:
-         return jjMoveStringLiteralDfa1_0(0x1000000000000L);
+         jjmatchedKind = 54;
+         return jjMoveStringLiteralDfa1_0(0x10000000000000L);
       case 125:
          jjmatchedKind = 38;
          return jjMoveNfa_0(0, 0);
+      case 126:
+         jjmatchedKind = 53;
+         return jjMoveNfa_0(0, 0);
       case 65279:
          jjmatchedKind = 16;
          return jjMoveNfa_0(0, 0);
@@ -129,27 +137,27 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 60:
-         if ((active0 & 0x200000000000L) != 0L)
+         if ((active0 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 45;
+            jjmatchedKind = 49;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000L);
       case 62:
-         if ((active0 & 0x400000000000L) != 0L)
+         if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 46;
+            jjmatchedKind = 50;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L);
       case 65:
          return jjMoveStringLiteralDfa2_0(active0, 0x4800L);
       case 82:
          return jjMoveStringLiteralDfa2_0(active0, 0x3000L);
       case 94:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 45;
             jjmatchedPos = 1;
          }
          break;
@@ -162,16 +170,16 @@ private int jjMoveStringLiteralDfa1_0(long active0){
       case 114:
          return jjMoveStringLiteralDfa2_0(active0, 0x3000L);
       case 124:
-         if ((active0 & 0x800000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 47;
+            jjmatchedKind = 51;
             jjmatchedPos = 1;
          }
          break;
       case 125:
-         if ((active0 & 0x1000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 52;
             jjmatchedPos = 1;
          }
          break;
@@ -189,6 +197,20 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 40:
+         if ((active0 & 0x800000000000L) != 0L)
+         {
+            jjmatchedKind = 47;
+            jjmatchedPos = 2;
+         }
+         break;
+      case 62:
+         if ((active0 & 0x1000000000000L) != 0L)
+         {
+            jjmatchedKind = 48;
+            jjmatchedPos = 2;
+         }
+         break;
       case 69:
          return jjMoveStringLiteralDfa3_0(active0, 0x1000L);
       case 76:
@@ -402,7 +424,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 189;
+   jjnewStateCnt = 192;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -428,12 +450,12 @@ else if ((0x280000000000L & l) != 0L)
                      { jjCheckNAddStates(7, 11); }
                   else if (curChar == 58)
                   {
-                     if (kind > 51)
-                        kind = 51;
+                     if (kind > 55)
+                        kind = 55;
                      { jjCheckNAddStates(12, 15); }
                   }
                   else if (curChar == 46)
-                     { jjCheckNAddTwoStates(132, 134); }
+                     { jjCheckNAddTwoStates(135, 137); }
                   else if (curChar == 34)
                      jjstateSet[jjnewStateCnt++] = 104;
                   else if (curChar == 39)
@@ -824,8 +846,8 @@ else if (curChar == 39)
                case 115:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 57)
+                     kind = 57;
                   { jjCheckNAddStates(51, 53); }
                   break;
                case 116:
@@ -833,8 +855,8 @@ else if (curChar == 39)
                      { jjCheckNAddStates(51, 53); }
                   break;
                case 117:
-                  if ((0x3ff200000000000L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x3ff200000000000L & l) != 0L && kind > 57)
+                     kind = 57;
                   break;
                case 126:
                   if (curChar == 45)
@@ -843,202 +865,213 @@ else if (curChar == 39)
                case 127:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAddTwoStates(126, 127); }
+                  if (kind > 58)
+                     kind = 58;
+                  { jjCheckNAddStates(54, 56); }
                   break;
                case 128:
+                  if (curChar != 45)
+                     break;
+                  if (kind > 58)
+                     kind = 58;
+                  jjstateSet[jjnewStateCnt++] = 129;
+                  break;
+               case 130:
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 128;
+                  break;
+               case 131:
                   if ((0x280000000000L & l) != 0L)
                      { jjCheckNAddStates(7, 11); }
                   break;
-               case 129:
+               case 132:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
-                  { jjCheckNAdd(129); }
+                  { jjCheckNAdd(132); }
                   break;
-               case 130:
+               case 133:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(130, 131); }
+                     { jjCheckNAddTwoStates(133, 134); }
                   break;
-               case 131:
+               case 134:
                   if (curChar == 46)
-                     { jjCheckNAdd(132); }
+                     { jjCheckNAdd(135); }
                   break;
-               case 132:
+               case 135:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 22)
                      kind = 22;
-                  { jjCheckNAdd(132); }
+                  { jjCheckNAdd(135); }
                   break;
-               case 133:
+               case 136:
                   if (curChar == 46)
-                     { jjCheckNAdd(134); }
+                     { jjCheckNAdd(137); }
                   break;
-               case 134:
+               case 137:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(134, 135); }
+                     { jjCheckNAddTwoStates(137, 138); }
                   break;
-               case 136:
+               case 139:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(137); }
+                     { jjCheckNAdd(140); }
                   break;
-               case 137:
+               case 140:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 23)
                      kind = 23;
-                  { jjCheckNAdd(137); }
+                  { jjCheckNAdd(140); }
                   break;
-               case 138:
+               case 141:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
+                     { jjCheckNAddStates(57, 60); }
                   break;
-               case 139:
+               case 142:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(139, 140); }
+                     { jjCheckNAddTwoStates(142, 143); }
                   break;
-               case 140:
+               case 143:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(141, 142); }
+                     { jjCheckNAddTwoStates(144, 145); }
                   break;
-               case 141:
+               case 144:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(141, 142); }
+                     { jjCheckNAddTwoStates(144, 145); }
                   break;
-               case 143:
+               case 146:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(144); }
+                     { jjCheckNAdd(147); }
                   break;
-               case 144:
+               case 147:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 23)
                      kind = 23;
-                  { jjCheckNAdd(144); }
+                  { jjCheckNAdd(147); }
                   break;
-               case 145:
+               case 148:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(145, 146); }
+                     { jjCheckNAddTwoStates(148, 149); }
                   break;
-               case 147:
+               case 150:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(148); }
+                     { jjCheckNAdd(151); }
                   break;
-               case 148:
+               case 151:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 23)
                      kind = 23;
-                  { jjCheckNAdd(148); }
+                  { jjCheckNAdd(151); }
                   break;
-               case 149:
+               case 152:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 21)
                      kind = 21;
                   { jjCheckNAddStates(0, 6); }
                   break;
-               case 150:
+               case 153:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(132, 134); }
+                     { jjCheckNAddTwoStates(135, 137); }
                   break;
-               case 152:
+               case 155:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(58, 60); }
+                     { jjAddStates(61, 63); }
                   break;
-               case 153:
+               case 156:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 154;
+                     jjstateSet[jjnewStateCnt++] = 157;
                   break;
-               case 154:
-                  if (curChar == 58 && kind > 51)
-                     kind = 51;
+               case 157:
+                  if (curChar == 58 && kind > 55)
+                     kind = 55;
                   break;
-               case 158:
+               case 161:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(61, 63); }
+                     { jjAddStates(64, 66); }
                   break;
-               case 159:
+               case 162:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 160;
+                     jjstateSet[jjnewStateCnt++] = 163;
                   break;
-               case 160:
+               case 163:
                   if (curChar == 58)
                      { jjCheckNAddStates(12, 15); }
                   break;
-               case 161:
+               case 164:
                   if ((0x7ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 162:
+               case 165:
                   if ((0x7ff600000000000L & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 163:
-                  if ((0x7ff200000000000L & l) != 0L && kind > 52)
-                     kind = 52;
+               case 166:
+                  if ((0x7ff200000000000L & l) != 0L && kind > 56)
+                     kind = 56;
                   break;
-               case 167:
+               case 170:
                   if ((0xa800fffa00000000L & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 168:
+               case 171:
                   if (curChar == 37)
-                     { jjAddStates(69, 70); }
+                     { jjAddStates(72, 73); }
                   break;
-               case 169:
+               case 172:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 170;
+                     jjstateSet[jjnewStateCnt++] = 173;
                   break;
-               case 170:
+               case 173:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 171:
+               case 174:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 172;
-                  break;
-               case 172:
-                  if ((0x3ff000000000000L & l) != 0L && kind > 52)
-                     kind = 52;
+                     jjstateSet[jjnewStateCnt++] = 175;
                   break;
-               case 173:
-                  if ((0xa800fffa00000000L & l) != 0L && kind > 52)
-                     kind = 52;
+               case 175:
+                  if ((0x3ff000000000000L & l) != 0L && kind > 56)
+                     kind = 56;
                   break;
                case 176:
+                  if ((0xa800fffa00000000L & l) != 0L && kind > 56)
+                     kind = 56;
+                  break;
+               case 179:
                   if ((0xa800fffa00000000L & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 177:
+               case 180:
                   if (curChar == 37)
-                     jjstateSet[jjnewStateCnt++] = 178;
+                     jjstateSet[jjnewStateCnt++] = 181;
                   break;
-               case 178:
+               case 181:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 179;
+                     jjstateSet[jjnewStateCnt++] = 182;
                   break;
-               case 179:
+               case 182:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 188:
+               case 191:
                   if (curChar != 58)
                      break;
-                  if (kind > 51)
-                     kind = 51;
+                  if (kind > 55)
+                     kind = 55;
                   { jjCheckNAddStates(12, 15); }
                   break;
                default : break;
@@ -1054,7 +1087,7 @@ else if (curChar < 128)
             {
                case 0:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(71, 78); }
+                     { jjCheckNAddStates(74, 81); }
                   else if (curChar == 64)
                      { jjCheckNAdd(125); }
                   else if (curChar == 95)
@@ -1073,7 +1106,7 @@ else if (curChar == 91)
                   break;
                case 8:
                   if (curChar == 92)
-                     { jjAddStates(79, 80); }
+                     { jjAddStates(82, 83); }
                   break;
                case 9:
                   if (curChar == 85)
@@ -1130,7 +1163,7 @@ else if (curChar == 91)
                   break;
                case 25:
                   if (curChar == 92)
-                     { jjAddStates(81, 83); }
+                     { jjAddStates(84, 86); }
                   break;
                case 26:
                   if ((0x14404410000000L & l) != 0L)
@@ -1191,7 +1224,7 @@ else if (curChar == 91)
                   break;
                case 43:
                   if (curChar == 92)
-                     { jjAddStates(84, 86); }
+                     { jjAddStates(87, 89); }
                   break;
                case 44:
                   if ((0x14404410000000L & l) != 0L)
@@ -1252,7 +1285,7 @@ else if (curChar == 91)
                   break;
                case 63:
                   if (curChar == 92)
-                     { jjAddStates(87, 89); }
+                     { jjAddStates(90, 92); }
                   break;
                case 64:
                   if ((0x14404410000000L & l) != 0L)
@@ -1313,7 +1346,7 @@ else if (curChar == 91)
                   break;
                case 87:
                   if (curChar == 92)
-                     { jjAddStates(90, 92); }
+                     { jjAddStates(93, 95); }
                   break;
                case 88:
                   if ((0x14404410000000L & l) != 0L)
@@ -1382,8 +1415,8 @@ else if (curChar == 91)
                case 115:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 57)
+                     kind = 57;
                   { jjCheckNAddStates(51, 53); }
                   break;
                case 116:
@@ -1391,8 +1424,8 @@ else if (curChar == 91)
                      { jjCheckNAddStates(51, 53); }
                   break;
                case 117:
-                  if ((0x7fffffe87fffffeL & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x7fffffe87fffffeL & l) != 0L && kind > 57)
+                     kind = 57;
                   break;
                case 123:
                   if (curChar == 95)
@@ -1405,113 +1438,120 @@ else if (curChar == 91)
                case 125:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAddTwoStates(125, 126); }
+                  if (kind > 58)
+                     kind = 58;
+                  { jjCheckNAddStates(96, 98); }
                   break;
                case 127:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
-                  if (kind > 54)
-                     kind = 54;
-                  { jjCheckNAddTwoStates(126, 127); }
+                  if (kind > 58)
+                     kind = 58;
+                  { jjCheckNAddStates(54, 56); }
                   break;
-               case 135:
+               case 129:
+                  if ((0x7fffffe07fffffeL & l) == 0L)
+                     break;
+                  if (kind > 58)
+                     kind = 58;
+                  jjstateSet[jjnewStateCnt++] = 129;
+                  break;
+               case 138:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(93, 94); }
+                     { jjAddStates(99, 100); }
                   break;
-               case 142:
+               case 145:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(95, 96); }
+                     { jjAddStates(101, 102); }
                   break;
-               case 146:
+               case 149:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(97, 98); }
+                     { jjAddStates(103, 104); }
                   break;
-               case 151:
+               case 154:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(71, 78); }
+                     { jjCheckNAddStates(74, 81); }
                   break;
-               case 152:
+               case 155:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(61, 63); }
                   break;
-               case 153:
+               case 156:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAdd(154); }
+                     { jjCheckNAdd(157); }
                   break;
-               case 158:
+               case 161:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(61, 63); }
+                     { jjCheckNAddStates(64, 66); }
                   break;
-               case 159:
+               case 162:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAdd(160); }
+                     { jjCheckNAdd(163); }
                   break;
-               case 161:
+               case 164:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 162:
+               case 165:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
-                  break;
-               case 163:
-                  if ((0x7fffffe87fffffeL & l) != 0L && kind > 52)
-                     kind = 52;
+                     { jjCheckNAddStates(67, 71); }
                   break;
                case 166:
+                  if ((0x7fffffe87fffffeL & l) != 0L && kind > 56)
+                     kind = 56;
+                  break;
+               case 169:
                   if (curChar == 92)
-                     { jjAddStates(99, 100); }
+                     { jjAddStates(105, 106); }
                   break;
-               case 167:
+               case 170:
                   if ((0x4000000080000001L & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 169:
+               case 172:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 170;
+                     jjstateSet[jjnewStateCnt++] = 173;
                   break;
-               case 170:
+               case 173:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 171:
+               case 174:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 172;
+                     jjstateSet[jjnewStateCnt++] = 175;
                   break;
-               case 172:
-                  if ((0x7e0000007eL & l) != 0L && kind > 52)
-                     kind = 52;
+               case 175:
+                  if ((0x7e0000007eL & l) != 0L && kind > 56)
+                     kind = 56;
                   break;
-               case 173:
-                  if ((0x4000000080000001L & l) != 0L && kind > 52)
-                     kind = 52;
+               case 176:
+                  if ((0x4000000080000001L & l) != 0L && kind > 56)
+                     kind = 56;
                   break;
-               case 175:
+               case 178:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 176;
+                     jjstateSet[jjnewStateCnt++] = 179;
                   break;
-               case 176:
+               case 179:
                   if ((0x4000000080000001L & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 178:
+               case 181:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 179;
+                     jjstateSet[jjnewStateCnt++] = 182;
                   break;
-               case 179:
+               case 182:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
                default : break;
             }
@@ -1530,9 +1570,9 @@ else if (curChar == 91)
             {
                case 0:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(71, 78); }
+                     { jjCheckNAddStates(74, 81); }
                   if (jjCanMove_19(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(101, 102); }
+                     { jjAddStates(107, 108); }
                   break;
                case 1:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1568,8 +1608,8 @@ else if (curChar == 91)
                case 115:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 57)
+                     kind = 57;
                   { jjCheckNAddStates(51, 53); }
                   break;
                case 116:
@@ -1577,20 +1617,20 @@ else if (curChar == 91)
                      { jjCheckNAddStates(51, 53); }
                   break;
                case 117:
-                  if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 53)
-                     kind = 53;
+                  if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 57)
+                     kind = 57;
                   break;
                case 118:
                   if (jjCanMove_3(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(103, 104); }
+                     { jjAddStates(109, 110); }
                   break;
                case 119:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(51, 53); }
                   break;
                case 120:
-                  if (jjCanMove_5(hiByte, i1, i2, l1, l2) && kind > 53)
-                     kind = 53;
+                  if (jjCanMove_5(hiByte, i1, i2, l1, l2) && kind > 57)
+                     kind = 57;
                   break;
                case 121:
                   if (jjCanMove_6(hiByte, i1, i2, l1, l2))
@@ -1599,103 +1639,103 @@ else if (curChar == 91)
                case 122:
                   if (!jjCanMove_7(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 53)
-                     kind = 53;
+                  if (kind > 57)
+                     kind = 57;
                   { jjCheckNAddStates(51, 53); }
                   break;
-               case 151:
+               case 154:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(71, 78); }
+                     { jjCheckNAddStates(74, 81); }
                   break;
-               case 152:
+               case 155:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(61, 63); }
                   break;
-               case 153:
+               case 156:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(154); }
+                     { jjCheckNAdd(157); }
                   break;
-               case 155:
+               case 158:
                   if (jjCanMove_8(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(105, 106); }
+                     { jjAddStates(111, 112); }
                   break;
-               case 156:
+               case 159:
                   if (jjCanMove_9(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(61, 63); }
                   break;
-               case 157:
+               case 160:
                   if (jjCanMove_10(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(154); }
+                     { jjCheckNAdd(157); }
                   break;
-               case 158:
+               case 161:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(61, 63); }
+                     { jjCheckNAddStates(64, 66); }
                   break;
-               case 159:
+               case 162:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(160); }
+                     { jjCheckNAdd(163); }
                   break;
-               case 161:
+               case 164:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 162:
+               case 165:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 163:
-                  if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 52)
-                     kind = 52;
+               case 166:
+                  if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 56)
+                     kind = 56;
                   break;
-               case 164:
+               case 167:
                   if (jjCanMove_11(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(107, 108); }
+                     { jjAddStates(113, 114); }
                   break;
-               case 165:
+               case 168:
                   if (jjCanMove_12(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(64, 68); }
+                     { jjCheckNAddStates(67, 71); }
                   break;
-               case 174:
-                  if (jjCanMove_13(hiByte, i1, i2, l1, l2) && kind > 52)
-                     kind = 52;
+               case 177:
+                  if (jjCanMove_13(hiByte, i1, i2, l1, l2) && kind > 56)
+                     kind = 56;
                   break;
-               case 180:
+               case 183:
                   if (jjCanMove_14(hiByte, i1, i2, l1, l2))
-                     jjstateSet[jjnewStateCnt++] = 181;
+                     jjstateSet[jjnewStateCnt++] = 184;
                   break;
-               case 181:
+               case 184:
                   if (!jjCanMove_15(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 52)
-                     kind = 52;
-                  { jjCheckNAddStates(64, 68); }
+                  if (kind > 56)
+                     kind = 56;
+                  { jjCheckNAddStates(67, 71); }
                   break;
-               case 182:
+               case 185:
                   if (jjCanMove_16(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(109, 110); }
+                     { jjAddStates(115, 116); }
                   break;
-               case 183:
+               case 186:
                   if (jjCanMove_17(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(61, 63); }
+                     { jjCheckNAddStates(64, 66); }
                   break;
-               case 184:
+               case 187:
                   if (jjCanMove_18(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(160); }
+                     { jjCheckNAdd(163); }
                   break;
-               case 185:
+               case 188:
                   if (jjCanMove_19(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(101, 102); }
+                     { jjAddStates(107, 108); }
                   break;
-               case 186:
+               case 189:
                   if (jjCanMove_20(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(111, 114); }
+                     { jjCheckNAddStates(117, 120); }
                   break;
-               case 187:
+               case 190:
                   if (jjCanMove_21(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(115, 118); }
+                     { jjCheckNAddStates(121, 124); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -1708,7 +1748,7 @@ else if (curChar == 91)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 189 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 192 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -1736,12 +1776,13 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
-"", null, null, null, null, null, null, null, "\141",
-"\100\160\162\145\146\151\170", "\100\142\141\163\145", null, null, null, null, null, "\ufeff", null, "\53",
-"\55", null, null, null, null, null, null, null, null, null, null, null, null, null,
-null, null, "\50", "\51", "\173", "\175", "\133", "\135", null, "\73", "\54", "\56",
-"\74\74", "\76\76", "\173\174", "\174\175", "\136\136", "\100", null, null, null, null,
-null, null, null, null, null, null, null, null, null, null, null, null, null, null, };
+"", null, null, null, null, null, null, null, "\141", 
+"\100\160\162\145\146\151\170", "\100\142\141\163\145", null, null, null, null, null, "\ufeff", null, "\53", 
+"\55", null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, "\50", "\51", "\173", "\175", "\133", "\135", null, "\73", "\54", "\56", 
+"\136\136", "\100", "\74\74\50", "\51\76\76", "\74\74", "\76\76", "\173\174", "\174\175", 
+"\176", "\174", null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, };
 protected Token jjFillToken()
 {
    final Token t;
@@ -1766,14 +1807,14 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   129, 130, 131, 139, 140, 145, 146, 129, 130, 131, 133, 138, 161, 175, 177, 180,
-   6, 7, 8, 1, 2, 4, 41, 42, 43, 23, 24, 25, 59, 60, 61, 63,
-   62, 79, 83, 84, 85, 87, 86, 103, 107, 108, 109, 113, 110, 111, 107, 110,
-   111, 115, 121, 116, 117, 118, 139, 140, 145, 146, 152, 153, 155, 158, 159, 182,
-   162, 163, 164, 166, 168, 169, 171, 152, 153, 154, 158, 159, 160, 182, 155, 9,
-   18, 26, 27, 36, 44, 45, 54, 64, 65, 74, 88, 89, 98, 136, 137, 143,
-   144, 147, 148, 167, 173, 186, 187, 119, 120, 156, 157, 165, 174, 183, 184, 152,
-   153, 154, 155, 158, 159, 160, 182,
+   132, 133, 134, 142, 143, 148, 149, 132, 133, 134, 136, 141, 164, 178, 180, 183, 
+   6, 7, 8, 1, 2, 4, 41, 42, 43, 23, 24, 25, 59, 60, 61, 63, 
+   62, 79, 83, 84, 85, 87, 86, 103, 107, 108, 109, 113, 110, 111, 107, 110, 
+   111, 115, 121, 116, 117, 118, 126, 127, 130, 142, 143, 148, 149, 155, 156, 158, 
+   161, 162, 185, 165, 166, 167, 169, 171, 172, 174, 155, 156, 157, 161, 162, 163, 
+   185, 158, 9, 18, 26, 27, 36, 44, 45, 54, 64, 65, 74, 88, 89, 98, 
+   125, 126, 130, 139, 140, 146, 147, 150, 151, 170, 176, 189, 190, 119, 120, 159, 
+   160, 168, 177, 186, 187, 155, 156, 157, 158, 161, 162, 163, 185, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -2034,7 +2075,7 @@ private static final boolean jjCanMove_21(int hiByte, int i1, int i2, long l1, l
 int jjmatchedKind;
 
 /** Get the next Token. */
-public Token getNextToken()
+public Token getNextToken() 
 {
   Token specialToken = null;
   Token matchedToken;
@@ -2176,7 +2217,7 @@ public TurtleJavaccTokenManager (SimpleCharStream stream, int lexState){
   }
 
   /** Reinitialise parser. */
-
+  
   public void ReInit(SimpleCharStream stream)
   {
 
@@ -2193,13 +2234,13 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 189; i-- > 0;)
+    for (i = 192; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
   /** Reinitialise parser. */
   public void ReInit(SimpleCharStream stream, int lexState)
-
+  
   {
     ReInit(stream);
     SwitchTo(lexState);
@@ -2222,26 +2263,26 @@ public void SwitchTo(int lexState)
 
 /** Lex State array. */
 public static final int[] jjnewLexState = {
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0x7fffff80ef7f01L, 0x0L,
+   0x7ffffff80ef7f01L, 0x0L, 
 };
 static final long[] jjtoSkip = {
-   0xbeL, 0x0L,
+   0xbeL, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x80L, 0x0L,
+   0x80L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x0L, 0x0L,
+   0x0L, 0x0L, 
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[189];
-    private final int[] jjstateSet = new int[2 * 189];
+    private final int[] jjrounds = new int[192];
+    private final int[] jjstateSet = new int[2 * 192];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatter.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatter.java
index e846c31f7c9..18e52aa6b96 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatter.java
@@ -46,6 +46,9 @@ public interface NodeFormatter
     /** String with language tag */
     public void formatLitLang(AWriter w, String lex, String langTag);
 
+    /** String with language tag and base direction */
+    public void formatLitLangDir(AWriter w, String lex, String langTag, String direction);
+
     /** Literal with datatype, not a simple literal, not an xsd:string (RDF 1.1), no language tag. */
     public void formatLitDT(AWriter w, String lex, String datatypeURI);
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
index 2aa753d7ade..28885806ab2 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
@@ -23,6 +23,7 @@
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.Node_Triple;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.sparql.ARQInternalErrorException;
 
@@ -54,13 +55,13 @@ else if ( n instanceof Node_Triple )
 
     protected void formatNodeTriple(AWriter w, Node n) {
         Triple t = n.getTriple();
-        w.print("<< ");
+        w.print("<<( ");
         format(w, t.getSubject());
         w.print(" ");
         format(w, t.getPredicate());
         w.print(" ");
         format(w, t.getObject());
-        w.print(" >>");
+        w.print(" )>>");
     }
 
     @Override
@@ -74,8 +75,11 @@ public void formatLiteral(AWriter w, Node n) {
         RDFDatatype dt = n.getLiteralDatatype();
         String lang = n.getLiteralLanguage();
         String lex = n.getLiteralLexicalForm();
+        TextDirection textDir = n.getLiteralBaseDirection();
 
-        if ( lang != null && ! lang.equals("") ) {
+        if ( textDir != null ) {
+            formatLitLangDir(w, lex, lang, textDir.direction());
+        } else if ( lang != null && ! lang.equals("") ) {
             formatLitLang(w, lex, lang);
         } else if ( dt == null ) {
             // RDF 1.0, simple literal.
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java
index f02610fb2b3..2c6f760de20 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java
@@ -74,6 +74,15 @@ public void formatLitLang(AWriter w, String lex, String langTag) {
         w.print(langTag);
     }
 
+    @Override
+    public void formatLitLangDir(AWriter w, String lex, String langTag, String direction) {
+        writeEscaped(w, lex);
+        w.print('@');
+        w.print(langTag);
+        w.print("--");
+        w.print(direction);
+    }
+
     @Override
     public void formatLitDT(AWriter w, String lex, String datatypeURI) {
         writeEscaped(w, lex);
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Binding2Protobuf.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Binding2Protobuf.java
index c098fb4a435..e782473278d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Binding2Protobuf.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Binding2Protobuf.java
@@ -18,28 +18,28 @@
 
 package org.apache.jena.riot.protobuf;
 
-import java.io.OutputStream ;
-import java.util.Collection ;
-import java.util.Iterator ;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.Iterator;
 
-import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Node;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.*;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.binding.Binding;
 
 /** Converted from Bindings to SPARQL result set encoded in Protobuf */
 public class Binding2Protobuf implements AutoCloseable {
     private final RDF_DataTuple.Builder row = RDF_DataTuple.newBuilder();
     private final RDF_Term.Builder term = RDF_Term.newBuilder();
-    private final Collection<Var> vars ;
-    private final OutputStream out ;
-    private final boolean encodeValues ;
+    private final Collection<Var> vars;
+    private final OutputStream out;
+    private final boolean encodeValues;
 
     public Binding2Protobuf(OutputStream out, Collection<Var> vars, boolean encodeValues) {
-        this.out = out ;
-        this.vars = vars ;
-        this.encodeValues = encodeValues ;
-        varsRow() ;
+        this.out = out;
+        this.vars = vars;
+        this.encodeValues = encodeValues;
+        varsRow();
     }
 
     private void varsRow() {
@@ -55,15 +55,15 @@ private void varsRow() {
 
     public void output(Binding binding) {
         row.clear();
-        Iterator<Var> vIter = (vars == null ? null : vars.iterator()) ;
+        Iterator<Var> vIter = (vars == null ? null : vars.iterator());
         if ( vIter == null )
-            vIter = binding.vars() ;
+            vIter = binding.vars();
         vIter.forEachRemaining(v -> {
             term.clear();
-            Node n = binding.get(v) ;
+            Node n = binding.get(v);
             RDF_Term rt = ProtobufConvert.toProtobuf(n, term, encodeValues);
             row.addRow(rt);
-        }) ;
+        });
         PBufRDF.writeDelimitedTo(row.build(), out);
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Protobuf2Binding.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Protobuf2Binding.java
index cdb9b13b560..e218b5b7ff4 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Protobuf2Binding.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/Protobuf2Binding.java
@@ -19,32 +19,32 @@
 package org.apache.jena.riot.protobuf;
 
 import java.io.IOException;
-import java.io.InputStream ;
-import java.util.ArrayList ;
-import java.util.Iterator ;
-import java.util.List ;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.jena.atlas.io.IO;
-import org.apache.jena.atlas.iterator.IteratorSlotted ;
-import org.apache.jena.graph.Node ;
+import org.apache.jena.atlas.iterator.IteratorSlotted;
+import org.apache.jena.graph.Node;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_DataTuple;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Term;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_VarTuple;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.engine.binding.BindingBuilder;
 
-/** Converted from SPARQL result set encoded in Thrift to Bindings */
-public class Protobuf2Binding extends IteratorSlotted<Binding> implements Iterator<Binding> {
+/** Convert from SPARQL result set encoded in Protobuf to Bindings */
+class Protobuf2Binding extends IteratorSlotted<Binding> implements Iterator<Binding> {
 
-    private List<Var> vars = new ArrayList<>() ;
-    private List<String> varNames = new ArrayList<>() ;
-    private InputStream input ;
-    private BindingBuilder b = Binding.builder() ;
+    private List<Var> vars = new ArrayList<>();
+    private List<String> varNames = new ArrayList<>();
+    private InputStream input;
+    private BindingBuilder b = Binding.builder();
 
-    public Protobuf2Binding(InputStream input) {
-        this.input = input ;
-        readVars() ;
+    Protobuf2Binding(InputStream input) {
+        this.input = input;
+        readVars();
     }
 
     private void readVars() {
@@ -52,13 +52,13 @@ private void readVars() {
             RDF_VarTuple vrow = RDF_VarTuple.parseDelimitedFrom(input);
             if ( vrow != null )
                 vrow.getVarsList().forEach(rv->varNames.add(rv.getName()));
-            vars = Var.varList(varNames) ;
+            vars = Var.varList(varNames);
         } catch (IOException ex) { IO.exception(ex); }
     }
 
-    public List<Var> getVars()              { return vars ; }
+    List<Var> getVars()              { return vars; }
 
-    public List<String> getVarNames()       { return varNames ; }
+    List<String> getVarNames()       { return varNames; }
 
     @Override
     protected Binding moveToNext() {
@@ -69,22 +69,22 @@ protected Binding moveToNext() {
                 return null;
             List<RDF_Term> row = dataTuple.getRowList();
             if ( row.size() != vars.size() )
-                throw new RiotProtobufException(String.format("Vars %d : Row length : %d", vars.size(), row.size())) ;
-            for ( int i = 0 ;  i < vars.size() ; i++ ) {
+                throw new RiotProtobufException(String.format("Vars %d : Row length : %d", vars.size(), row.size()));
+            for ( int i = 0;  i < vars.size(); i++ ) {
                 // Old school
-                Var v = vars.get(i) ;
-                RDF_Term rt = row.get(i) ;
+                Var v = vars.get(i);
+                RDF_Term rt = row.get(i);
                 if ( rt.hasUndefined() )
-                    continue ;
-                Node n = ProtobufConvert.convert(rt) ;
-                b.add(v, n) ;
+                    continue;
+                Node n = ProtobufConvert.convert(rt);
+                b.add(v, n);
             }
         } catch (IOException ex) { IO.exception(ex); }
-        return b.build() ;
+        return b.build();
     }
 
     @Override
     protected boolean hasMore() {
-        return true ;
+        return true;
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufConvert.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufConvert.java
index ed846a4b58d..a4207f9e72b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufConvert.java
@@ -20,23 +20,25 @@
 
 
 import java.math.BigDecimal;
-import java.math.BigInteger ;
+import java.math.BigInteger;
 
 import org.apache.jena.atlas.lib.Cache;
-import org.apache.jena.atlas.lib.Pair ;
-import org.apache.jena.datatypes.RDFDatatype ;
-import org.apache.jena.datatypes.xsd.XSDDatatype ;
-import org.apache.jena.datatypes.xsd.impl.RDFLangString ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.graph.Triple ;
+import org.apache.jena.atlas.lib.Pair;
+import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.datatypes.xsd.impl.RDFDirLangString;
+import org.apache.jena.datatypes.xsd.impl.RDFLangString;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
+import org.apache.jena.graph.Triple;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.*;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.PrefixMapFactory ;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapFactory;
 import org.apache.jena.riot.system.RiotLib;
 import org.apache.jena.sparql.core.Quad;
-//port org.apache.jena.sparql.core.Quad ;
-import org.apache.jena.sparql.core.Var ;
+//port org.apache.jena.sparql.core.Quad;
+import org.apache.jena.sparql.core.Var;
 
 /** Convert to and from Protobuf wire objects.
  * <p>
@@ -52,8 +54,8 @@
  */
 public class ProtobufConvert
 {
-    static final BigInteger MAX_I = BigInteger.valueOf(Long.MAX_VALUE) ;
-    static final BigInteger MIN_I = BigInteger.valueOf(Long.MIN_VALUE) ;
+    static final BigInteger MAX_I = BigInteger.valueOf(Long.MAX_VALUE);
+    static final BigInteger MIN_I = BigInteger.valueOf(Long.MIN_VALUE);
 
     /** Attempt to encode a node by value (integer, decimal, double) into an RDF_term.
      * @param node
@@ -62,25 +64,25 @@ public class ProtobufConvert
      */
     private static RDF_Term toProtobufValue(Node node, RDF_Term.Builder term) {
         if ( ! node.isLiteral() )
-            return null ;
+            return null;
         term.clear();
         // Value cases : Integer, Double, Decimal
-        String lex = node.getLiteralLexicalForm() ;
-        RDFDatatype rdt = node.getLiteralDatatype() ;
+        String lex = node.getLiteralLexicalForm();
+        RDFDatatype rdt = node.getLiteralDatatype();
 
         // RDF 1.1
         if ( rdt == null )
-            return null ;
+            return null;
 
         if ( rdt.equals(XSDDatatype.XSDdecimal) ) {
             if ( rdt.isValid(lex)) {
-                BigDecimal decimal = new BigDecimal(lex.trim()) ;
-                int scale = decimal.scale() ;
-                BigInteger bigInt = decimal.unscaledValue() ;
+                BigDecimal decimal = new BigDecimal(lex.trim());
+                int scale = decimal.scale();
+                BigInteger bigInt = decimal.unscaledValue();
                 if ( bigInt.compareTo(MAX_I) <= 0 && bigInt.compareTo(MIN_I) >= 0 ) {
                     // This check makes sure that bigInt.longValue() is safe
                     RDF_Decimal.Builder d = RDF_Decimal.newBuilder().setValue(bigInt.longValue()).setScale(scale);
-                    term.setValDecimal(d) ;
+                    term.setValDecimal(d);
                     return term.build();
                 }
             }
@@ -97,8 +99,8 @@ private static RDF_Term toProtobufValue(Node node, RDF_Term.Builder term) {
             // Conservative - no derived types.
             if ( rdt.isValid(lex)) {
                 try {
-                    long v = ((Number)node.getLiteralValue()).longValue() ;
-                    term.setValInteger(v) ;
+                    long v = ((Number)node.getLiteralValue()).longValue();
+                    term.setValInteger(v);
                     return term.build();
                 }
                 // Out of range for the type, not a long etc etc.
@@ -108,15 +110,15 @@ private static RDF_Term toProtobufValue(Node node, RDF_Term.Builder term) {
             // XSDfloat??
             if ( rdt.isValid(lex)) {
                 try {
-                    double v = ((Double)node.getLiteralValue()).doubleValue() ;
-                    term.setValDouble(v) ;
-                    return term.build() ;
+                    double v = ((Double)node.getLiteralValue()).doubleValue();
+                    term.setValDouble(v);
+                    return term.build();
                 }
                 // Out of range for the type, ...
                 catch (Throwable ex) { }
             }
         }
-        return null ;
+        return null;
     }
 
     private static RDF_UNDEF rdfUNDEF = RDF_UNDEF.newBuilder().build();
@@ -127,18 +129,18 @@ private static RDF_Term toProtobufValue(Node node, RDF_Term.Builder term) {
 
     private static String dtXSDString = XSDDatatype.XSDstring.getURI();
 
-    private static final PrefixMap emptyPrefixMap = PrefixMapFactory.emptyPrefixMap() ;
+    private static final PrefixMap emptyPrefixMap = PrefixMapFactory.emptyPrefixMap();
 
     // ---- From Protobuf
 
     /** Build a {@link Node} from an {@link RDF_Term}. */
     public static Node convert(RDF_Term term) {
-        return convert(null, term) ;
+        return convert(null, term);
     }
 
     /** Build a {@link Node} from an {@link RDF_Term}. */
     public static Node convert(Cache<String, Node> uriCache, RDF_Term term) {
-        return convert(uriCache, term, null) ;
+        return convert(uriCache, term, null);
     }
 
     // Create URI, using a cached copy if possible.
@@ -164,31 +166,46 @@ public static Node convert(RDF_Term term, PrefixMap pmap) {
     public static Node convert(Cache<String, Node> uriCache, RDF_Term term, PrefixMap pmap) {
         switch (term.getTermCase()) {
             case IRI :
-                return uri(uriCache, term.getIri().getIri()) ;
+                return uri(uriCache, term.getIri().getIri());
             case BNODE :
-                return NodeFactory.createBlankNode(term.getBnode().getLabel()) ;
+                return NodeFactory.createBlankNode(term.getBnode().getLabel());
             case LITERAL : {
                 if ( term.hasLiteral() ) {
-                    RDF_Literal lit = term.getLiteral() ;
-                    String lex = lit.getLex() ;
+                    RDF_Literal lit = term.getLiteral();
+                    String lex = lit.getLex();
                     switch ( lit.getLiteralKindCase() ) {
                         case SIMPLE :
-                            return NodeFactory.createLiteralString(lex) ;
+                            return NodeFactory.createLiteralString(lex);
                         case LANGTAG : {
                             String lang = lit.getLangtag();
-                            return NodeFactory.createLiteralLang(lex, lang) ;
+                            return NodeFactory.createLiteralLang(lex, lang);
+                        }
+                        case LANGDIR : {
+                            // Combined language tag and base direction.
+                            String langdir = lit.getLangdir();
+                            String lang;
+                            String dir;
+                            int idx = langdir.indexOf("--");
+                            if ( idx >= 0 ) {
+                                lang = langdir.substring(0, idx);
+                                dir = langdir.substring(idx+2);
+                            } else {
+                                throw new RiotProtobufException("Bad langusage-base direction value: "+langdir);
+                            }
+                            return NodeFactory.createLiteralDirLang(lex, lang, dir);
                         }
+
                         case DATATYPE : {
                             String dtString = lit.getDatatype();
-                            RDFDatatype dt = NodeFactory.getType(dtString) ;
-                            return NodeFactory.createLiteralDT(lex, dt) ;
+                            RDFDatatype dt = NodeFactory.getType(dtString);
+                            return NodeFactory.createLiteralDT(lex, dt);
                         }
                         case DTPREFIX : {
                             String x = expand(lit.getDtPrefix(), pmap);
                             if ( x == null )
-                                throw new RiotProtobufException("Failed to expand datatype prefix name: "+lit.getDtPrefix()) ;
-                            RDFDatatype dt = NodeFactory.getType(x) ;
-                            return NodeFactory.createLiteralDT(lex, dt) ;
+                                throw new RiotProtobufException("Failed to expand datatype prefix name: "+lit.getDtPrefix());
+                            RDFDatatype dt = NodeFactory.getType(x);
+                            return NodeFactory.createLiteralDT(lex, dt);
                         }
                         case LITERALKIND_NOT_SET :
                             throw new RiotProtobufException("Literal kind not set.");
@@ -196,57 +213,57 @@ public static Node convert(Cache<String, Node> uriCache, RDF_Term term, PrefixMa
                 }
             }
             case PREFIXNAME : {
-                String x = expand(term.getPrefixName(), pmap) ;
+                String x = expand(term.getPrefixName(), pmap);
                 if ( x != null )
-                    return uri(uriCache, x) ;
-                throw new RiotProtobufException("Failed to expand "+term) ;
+                    return uri(uriCache, x);
+                throw new RiotProtobufException("Failed to expand "+term);
             }
             case VARIABLE :
-                return Var.alloc(term.getVariable().getName()) ;
+                return Var.alloc(term.getVariable().getName());
             case TRIPLETERM : {
                 RDF_Triple rt = term.getTripleTerm();
                 Triple t = convert(rt, pmap);
-                return NodeFactory.createTripleNode(t);
+                return NodeFactory.createTripleTerm(t);
             }
             case ANY :
-                return Node.ANY ;
+                return Node.ANY;
             case REPEAT :
-                throw new RiotProtobufException("REPEAT not implemented") ;
+                throw new RiotProtobufException("REPEAT not implemented");
             case UNDEFINED :
                 return null;
             case VALINTEGER : {
-                long x = term.getValInteger() ;
-                String lex = Long.toString(x, 10) ;
-                RDFDatatype dt = XSDDatatype.XSDinteger ;
-                return NodeFactory.createLiteralDT(lex, dt) ;
+                long x = term.getValInteger();
+                String lex = Long.toString(x, 10);
+                RDFDatatype dt = XSDDatatype.XSDinteger;
+                return NodeFactory.createLiteralDT(lex, dt);
             }
             case VALDOUBLE : {
-                double x = term.getValDouble() ;
-                String lex = Double.toString(x) ;
-                RDFDatatype dt = XSDDatatype.XSDdouble ;
-                return NodeFactory.createLiteralDT(lex, dt) ;
+                double x = term.getValDouble();
+                String lex = Double.toString(x);
+                RDFDatatype dt = XSDDatatype.XSDdouble;
+                return NodeFactory.createLiteralDT(lex, dt);
             }
             case VALDECIMAL : {
-                long value = term.getValDecimal().getValue() ;
-                int scale =  term.getValDecimal().getScale() ;
-                BigDecimal d =  BigDecimal.valueOf(value, scale) ;
-                String lex = d.toPlainString() ;
-                RDFDatatype dt = XSDDatatype.XSDdecimal ;
-                return NodeFactory.createLiteralDT(lex, dt) ;
+                long value = term.getValDecimal().getValue();
+                int scale =  term.getValDecimal().getScale();
+                BigDecimal d =  BigDecimal.valueOf(value, scale);
+                String lex = d.toPlainString();
+                RDFDatatype dt = XSDDatatype.XSDdecimal;
+                return NodeFactory.createLiteralDT(lex, dt);
             }
             case TERM_NOT_SET :
-                throw new RiotProtobufException("RDF_Term not set") ;
+                throw new RiotProtobufException("RDF_Term not set");
             default:
-                throw new RiotProtobufException("No conversion to a Node: "+term.toString()) ;
+                throw new RiotProtobufException("No conversion to a Node: "+term.toString());
         }
     }
 
     public static Triple convert(RDF_Triple triple) {
-        return convert(null, triple, null) ;
+        return convert(null, triple, null);
     }
 
     public static Triple convert(Cache<String, Node> uriCache, RDF_Triple triple) {
-        return convert(uriCache, triple, null) ;
+        return convert(uriCache, triple, null);
     }
 
     public static Triple convert(RDF_Triple rt, PrefixMap pmap) {
@@ -254,10 +271,10 @@ public static Triple convert(RDF_Triple rt, PrefixMap pmap) {
     }
 
     public static Triple convert(Cache<String, Node> uriCache, RDF_Triple rt, PrefixMap pmap) {
-        Node s = convert(uriCache, rt.getS(), pmap) ;
-        Node p = convert(uriCache, rt.getP(), pmap) ;
-        Node o = convert(uriCache, rt.getO(), pmap) ;
-        return Triple.create(s, p, o) ;
+        Node s = convert(uriCache, rt.getS(), pmap);
+        Node p = convert(uriCache, rt.getP(), pmap);
+        Node o = convert(uriCache, rt.getO(), pmap);
+        return Triple.create(s, p, o);
     }
 
     public static Quad convert(RDF_Quad rq, PrefixMap pmap) {
@@ -265,11 +282,11 @@ public static Quad convert(RDF_Quad rq, PrefixMap pmap) {
     }
 
     public static Quad convert(Cache<String, Node> uriCache, RDF_Quad rq, PrefixMap pmap) {
-        Node g = (rq.hasG() ? convert(uriCache,rq.getG(), pmap) : null ) ;
-        Node s = convert(uriCache,rq.getS(), pmap) ;
-        Node p = convert(uriCache,rq.getP(), pmap) ;
-        Node o = convert(uriCache,rq.getO(), pmap) ;
-        return Quad.create(g, s, p, o) ;
+        Node g = (rq.hasG() ? convert(uriCache,rq.getG(), pmap) : null );
+        Node s = convert(uriCache,rq.getS(), pmap);
+        Node p = convert(uriCache,rq.getP(), pmap);
+        Node o = convert(uriCache,rq.getO(), pmap);
+        return Quad.create(g, s, p, o);
     }
 
     /**
@@ -294,12 +311,12 @@ public static RDF_Term toProtobuf(Node node, PrefixMap pmap, RDF_Term.Builder te
             return UNDEF;
 
         if ( node.isURI() ) {
-            RDF_PrefixName prefixName = abbrev(node.getURI(), pmap) ;
+            RDF_PrefixName prefixName = abbrev(node.getURI(), pmap);
             if ( prefixName != null ) {
-                termBuilder.setPrefixName(prefixName) ;
+                termBuilder.setPrefixName(prefixName);
                 return termBuilder.build();
             }
-            RDF_IRI iri = RDF_IRI.newBuilder().setIri(node.getURI()).build() ;
+            RDF_IRI iri = RDF_IRI.newBuilder().setIri(node.getURI()).build();
             return termBuilder.setIri(iri).build();
         }
 
@@ -311,42 +328,50 @@ public static RDF_Term toProtobuf(Node node, PrefixMap pmap, RDF_Term.Builder te
         if ( node.isLiteral() ) {
             // Value cases : Integer, Double, Decimal
             if ( allowValues) {
-                RDF_Term term = toProtobufValue(node, termBuilder) ;
+                RDF_Term term = toProtobufValue(node, termBuilder);
                 if ( term != null )
                     return termBuilder.build();
             }
 
             RDF_Literal.Builder literal = RDF_Literal.newBuilder();
-            String lex = node.getLiteralLexicalForm() ;
+            String lex = node.getLiteralLexicalForm();
             literal.setLex(lex);
 
             // Protobuf default string is ""
 
-            String dt = node.getLiteralDatatypeURI() ;
-            String lang = node.getLiteralLanguage() ;
+            String dt = node.getLiteralDatatypeURI();
+            String lang = node.getLiteralLanguage();
+            TextDirection baseDir = node.getLiteralBaseDirection();
+
             if ( lang.isEmpty() )
                 lang = null;
 
             // General encoding.
             if ( node.getLiteralDatatype().equals(XSDDatatype.XSDstring) ||
-                    node.getLiteralDatatype().equals(RDFLangString.rdfLangString) ) {
-                dt = null ;
+                 node.getLiteralDatatype().equals(RDFLangString.rdfLangString) ||
+                 node.getLiteralDatatype().equals(RDFDirLangString.rdfDirLangString) ) {
+                dt = null;
             }
 
-            if ( dt == null && lang == null ) {
-                literal.setSimple(true);
-            } else if ( dt != null ) {
-                RDF_PrefixName dtPrefixName = abbrev(dt, pmap) ;
-                if ( dtPrefixName != null )
-                    literal.setDtPrefix(dtPrefixName) ;
+            if ( dt == null ) {
+                if ( lang == null )
+                    literal.setSimple(true);
+                else if ( baseDir == null )
+                    literal.setLangtag(lang);
                 else {
-                    literal.setDatatype(dt) ;
+                    String langdir = lang+"--"+baseDir.direction();
+                    literal.setLangdir(langdir);
                 }
             } else {
-                //if ( lang != null && ! lang.isEmpty() )
-                literal.setLangtag(lang);
+                // datatype
+                RDF_PrefixName dtPrefixName = abbrev(dt, pmap);
+                if ( dtPrefixName != null )
+                    literal.setDtPrefix(dtPrefixName);
+                else {
+                    literal.setDatatype(dt);
+                }
             }
-            termBuilder.setLiteral(literal) ;
+            termBuilder.setLiteral(literal);
             return termBuilder.build();
         }
 
@@ -355,7 +380,7 @@ public static RDF_Term toProtobuf(Node node, PrefixMap pmap, RDF_Term.Builder te
             return termBuilder.setVariable(var).build();
         }
 
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple triple = node.getTriple();
 
             RDF_Term sTerm = toProtobuf(triple.getSubject(), pmap, termBuilder, allowValues);
@@ -375,78 +400,78 @@ public static RDF_Term toProtobuf(Node node, PrefixMap pmap, RDF_Term.Builder te
         if ( Node.ANY.equals(node))
             return ANY;
 
-        throw new RiotProtobufException("Node conversion not supported: "+node) ;
+        throw new RiotProtobufException("Node conversion not supported: "+node);
     }
 
     private static String expand(RDF_PrefixName prefixName, PrefixMap pmap) {
         if ( pmap == null )
-            return null ;
+            return null;
 
-        String prefix = prefixName.getPrefix() ;
-        String localname  = prefixName.getLocalName() ;
-        String x = pmap.expand(prefix, localname) ;
+        String prefix = prefixName.getPrefix();
+        String localname  = prefixName.getLocalName();
+        String x = pmap.expand(prefix, localname);
         if ( x == null )
-            throw new RiotProtobufException("Failed to expand "+prefixName) ;
-        return x ;
+            throw new RiotProtobufException("Failed to expand "+prefixName);
+        return x;
     }
 
 
     public static RDF_Term convert(Node node, boolean allowValues) {
-        return convert(node, null, allowValues) ;
+        return convert(node, null, allowValues);
     }
 
     public static RDF_Term convert(Node node, PrefixMap pmap, boolean allowValues) {
         RDF_Term.Builder n = RDF_Term.newBuilder();
-        return toProtobuf(node, pmap, n, allowValues) ;
+        return toProtobuf(node, pmap, n, allowValues);
     }
 
     /** Produce a {@link RDF_PrefixName} is possible. */
     private static RDF_PrefixName abbrev(String uriStr, PrefixMap pmap) {
         if ( pmap == null )
-            return null ;
-        Pair<String, String> p = pmap.abbrev(uriStr) ;
+            return null;
+        Pair<String, String> p = pmap.abbrev(uriStr);
         if ( p == null )
-            return null ;
+            return null;
         return RDF_PrefixName.newBuilder().setPrefix(p.getLeft()).setLocalName(p.getRight()).build();
     }
 
     public static RDF_Triple convert(Triple triple, boolean allowValues) {
-        return convert(triple, null, allowValues) ;
+        return convert(triple, null, allowValues);
     }
 
     public static RDF_Triple convert(Triple triple, PrefixMap pmap, boolean allowValues) {
         RDF_Triple.Builder t = RDF_Triple.newBuilder();
-        RDF_Term s = convert(triple.getSubject(), pmap, allowValues) ;
-        RDF_Term p = convert(triple.getPredicate(), pmap, allowValues) ;
-        RDF_Term o = convert(triple.getObject(), pmap, allowValues) ;
-        t.setS(s) ;
-        t.setP(p) ;
-        t.setO(o) ;
-        return t.build() ;
+        RDF_Term s = convert(triple.getSubject(), pmap, allowValues);
+        RDF_Term p = convert(triple.getPredicate(), pmap, allowValues);
+        RDF_Term o = convert(triple.getObject(), pmap, allowValues);
+        t.setS(s);
+        t.setP(p);
+        t.setO(o);
+        return t.build();
     }
 
     public static Quad convert(RDF_Quad quad) {
-        return convert(quad, null) ;
+        return convert(quad, null);
     }
 
     public static RDF_Quad convert(Quad quad, boolean allowValues) {
-        return convert(quad, null, allowValues) ;
+        return convert(quad, null, allowValues);
     }
 
     public static RDF_Quad convert(Quad quad, PrefixMap pmap, boolean allowValues) {
         RDF_Quad.Builder q = RDF_Quad.newBuilder();
-        RDF_Term g = null ;
+        RDF_Term g = null;
         if ( quad.getGraph() != null )
-            g = convert(quad.getGraph(), pmap, allowValues) ;
-        RDF_Term s = convert(quad.getSubject(), pmap, allowValues) ;
-        RDF_Term p = convert(quad.getPredicate(), pmap, allowValues) ;
-        RDF_Term o = convert(quad.getObject(), pmap, allowValues) ;
+            g = convert(quad.getGraph(), pmap, allowValues);
+        RDF_Term s = convert(quad.getSubject(), pmap, allowValues);
+        RDF_Term p = convert(quad.getPredicate(), pmap, allowValues);
+        RDF_Term o = convert(quad.getObject(), pmap, allowValues);
         if ( g != null )
-            q.setG(g) ;
-        q.setS(s) ;
-        q.setP(p) ;
-        q.setO(o) ;
-        return q.build() ;
+            q.setG(g);
+        q.setS(s);
+        q.setP(p);
+        q.setO(o);
+        return q.build();
     }
 
 //    /**
@@ -491,31 +516,31 @@ public static RDF_Quad convert(Quad quad, PrefixMap pmap, boolean allowValues) {
     // RDF_Tuple => RDF_row (for result sets) or List<RDFTerm>
 
 //    public static Tuple<Node> convert(RDF_Tuple row) {
-//        return convert(row, null) ;
+//        return convert(row, null);
 //    }
 //
 //    public static Tuple<Node> convert(RDF_Tuple row, PrefixMap pmap) {
-//        List<RDF_Term> terms = row.getTerms() ;
-//        Node[] tuple = new Node[terms.size()] ;
-//        int idx = 0 ;
+//        List<RDF_Term> terms = row.getTerms();
+//        Node[] tuple = new Node[terms.size()];
+//        int idx = 0;
 //        for ( RDF_Term rt : terms ) {
-//            tuple[idx] = convert(rt, pmap) ;
-//            idx ++ ;
+//            tuple[idx] = convert(rt, pmap);
+//            idx ++;
 //        }
 
-//        return Tuple.create(tuple) ;
+//        return Tuple.create(tuple);
 //    }
 //
 //    public static RDF_Tuple convert(Tuple<Node> tuple) {
-//        return convert(tuple, null) ;
+//        return convert(tuple, null);
 //    }
 //
 //    public static RDF_Tuple convert(Tuple<Node> tuple, PrefixMap pmap) {
-//        RDF_Tuple rTuple = new RDF_Tuple() ;
+//        RDF_Tuple rTuple = new RDF_Tuple();
 //        for ( Node n : tuple ) {
-//            RDF_Term rt = convert(n, pmap) ;
-//            rTuple.addToTerms(rt) ;
+//            RDF_Term rt = convert(n, pmap);
+//            rTuple.addToTerms(rt);
 //        }
-//        return rTuple ;
+//        return rTuple;
 //    }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufRDF.java
index e4012ca6924..3e16229f422 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufRDF.java
@@ -49,7 +49,7 @@ public class ProtobufRDF {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToFile(String filename) {
-        return streamToFile(filename, false) ;
+        return streamToFile(filename, false);
     }
 
     /**
@@ -63,7 +63,7 @@ public static StreamRDF streamToFile(String filename) {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToFile(String filename, boolean withValues) {
-        OutputStream out = IO.openOutputFile(filename) ;
+        OutputStream out = IO.openOutputFile(filename);
         out = IO.ensureBuffered(out);
         return streamToOutputStream(out);
     }
@@ -95,7 +95,7 @@ public static StreamRDF streamToOutputStream(OutputStream output, boolean withVa
      * @param dest Sink
      */
     public static void fileToStream(String filename, StreamRDF dest) {
-        InputStream in = IO.openFileBuffered(filename) ;
+        InputStream in = IO.openFileBuffered(filename);
         inputStreamToStreamRDF(in, dest);
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/RiotProtobufException.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/RiotProtobufException.java
index b5b8fa65010..b20b727698c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/RiotProtobufException.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/RiotProtobufException.java
@@ -18,12 +18,12 @@
 
 package org.apache.jena.riot.protobuf;
 
-import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotException;
 
 public class RiotProtobufException extends RiotException {
-    public RiotProtobufException()                          { super() ; }
-    public RiotProtobufException(String msg)                { super(msg) ; }
-    public RiotProtobufException(Throwable th)              { super(th) ; }
-    public RiotProtobufException(String msg, Throwable th)  { super(msg, th) ; }
+    public RiotProtobufException()                          { super(); }
+    public RiotProtobufException(String msg)                { super(msg); }
+    public RiotProtobufException(Throwable th)              { super(th); }
+    public RiotProtobufException(String msg, Throwable th)  { super(msg, th); }
 }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterDatasetProtobuf.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterDatasetProtobuf.java
index 64354196864..822e769c5cc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterDatasetProtobuf.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterDatasetProtobuf.java
@@ -21,38 +21,38 @@
 import static org.apache.jena.riot.Lang.RDFPROTO;
 import static org.apache.jena.riot.RDFFormat.RDF_PROTO_VALUES;
 
-import java.io.OutputStream ;
-import java.io.Writer ;
+import java.io.OutputStream;
+import java.io.Writer;
 
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFFormat;
-import org.apache.jena.riot.WriterDatasetRIOT ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.riot.system.StreamRDFOps ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.riot.WriterDatasetRIOT;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.StreamRDF;
+import org.apache.jena.riot.system.StreamRDFOps;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.util.Context;
 
 /** Write a dataset as RDF Protobuf */
 public class WriterDatasetProtobuf implements WriterDatasetRIOT
 {
-    private final boolean withValues ;
+    private final boolean withValues;
     public WriterDatasetProtobuf(RDFFormat fmt) {
-        this.withValues = RDF_PROTO_VALUES.equals(fmt) ;
+        this.withValues = RDF_PROTO_VALUES.equals(fmt);
     }
     @Override
     public Lang getLang() {
-        return RDFPROTO ;
+        return RDFPROTO;
     }
     @Override
     public void write(Writer out, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) {
-        throw new RiotProtobufException("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream") ;
+        throw new RiotProtobufException("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream");
     }
     @Override
     public void write(OutputStream out, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) {
-        StreamRDF stream = ProtobufRDF.streamToOutputStream(out, withValues) ;
+        StreamRDF stream = ProtobufRDF.streamToOutputStream(out, withValues);
         stream.start();
-        StreamRDFOps.sendDatasetToStream(dsg, stream, baseURI, prefixMap) ;
+        StreamRDFOps.sendDatasetToStream(dsg, stream, baseURI, prefixMap);
         stream.finish();
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterGraphProtobuf.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterGraphProtobuf.java
index 3d30fa613a1..f2eb1024b89 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterGraphProtobuf.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/WriterGraphProtobuf.java
@@ -21,40 +21,40 @@
 import static org.apache.jena.riot.RDFFormat.RDF_PROTO_VALUES;
 import static org.apache.jena.riot.RDFLanguages.RDFPROTO;
 
-import java.io.OutputStream ;
-import java.io.Writer ;
+import java.io.OutputStream;
+import java.io.Writer;
 
-import org.apache.jena.atlas.lib.NotImplemented ;
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.riot.Lang ;
+import org.apache.jena.atlas.lib.NotImplemented;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFFormat;
-import org.apache.jena.riot.WriterGraphRIOT ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.StreamRDFOps ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.riot.WriterGraphRIOT;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.StreamRDFOps;
+import org.apache.jena.riot.system.StreamRDF;
+import org.apache.jena.sparql.util.Context;
 
 /** Write a graph as RDF Protobuf */
 public class WriterGraphProtobuf implements WriterGraphRIOT
 {
-    private final boolean withValues ;
+    private final boolean withValues;
     public WriterGraphProtobuf(RDFFormat fmt) {
-        this.withValues = RDF_PROTO_VALUES.equals(fmt) ;
+        this.withValues = RDF_PROTO_VALUES.equals(fmt);
     }
     @Override
     public Lang getLang() {
-        return RDFPROTO ;
+        return RDFPROTO;
     }
     @Override
     public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
-        throw new NotImplemented("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream") ;
+        throw new NotImplemented("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream");
     }
 
     @Override
     public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
-        StreamRDF stream = ProtobufRDF.streamToOutputStream(out, withValues) ;
-        stream.start() ;
-        StreamRDFOps.graphToStream(graph, stream) ;
-        stream.finish() ;
+        StreamRDF stream = ProtobufRDF.streamToOutputStream(out, withValues);
+        stream.start();
+        StreamRDFOps.graphToStream(graph, stream);
+        stream.finish();
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/wire/PB_RDF.java b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/wire/PB_RDF.java
index 6cbecfcdf7d..c27ffd7c527 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/protobuf/wire/PB_RDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/protobuf/wire/PB_RDF.java
@@ -1794,22 +1794,63 @@ public interface RDF_LiteralOrBuilder extends
     boolean getSimple();
 
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return Whether the langtag field is set.
      */
     boolean hasLangtag();
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return The langtag.
      */
     java.lang.String getLangtag();
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return The bytes for langtag.
      */
     com.google.protobuf.ByteString
         getLangtagBytes();
 
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return Whether the langdir field is set.
+     */
+    boolean hasLangdir();
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return The langdir.
+     */
+    java.lang.String getLangdir();
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return The bytes for langdir.
+     */
+    com.google.protobuf.ByteString
+        getLangdirBytes();
+
     /**
      * <code>string datatype = 3;</code>
      * @return Whether the datatype field is set.
@@ -1890,6 +1931,7 @@ public enum LiteralKindCase
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
       SIMPLE(9),
       LANGTAG(2),
+      LANGDIR(5),
       DATATYPE(3),
       DTPREFIX(4),
       LITERALKIND_NOT_SET(0);
@@ -1911,6 +1953,7 @@ public static LiteralKindCase forNumber(int value) {
         switch (value) {
           case 9: return SIMPLE;
           case 2: return LANGTAG;
+          case 5: return LANGDIR;
           case 3: return DATATYPE;
           case 4: return DTPREFIX;
           case 0: return LITERALKIND_NOT_SET;
@@ -1990,6 +2033,10 @@ public boolean getSimple() {
 
     public static final int LANGTAG_FIELD_NUMBER = 2;
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return Whether the langtag field is set.
      */
@@ -1997,6 +2044,10 @@ public boolean hasLangtag() {
       return literalKindCase_ == 2;
     }
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return The langtag.
      */
@@ -2018,6 +2069,10 @@ public java.lang.String getLangtag() {
       }
     }
     /**
+     * <pre>
+     * Language tag only literal
+     * </pre>
+     *
      * <code>string langtag = 2;</code>
      * @return The bytes for langtag.
      */
@@ -2040,6 +2095,70 @@ public java.lang.String getLangtag() {
       }
     }
 
+    public static final int LANGDIR_FIELD_NUMBER = 5;
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return Whether the langdir field is set.
+     */
+    public boolean hasLangdir() {
+      return literalKindCase_ == 5;
+    }
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return The langdir.
+     */
+    public java.lang.String getLangdir() {
+      java.lang.Object ref = "";
+      if (literalKindCase_ == 5) {
+        ref = literalKind_;
+      }
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (literalKindCase_ == 5) {
+          literalKind_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     * Language tag and base direction separated by "--"
+     * </pre>
+     *
+     * <code>string langdir = 5;</code>
+     * @return The bytes for langdir.
+     */
+    public com.google.protobuf.ByteString
+        getLangdirBytes() {
+      java.lang.Object ref = "";
+      if (literalKindCase_ == 5) {
+        ref = literalKind_;
+      }
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        if (literalKindCase_ == 5) {
+          literalKind_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     public static final int DATATYPE_FIELD_NUMBER = 3;
     /**
      * <code>string datatype = 3;</code>
@@ -2149,6 +2268,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (literalKindCase_ == 4) {
         output.writeMessage(4, (org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_PrefixName) literalKind_);
       }
+      if (literalKindCase_ == 5) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 5, literalKind_);
+      }
       if (literalKindCase_ == 9) {
         output.writeBool(
             9, (boolean)((java.lang.Boolean) literalKind_));
@@ -2175,6 +2297,9 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, (org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_PrefixName) literalKind_);
       }
+      if (literalKindCase_ == 5) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(5, literalKind_);
+      }
       if (literalKindCase_ == 9) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(
@@ -2207,6 +2332,10 @@ public boolean equals(final java.lang.Object obj) {
           if (!getLangtag()
               .equals(other.getLangtag())) return false;
           break;
+        case 5:
+          if (!getLangdir()
+              .equals(other.getLangdir())) return false;
+          break;
         case 3:
           if (!getDatatype()
               .equals(other.getDatatype())) return false;
@@ -2241,6 +2370,10 @@ public int hashCode() {
           hash = (37 * hash) + LANGTAG_FIELD_NUMBER;
           hash = (53 * hash) + getLangtag().hashCode();
           break;
+        case 5:
+          hash = (37 * hash) + LANGDIR_FIELD_NUMBER;
+          hash = (53 * hash) + getLangdir().hashCode();
+          break;
         case 3:
           hash = (37 * hash) + DATATYPE_FIELD_NUMBER;
           hash = (53 * hash) + getDatatype().hashCode();
@@ -2465,6 +2598,12 @@ public Builder mergeFrom(org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Literal o
             onChanged();
             break;
           }
+          case LANGDIR: {
+            literalKindCase_ = 5;
+            literalKind_ = other.literalKind_;
+            onChanged();
+            break;
+          }
           case DATATYPE: {
             literalKindCase_ = 3;
             literalKind_ = other.literalKind_;
@@ -2529,6 +2668,12 @@ public Builder mergeFrom(
                 literalKindCase_ = 4;
                 break;
               } // case 34
+              case 42: {
+                java.lang.String s = input.readStringRequireUtf8();
+                literalKindCase_ = 5;
+                literalKind_ = s;
+                break;
+              } // case 42
               case 72: {
                 literalKind_ = input.readBool();
                 literalKindCase_ = 9;
@@ -2681,6 +2826,10 @@ public Builder clearSimple() {
       }
 
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @return Whether the langtag field is set.
        */
@@ -2689,6 +2838,10 @@ public boolean hasLangtag() {
         return literalKindCase_ == 2;
       }
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @return The langtag.
        */
@@ -2711,6 +2864,10 @@ public java.lang.String getLangtag() {
         }
       }
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @return The bytes for langtag.
        */
@@ -2734,6 +2891,10 @@ public java.lang.String getLangtag() {
         }
       }
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @param value The langtag to set.
        * @return This builder for chaining.
@@ -2747,6 +2908,10 @@ public Builder setLangtag(
         return this;
       }
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @return This builder for chaining.
        */
@@ -2759,6 +2924,10 @@ public Builder clearLangtag() {
         return this;
       }
       /**
+       * <pre>
+       * Language tag only literal
+       * </pre>
+       *
        * <code>string langtag = 2;</code>
        * @param value The bytes for langtag to set.
        * @return This builder for chaining.
@@ -2773,6 +2942,123 @@ public Builder setLangtagBytes(
         return this;
       }
 
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @return Whether the langdir field is set.
+       */
+      @java.lang.Override
+      public boolean hasLangdir() {
+        return literalKindCase_ == 5;
+      }
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @return The langdir.
+       */
+      @java.lang.Override
+      public java.lang.String getLangdir() {
+        java.lang.Object ref = "";
+        if (literalKindCase_ == 5) {
+          ref = literalKind_;
+        }
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (literalKindCase_ == 5) {
+            literalKind_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @return The bytes for langdir.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getLangdirBytes() {
+        java.lang.Object ref = "";
+        if (literalKindCase_ == 5) {
+          ref = literalKind_;
+        }
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          if (literalKindCase_ == 5) {
+            literalKind_ = b;
+          }
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @param value The langdir to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLangdir(
+          java.lang.String value) {
+        if (value == null) { throw new NullPointerException(); }
+        literalKindCase_ = 5;
+        literalKind_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLangdir() {
+        if (literalKindCase_ == 5) {
+          literalKindCase_ = 0;
+          literalKind_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Language tag and base direction separated by "--"
+       * </pre>
+       *
+       * <code>string langdir = 5;</code>
+       * @param value The bytes for langdir to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLangdirBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) { throw new NullPointerException(); }
+        checkByteStringIsUtf8(value);
+        literalKindCase_ = 5;
+        literalKind_ = value;
+        onChanged();
+        return this;
+      }
+
       /**
        * <code>string datatype = 3;</code>
        * @return Whether the datatype field is set.
@@ -15256,37 +15542,38 @@ public org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Graph getDefaultInstanceFor
       "\n\020binary-rdf.proto\"\026\n\007RDF_IRI\022\013\n\003iri\030\001 \001" +
       "(\t\"3\n\016RDF_PrefixName\022\016\n\006prefix\030\001 \001(\t\022\021\n\t" +
       "localName\030\002 \001(\t\"\032\n\tRDF_BNode\022\r\n\005label\030\001 " +
-      "\001(\t\"\207\001\n\013RDF_Literal\022\013\n\003lex\030\001 \001(\t\022\020\n\006simp" +
-      "le\030\t \001(\010H\000\022\021\n\007langtag\030\002 \001(\tH\000\022\022\n\010datatyp" +
-      "e\030\003 \001(\tH\000\022#\n\010dtPrefix\030\004 \001(\0132\017.RDF_Prefix" +
-      "NameH\000B\r\n\013literalKind\"+\n\013RDF_Decimal\022\r\n\005" +
-      "value\030\001 \001(\022\022\r\n\005scale\030\002 \001(\021\"\027\n\007RDF_Var\022\014\n" +
-      "\004name\030\001 \001(\t\"\t\n\007RDF_ANY\"\013\n\tRDF_UNDEF\"\014\n\nR" +
-      "DF_REPEAT\"\371\002\n\010RDF_Term\022\027\n\003iri\030\001 \001(\0132\010.RD" +
-      "F_IRIH\000\022\033\n\005bnode\030\002 \001(\0132\n.RDF_BNodeH\000\022\037\n\007" +
-      "literal\030\003 \001(\0132\014.RDF_LiteralH\000\022%\n\nprefixN" +
-      "ame\030\004 \001(\0132\017.RDF_PrefixNameH\000\022\034\n\010variable" +
-      "\030\005 \001(\0132\010.RDF_VarH\000\022!\n\ntripleTerm\030\006 \001(\0132\013" +
-      ".RDF_TripleH\000\022\027\n\003any\030\007 \001(\0132\010.RDF_ANYH\000\022\037" +
-      "\n\tundefined\030\010 \001(\0132\n.RDF_UNDEFH\000\022\035\n\006repea" +
-      "t\030\t \001(\0132\013.RDF_REPEATH\000\022\024\n\nvalInteger\030\024 \001" +
-      "(\022H\000\022\023\n\tvalDouble\030\025 \001(\001H\000\022\"\n\nvalDecimal\030" +
-      "\026 \001(\0132\014.RDF_DecimalH\000B\006\n\004term\"N\n\nRDF_Tri" +
-      "ple\022\024\n\001S\030\001 \001(\0132\t.RDF_Term\022\024\n\001P\030\002 \001(\0132\t.R" +
-      "DF_Term\022\024\n\001O\030\003 \001(\0132\t.RDF_Term\"b\n\010RDF_Qua" +
-      "d\022\024\n\001S\030\001 \001(\0132\t.RDF_Term\022\024\n\001P\030\002 \001(\0132\t.RDF" +
-      "_Term\022\024\n\001O\030\003 \001(\0132\t.RDF_Term\022\024\n\001G\030\004 \001(\0132\t" +
-      ".RDF_Term\"-\n\016RDF_PrefixDecl\022\016\n\006prefix\030\001 " +
-      "\001(\t\022\013\n\003uri\030\002 \001(\t\"\221\001\n\rRDF_StreamRow\022%\n\npr" +
-      "efixDecl\030\001 \001(\0132\017.RDF_PrefixDeclH\000\022\035\n\006tri" +
-      "ple\030\002 \001(\0132\013.RDF_TripleH\000\022\031\n\004quad\030\003 \001(\0132\t" +
-      ".RDF_QuadH\000\022\030\n\004base\030\004 \001(\0132\010.RDF_IRIH\000B\005\n" +
-      "\003row\")\n\nRDF_Stream\022\033\n\003row\030\001 \003(\0132\016.RDF_St" +
-      "reamRow\"&\n\014RDF_VarTuple\022\026\n\004vars\030\001 \003(\0132\010." +
-      "RDF_Var\"\'\n\rRDF_DataTuple\022\026\n\003row\030\001 \003(\0132\t." +
-      "RDF_Term\"(\n\tRDF_Graph\022\033\n\006triple\030\001 \003(\0132\013." +
-      "RDF_TripleB.\n\"org.apache.jena.riot.proto" +
-      "buf.wireB\006PB_RDFH\001b\006proto3"
+      "\001(\t\"\232\001\n\013RDF_Literal\022\013\n\003lex\030\001 \001(\t\022\020\n\006simp" +
+      "le\030\t \001(\010H\000\022\021\n\007langtag\030\002 \001(\tH\000\022\021\n\007langdir" +
+      "\030\005 \001(\tH\000\022\022\n\010datatype\030\003 \001(\tH\000\022#\n\010dtPrefix" +
+      "\030\004 \001(\0132\017.RDF_PrefixNameH\000B\r\n\013literalKind" +
+      "\"+\n\013RDF_Decimal\022\r\n\005value\030\001 \001(\022\022\r\n\005scale\030" +
+      "\002 \001(\021\"\027\n\007RDF_Var\022\014\n\004name\030\001 \001(\t\"\t\n\007RDF_AN" +
+      "Y\"\013\n\tRDF_UNDEF\"\014\n\nRDF_REPEAT\"\371\002\n\010RDF_Ter" +
+      "m\022\027\n\003iri\030\001 \001(\0132\010.RDF_IRIH\000\022\033\n\005bnode\030\002 \001(" +
+      "\0132\n.RDF_BNodeH\000\022\037\n\007literal\030\003 \001(\0132\014.RDF_L" +
+      "iteralH\000\022%\n\nprefixName\030\004 \001(\0132\017.RDF_Prefi" +
+      "xNameH\000\022\034\n\010variable\030\005 \001(\0132\010.RDF_VarH\000\022!\n" +
+      "\ntripleTerm\030\006 \001(\0132\013.RDF_TripleH\000\022\027\n\003any\030" +
+      "\007 \001(\0132\010.RDF_ANYH\000\022\037\n\tundefined\030\010 \001(\0132\n.R" +
+      "DF_UNDEFH\000\022\035\n\006repeat\030\t \001(\0132\013.RDF_REPEATH" +
+      "\000\022\024\n\nvalInteger\030\024 \001(\022H\000\022\023\n\tvalDouble\030\025 \001" +
+      "(\001H\000\022\"\n\nvalDecimal\030\026 \001(\0132\014.RDF_DecimalH\000" +
+      "B\006\n\004term\"N\n\nRDF_Triple\022\024\n\001S\030\001 \001(\0132\t.RDF_" +
+      "Term\022\024\n\001P\030\002 \001(\0132\t.RDF_Term\022\024\n\001O\030\003 \001(\0132\t." +
+      "RDF_Term\"b\n\010RDF_Quad\022\024\n\001S\030\001 \001(\0132\t.RDF_Te" +
+      "rm\022\024\n\001P\030\002 \001(\0132\t.RDF_Term\022\024\n\001O\030\003 \001(\0132\t.RD" +
+      "F_Term\022\024\n\001G\030\004 \001(\0132\t.RDF_Term\"-\n\016RDF_Pref" +
+      "ixDecl\022\016\n\006prefix\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\"\221\001\n\r" +
+      "RDF_StreamRow\022%\n\nprefixDecl\030\001 \001(\0132\017.RDF_" +
+      "PrefixDeclH\000\022\035\n\006triple\030\002 \001(\0132\013.RDF_Tripl" +
+      "eH\000\022\031\n\004quad\030\003 \001(\0132\t.RDF_QuadH\000\022\030\n\004base\030\004" +
+      " \001(\0132\010.RDF_IRIH\000B\005\n\003row\")\n\nRDF_Stream\022\033\n" +
+      "\003row\030\001 \003(\0132\016.RDF_StreamRow\"&\n\014RDF_VarTup" +
+      "le\022\026\n\004vars\030\001 \003(\0132\010.RDF_Var\"\'\n\rRDF_DataTu" +
+      "ple\022\026\n\003row\030\001 \003(\0132\t.RDF_Term\"(\n\tRDF_Graph" +
+      "\022\033\n\006triple\030\001 \003(\0132\013.RDF_TripleB.\n\"org.apa" +
+      "che.jena.riot.protobuf.wireB\006PB_RDFH\001b\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -15315,7 +15602,7 @@ public org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Graph getDefaultInstanceFor
     internal_static_RDF_Literal_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_RDF_Literal_descriptor,
-        new java.lang.String[] { "Lex", "Simple", "Langtag", "Datatype", "DtPrefix", "LiteralKind", });
+        new java.lang.String[] { "Lex", "Simple", "Langtag", "Langdir", "Datatype", "DtPrefix", "LiteralKind", });
     internal_static_RDF_Decimal_descriptor =
       getDescriptor().getMessageTypes().get(4);
     internal_static_RDF_Decimal_fieldAccessorTable = new
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
index 15d16a6e779..b5edefff662 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/JSONResultsKW.java
@@ -39,6 +39,7 @@ public class JSONResultsKW
     // Legacy: kTypedLiteral
     public static final String kTypedLiteral  = "typed-literal" ;
     public static final String kXmlLang       = "xml:lang" ;
+    public static final String kBaseDirection = "its:dir" ;
     public static final String kDatatype      = "datatype" ;
     public static final String kBnode         = "bnode" ;
     public static final String kBoolean       = "boolean" ;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderJSON_V1.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderJSON_V1.java
index 5912f6c2e6d..3f4f4a2413d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderJSON_V1.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderJSON_V1.java
@@ -256,7 +256,7 @@ private static Node parseTripleTerm(JsonObject term, LabelToNode labelMap) {
             Node s = parseOneTerm(sTerm, labelMap);
             Node p = parseOneTerm(pTerm, labelMap);
             Node o = parseOneTerm(oTerm, labelMap);
-            return NodeFactory.createTripleNode(s, p, o);
+            return NodeFactory.createTripleTerm(s, p, o);
         }
 
         // Get a object from an object - use the first name in the fields list
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderXML.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderXML.java
index b2eb6c0b5c2..5c95ac309ae 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetReaderXML.java
@@ -348,8 +348,9 @@ private void processResults() {
             return ;
         }
 
-
+        //xmlns:its="http://www.w3.org/2005/11/its" its:version="2.0"
         static final String XML_NS = ARQConstants.XML_NS ;
+        static final String ITS_NS = ARQConstants.ITS_NS ;
 
         private Binding getOneSolution() throws XMLStreamException {
             if ( finished )
@@ -420,6 +421,7 @@ private Node parseOneTerm(String tag) throws XMLStreamException {
               // "If the namespaceURI is null the namespace is not checked for equality"
               // StAX(.codehaus.org) copes both ways round
               String langTag = parser.getAttributeValue(XML_NS, "lang") ;
+              String baseDir = parser.getAttributeValue(ITS_NS, "dir") ;
 
               // Works for XML literals (returning them as a string)
               String text = parser.getElementText() ;
@@ -428,7 +430,7 @@ private Node parseOneTerm(String tag) throws XMLStreamException {
               if ( datatype != null )
                   dType = TypeMapper.getInstance().getSafeTypeByName(datatype) ;
 
-              Node n = NodeFactory.createLiteral(text, langTag, dType) ;
+              Node n = NodeFactory.createLiteral(text, langTag, baseDir, dType) ;
               return n ;
           }
 
@@ -497,7 +499,7 @@ else if ( isOneOf(tag2, XMLResults.dfObject, XMLResults.dfObjectAlt) )
 
               if ( s == null || p == null || o == null )
                   staxError("Bad <triple> term");
-              Node node = NodeFactory.createTripleNode(s, p, o);
+              Node node = NodeFactory.createTripleTerm(s, p, o);
               return node;
           }
             return null;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterJSON.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterJSON.java
index d54477bbe91..9604397d655 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterJSON.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterJSON.java
@@ -30,6 +30,7 @@
 import org.apache.jena.atlas.json.io.JSWriter;
 import org.apache.jena.atlas.logging.Log;
 import org.apache.jena.graph.Node;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.query.ARQ;
 import org.apache.jena.rdf.model.impl.Util;
@@ -242,7 +243,7 @@ private void writeVarValue(IndentedWriter out, Var var, Node value, boolean firs
         }
 
         private void writeValue(IndentedWriter out, Node value, boolean multiLine) {
-            if ( multiLine || value.isNodeTriple() )
+            if ( multiLine || value.isTripleTerm() )
                 println(out, "{");
             else
                 print(out, "{ ");
@@ -257,13 +258,13 @@ else if ( value.isURI() )
                 writeValueURI(out, value, multiLine);
             else if ( value.isBlank() )
                 writeValueBlankNode(out, value, multiLine);
-            else if ( value.isNodeTriple() )
+            else if ( value.isTripleTerm() )
                 writeValueNodeTriple(out, value, multiLine);
             else if ( value.isNodeGraph() )
                 writeValueNodeGraph(out, value, multiLine);
             else
                 Log.warn(RowSetWriterJSON.class, "Unknown RDFNode type in result set: " + value.getClass());
-            if ( multiLine || value.isNodeTriple()) // OR triple
+            if ( multiLine || value.isTripleTerm()) // OR triple
                 println(out) ;
             else
                 print(out, " ");
@@ -282,9 +283,11 @@ private void writeValueUnbound(IndentedWriter out, boolean multiLine) {
 
         private void writeValueLiteral(IndentedWriter out, Node literal, boolean multiLine) {
             String datatype = literal.getLiteralDatatypeURI();
-            String lang = literal.getLiteralLanguage();
 
-            if ( Util.isSimpleString(literal) || Util.isLangString(literal) ) {
+            if ( Util.isSimpleString(literal) || Util.isLangString(literal) || Util.isDirLangString(literal) ) {
+                String lang = literal.getLiteralLanguage();
+                TextDirection direction = literal.getLiteralBaseDirection();
+
                 print(out, quoteName(kType), ": ", quote(kLiteral), " , ");
                 if ( multiLine )
                     println(out);
@@ -294,6 +297,13 @@ private void writeValueLiteral(IndentedWriter out, Node literal, boolean multiLi
                     if ( multiLine )
                         println(out);
                 }
+
+                if ( direction != null  ) {
+                    print(out, quoteName(kBaseDirection), ": ", quote(direction.direction()), " , ");
+                    if ( multiLine )
+                        println(out);
+                }
+
             } else {
                 print(out, quoteName(kType), ": ", quote(kLiteral), " , ");
                 if ( MultiLineValues )
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterXML.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterXML.java
index fa4539c9e3c..9c78c7dfdbc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/RowSetWriterXML.java
@@ -291,7 +291,7 @@ private void printBindingValue(Node node) {
                 printBlankNode(node);
                 return;
             }
-            if ( node.isNodeTriple() ) {
+            if ( node.isTripleTerm() ) {
                 printTripleTerm(node);
                 return;
             }
@@ -330,11 +330,17 @@ private void printLiteral(Node literal) {
             out.print("<");
             out.print(dfLiteral);
 
-            if ( Util.isLangString(literal) ) {
+            if ( Util.isLangString(literal) ||  Util.isDirLangString(literal) ) {
                 String lang = literal.getLiteralLanguage();
                 out.print(" xml:lang=\"");
                 out.print(lang);
                 out.print("\"");
+                if ( Util.isDirLangString(literal) ) {
+                    out.print(" xmlns:its=\"http://www.w3.org/2005/11/its\" its:version=\"2.0\"");
+                    out.print(" its:dir=\"");
+                    out.print(literal.getLiteralBaseDirection().direction());
+                    out.print("\"");
+                }
             } else if ( !Util.isSimpleString(literal) ) {
                 // Datatype
                 // (RDF 1.1) not xsd:string nor rdf:langString.
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/rs_json/RowSetJSONStreaming.java b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/rs_json/RowSetJSONStreaming.java
index a762b78bfaa..2c701aae530 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/rs_json/RowSetJSONStreaming.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/rowset/rw/rs_json/RowSetJSONStreaming.java
@@ -32,9 +32,17 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+
 import org.apache.jena.atlas.data.DataBag;
 import org.apache.jena.atlas.iterator.IteratorCloseable;
 import org.apache.jena.atlas.iterator.IteratorSlotted;
+import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.TypeMapper;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.riot.lang.LabelToNode;
@@ -45,15 +53,8 @@
 import org.apache.jena.sparql.engine.binding.BindingFactory;
 import org.apache.jena.sparql.exec.RowSet;
 import org.apache.jena.sparql.resultset.ResultSetException;
-import org.apache.jena.sparql.util.NodeFactoryExtra;
 import org.apache.jena.vocabulary.RDF;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-
 /**
  * Streaming RowSet implementation for application/sparql-results+json
  * The {@link #getResultVars()} will return null as long as the header has not
@@ -384,24 +385,33 @@ static Node parseOneTerm(JsonElement jsonElt, LabelToNode labelMap, Function<Jso
             valueStr = valueJson.getAsString();
             JsonElement langJson = term.get(kXmlLang);
             JsonElement dtJson = term.get(kDatatype);
+            JsonElement dirJson = term.get(kBaseDirection);
 
             String lang = langJson == null ? null : langJson.getAsString();
             String dtStr = dtJson == null ? null : dtJson.getAsString();
+            String dirStr = dirJson == null ? null : dirJson.getAsString();
+
+            // Strictly, xml:lang=... and datatype=rdf:langString is wrong
+            // (the datatype should be absent)
+            // The RDF specs recommend omitting the datatype. They did
+            // however come after the SPARQL 1.1 docs
+            // it's more of a "SHOULD" than a "MUST".
+            // datatype=xsd:string is also unnecessary.
 
             if ( lang != null ) {
-                // Strictly, xml:lang=... and datatype=rdf:langString is wrong
-                // (the datatype should be absent)
-                // The RDF specs recommend omitting the datatype. They did
-                // however come after the SPARQL 1.1 docs
-                // it's more of a "SHOULD" than a "MUST".
-                // datatype=xsd:string is also unnecessary.
-                if ( dtStr != null && !dtStr.equals(RDF.dtLangString.getURI()) ) {
-                    // Must agree.
-                    throw new ResultSetException("Both language and datatype defined, datatype is not rdf:langString:\n" + term);
+                if ( dirStr != null ) {
+                    if ( dtStr != null && !dtStr.equals(RDF.dtDirLangString.getURI()) )
+                        throw new ResultSetException("Language, base direction and datatype defined, datatype is not rdf:dirLangString: " + term);
+                } else {
+                    if ( dtStr != null && !dtStr.equals(RDF.dtLangString.getURI()) )
+                        throw new ResultSetException("Language datatype defined, datatype is not rdf:langString: " + term);
                 }
+            } else if ( dirStr != null ) {
+                throw new ResultSetException("Base direction defined, but no language given: " + term);
             }
 
-            result = NodeFactoryExtra.createLiteralNode(valueStr, lang, dtStr);
+            RDFDatatype dType = ( dtStr == null ) ? null : TypeMapper.getInstance().getSafeTypeByName(dtStr) ;
+            result = NodeFactory.createLiteral(valueStr, lang, dirStr, dType);
             break;
         case kBnode:
             valueStr = valueJson.getAsString();
@@ -419,7 +429,7 @@ static Node parseOneTerm(JsonElement jsonElt, LabelToNode labelMap, Function<Jso
             Node p = parseOneTerm(jp, labelMap, onUnknownRdfTermType);
             Node o = parseOneTerm(jo, labelMap, onUnknownRdfTermType);
 
-            result = NodeFactory.createTripleNode(s, p, o);
+            result = NodeFactory.createTripleTerm(s, p, o);
             break;
         default:
             if (onUnknownRdfTermType != null) {
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
index 01d70983854..2086c9e7ba4 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java
@@ -22,8 +22,10 @@
 
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.datatypes.xsd.impl.RDFDirLangString;
 import org.apache.jena.datatypes.xsd.impl.RDFLangString;
 import org.apache.jena.graph.Node;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.iri.IRI;
 import org.apache.jena.irix.*;
@@ -67,7 +69,7 @@ else if ( node.isLiteral() )
             return checkLiteral(node, errorHandler, line, col);
         else if ( node.isVariable() )
             return checkVar(node, errorHandler, line, col);
-        else if ( node.isNodeTriple() ) {
+        else if ( node.isTripleTerm() ) {
             Triple t = node.getTriple();
             return check(t.getSubject()) && check(t.getPredicate()) && check(t.getObject())
                     && checkTriple(t);
@@ -130,16 +132,10 @@ public static void iriViolationMessage(String iriStr, boolean isError, String ms
         } catch (org.apache.jena.iri.IRIException | org.apache.jena.irix.IRIException ex) {}
     }
 
-//    /**
-//     * Process violations on an IRI Calls the {@link ErrorHandler} on all errors and
-//     * warnings (as warnings).
-//     */
-//    @Deprecated(forRemoval = true)
-//    public static void iriViolations(IRI iri) {
-//        iriViolations(iri, nullErrorHandler, false, true, -1L, -1L);
-//    }
-//
-    final static private Pattern langPattern = Pattern.compile("[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*");
+    // ==== Literals
+
+    // Syntax of LANG_DIR in the Turtle (etc) parser grammars.
+    final static private Pattern langPattern = Pattern.compile("[a-zA-Z]{1,8}(?:-[a-zA-Z0-9]{1,8})*(?:--(?:ltr|rtl))?");
 
     public static boolean checkLiteral(Node node) {
         return checkLiteral(node, nullErrorHandler, -1L, -1L);
@@ -150,24 +146,40 @@ public static boolean checkLiteral(Node node, ErrorHandler errorHandler, long li
             errorHandler(errorHandler).error("Not a literal: " + node, line, col);
             return false;
         }
-
-        return checkLiteral(node.getLiteralLexicalForm(), node.getLiteralLanguage(), node.getLiteralDatatype(), errorHandler, line, col);
+        return checkLiteral(node.getLiteralLexicalForm(), node.getLiteralLanguage(), node.getLiteralBaseDirection(), node.getLiteralDatatype(), errorHandler, line, col);
     }
 
     public static boolean checkLiteral(String lexicalForm, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) {
-        return checkLiteral(lexicalForm, null, datatype, errorHandler, line, col);
+        return checkLiteral(lexicalForm, null, (TextDirection)null, datatype, errorHandler, line, col);
     }
 
     public static boolean checkLiteral(String lexicalForm, String lang, ErrorHandler errorHandler, long line, long col) {
-        return checkLiteral(lexicalForm, lang, null, errorHandler, line, col);
+        return checkLiteral(lexicalForm, lang, (TextDirection)null, null, errorHandler, line, col);
     }
 
+    /** @deprecated Use {@link #checkLiteral(String, String, ErrorHandler, long, long)} */
+    @Deprecated
     public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) {
+        return checkLiteral(lexicalForm, lang, (TextDirection)null, datatype, errorHandler, line, col);
+    }
+
+    public static boolean checkLiteral(String lexicalForm, String lang, String direction, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) {
+        TextDirection textDir = null;
+        if ( direction != null ) {
+            textDir = TextDirection.createOrNull(direction);
+            if ( textDir == null )
+                errorHandler(errorHandler).error("Language direction not valid: " + direction, line, col);
+        }
+        return checkLiteral(lexicalForm, lang, textDir, datatype, errorHandler, line, col);
+    }
+
+    public static boolean checkLiteral(String lexicalForm, String lang, TextDirection direction, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) {
         boolean hasLang = ( lang != null && !lang.isEmpty() );
+        boolean hasTextDirection = direction != null;
         boolean hasDatatype = datatype != null;
 
         if ( !hasDatatype && !hasLang) {
-            // This will become an xsd:string or rdf:langString.
+            // This will become an xsd:string
             // No further checking needed.
             return true;
         }
@@ -175,6 +187,7 @@ public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype
         // If the Literal has a language...
         if ( hasLang ) {
             // Test language tag format -- not a perfect test...
+            // matches - whole string match.
             if ( !langPattern.matcher(lang).matches() ) {
                 errorHandler(errorHandler).warning("Language not valid: " + lang, line, col);
                 return false;
@@ -183,16 +196,25 @@ public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype
             // No datatype is acceptable - NodeFactory deal with that case.
             if ( hasDatatype ) {
                 // Jena is using the RDF 1.1 or later standard...
-                if ( ! datatype.equals( RDFLangString.rdfLangString ) ) {
-                    errorHandler(errorHandler).error("Literal has language but wrong datatype", line, col);
+                if ( hasTextDirection && ! datatype.equals( RDFDirLangString.rdfDirLangString ) ) {
+                    errorHandler(errorHandler).error("Literal has language and base direction but wrong datatype: "+datatype, line, col);
+                    return false;
+                }
+                else if ( ! datatype.equals( RDFLangString.rdfLangString ) ) {
+                    errorHandler(errorHandler).error("Literal has language but wrong datatype: "+datatype, line, col);
                     return false;
                 }
             }
             return true;
+        } else {
+            // No lang => no base direction
+            if ( hasTextDirection )
+                errorHandler(errorHandler).error("Language base direction without language", line, col);
+            // Fallthrough
         }
 
-        // If the Literal has a datatype (but no language)...
-        if ( datatype.equals( XSDDatatype.XSDstring) )
+        // If the Literal has a datatype (but no language or base direction)...
+        if ( datatype.equals(XSDDatatype.XSDstring) )
             // Simple literals are always well-formed...
             return true;
         return validateByDatatype(lexicalForm, datatype, errorHandler, line, col);
@@ -331,7 +353,7 @@ public static boolean checkQuad(Node graph, Node subject, Node predicate, Node o
             rc = false;
         }
 
-        if ( subject == null || (!subject.isURI() && !subject.isBlank() && !subject.isNodeTriple()) ) {
+        if ( subject == null || (!subject.isURI() && !subject.isBlank() && !subject.isTripleTerm()) ) {
             errorHandler(errorHandler).error("Subject is not a URI, blank node or RDF-star triple term", line, col);
             rc = false;
         }
@@ -339,7 +361,7 @@ public static boolean checkQuad(Node graph, Node subject, Node predicate, Node o
             errorHandler(errorHandler).error("Predicate not a URI", line, col);
             rc = false;
         }
-        if ( object == null || (!object.isURI() && !object.isBlank() && !object.isLiteral() && !subject.isNodeTriple()) ) {
+        if ( object == null || (!object.isURI() && !object.isBlank() && !object.isLiteral() && !subject.isTripleTerm()) ) {
             errorHandler(errorHandler).error("Object is not a URI, blank node, literal or RDF-star triple term", line, col);
             rc = false;
         }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
index 83a9006c37f..95b49c9f200 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDF.java
@@ -38,6 +38,8 @@ public interface FactoryRDF {
 
     public Node createLangLiteral(String lexical, String langTag);
 
+    public Node createLangDirLiteral(String lexical, String langTag, String direction);
+
     public Node createStringLiteral(String lexical);
 
     /** Create a blank node which is completely new and used nowhere else. */
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
index 5eeab8b187b..6e0b0b5b5f7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java
@@ -65,6 +65,11 @@ public Node createLangLiteral(String lexical, String langTag) {
         return NodeFactory.createLiteralLang(lexical, langTag) ;
     }
 
+    @Override
+    public Node createLangDirLiteral(String lexical, String langTag, String direction) {
+        return NodeFactory.createLiteralDirLang(lexical, langTag, direction) ;
+    }
+
     @Override
     public Node createStringLiteral(String lexical) {
         return NodeFactory.createLiteralString(lexical) ;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
index fc454c9a12c..34e9b14609e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfile.java
@@ -62,6 +62,9 @@ public interface ParserProfile {
     /** Create a literal for a string+language */
     public Node createLangLiteral(String lexical, String langTag, long line, long col);
 
+    /** Create a literal for a string+language+base direction */
+    public Node createLangDirLiteral(String lexical, String langTag, String direction, long line, long col);
+
     /** Create a literal for a string */
     public Node createStringLiteral(String lexical, long line, long col);
 
@@ -71,11 +74,23 @@ public interface ParserProfile {
     /** Create a fresh blank node */
     public Node createBlankNode(Node scope, long line, long col);
 
-    /** Create a triple node (RDF-star) */
-    public Node createTripleNode(Node subject, Node predicate, Node object, long line, long col);
+    /** Create a triple term (RDF-star) */
+    public Node createTripleTerm(Node subject, Node predicate, Node object, long line, long col);
+
+    /** @deprecated Use {@link #createTripleTerm} */
+    @Deprecated
+    public default Node createTripleNode(Node subject, Node predicate, Node object, long line, long col) {
+        return createTripleTerm(subject, predicate, object, line, col);
+    }
 
     /** Create a triple node (RDF-star) */
-    public Node createTripleNode(Triple triple, long line, long col);
+    public Node createTripleTerm(Triple triple, long line, long col);
+
+    /** @deprecated Use {@link #createTripleTerm} */
+    @Deprecated
+    public default Node createTripleNode(Triple triple, long line, long col) {
+        return createTripleTerm(triple, line, col);
+    }
 
     /** Create a graph node. This is an N3-formula and not named graphs */
     public Node createGraphNode(Graph graph, long line, long col);
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
index 71a19b677ed..4153a1bfb53 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java
@@ -153,11 +153,19 @@ public Triple createTriple(Node subject, Node predicate, Node object, long line,
     }
 
     private boolean allowSpecialNode(Node node) {
-        return allowNodeExtentions && node instanceof Node_Triple;
+        return allowNodeExtentions;
     }
 
     protected void checkTriple(Node subject, Node predicate, Node object, long line, long col) {
         if ( subject == null || (!subject.isURI() && !subject.isBlank()) ) {
+            if ( subject.isLiteral() ) {
+                errorHandler.error("Subject is a literal: "+subject, line, col);
+                throw new RiotException("Bad subject: " + subject);
+            }
+            if ( subject.isTripleTerm() ) {
+                errorHandler.error("Subject is a triple term: "+subject, line, col);
+                throw new RiotException("Bad subject: " + subject);
+            }
             if ( !allowSpecialNode(subject) ) {
                 errorHandler.error("Subject is not a URI or blank node", line, col);
                 throw new RiotException("Bad subject: " + subject);
@@ -167,7 +175,7 @@ protected void checkTriple(Node subject, Node predicate, Node object, long line,
             errorHandler.error("Predicate not a URI", line, col);
             throw new RiotException("Bad predicate: " + predicate);
         }
-        if ( object == null || (!object.isURI() && !object.isBlank() && !object.isLiteral()) ) {
+        if ( object == null || (!object.isURI() && !object.isBlank() && !object.isLiteral() && !object.isTripleTerm() ) ) {
             if ( !allowSpecialNode(object) ) {
                 errorHandler.error("Object is not a URI, blank node or literal", line, col);
                 throw new RiotException("Bad object: " + object);
@@ -225,6 +233,15 @@ public Node createLangLiteral(String lexical, String langTag, long line, long co
         return factory.createLangLiteral(lexical, langTag);
     }
 
+    @Override
+    public Node createLangDirLiteral(String lexical, String langTag, String direction, long line, long col) {
+        if ( ! TextDirection.isValid(direction) )
+            throw new RiotException("Invalid base direction: '"+direction+"'. Must be 'ltr' or 'rtl'");
+        if ( checking )
+            Checker.checkLiteral(lexical, langTag, direction, null, errorHandler, line, col);
+            return factory.createLangDirLiteral(lexical, langTag, direction);
+    }
+
     @Override
     public Node createStringLiteral(String lexical, long line, long col) {
         // No checks
@@ -244,13 +261,17 @@ public Node createBlankNode(Node scope, long line, long col) {
     }
 
     @Override
-    public Node createTripleNode(Node subject, Node predicate, Node object, long line, long col) {
-        return NodeFactory.createTripleNode(subject, predicate, object);
+    public Node createTripleTerm(Node subject, Node predicate, Node object, long line, long col) {
+        if ( checking )
+            checkTriple(subject, predicate, object, line, col);
+        return NodeFactory.createTripleTerm(subject, predicate, object);
     }
 
     @Override
-    public Node createTripleNode(Triple triple, long line, long col) {
-        return NodeFactory.createTripleNode(triple);
+    public Node createTripleTerm(Triple triple, long line, long col) {
+        if ( checking )
+            checkTriple(triple.getSubject(), triple.getPredicate(), triple.getObject(), line, col);
+        return NodeFactory.createTripleTerm(triple);
     }
 
     @Override
@@ -270,7 +291,7 @@ public Node createNodeFromToken(Node scope, Token token, long line, long col) {
     }
 
     @Override
-    public Node create(Node currentGraph, Token token) {
+    public final Node create(Node currentGraph, Token token) {
         // Dispatches to the underlying ParserFactory operation
         long line = token.getLine();
         long col = token.getColumn();
@@ -314,6 +335,13 @@ public Node create(Node currentGraph, Token token) {
             }
 
             case LITERAL_LANG :
+                String langdir = token.getImage2();
+                int idx = langdir.indexOf("--");
+                if ( idx >= 0 ) {
+                    String textDir = langdir.substring(idx+2);
+                    String lang = langdir.substring(0, idx);
+                    return createLangDirLiteral(str, lang, textDir, line, col);
+                }
                 return createLangLiteral(str, token.getImage2(), line, col);
 
             case STRING :
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
index c531c1e7136..94a00fdf4ee 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileWrapper.java
@@ -78,6 +78,11 @@ public Node createLangLiteral(String lexical, String langTag, long line, long co
         return get().createLangLiteral(lexical, langTag, line, col);
     }
 
+    @Override
+    public Node createLangDirLiteral(String lexical, String langTag, String direction, long line, long col) {
+        return get().createLangDirLiteral(lexical, langTag, direction, line, col);
+    }
+
     @Override
     public Node createStringLiteral(String lexical, long line, long col) {
         return get().createStringLiteral(lexical, line, col);
@@ -94,13 +99,13 @@ public Node createBlankNode(Node scope, long line, long col) {
     }
 
     @Override
-    public Node createTripleNode(Node subject, Node predicate, Node object, long line, long col) {
-        return get().createTripleNode(subject, predicate, object, line, col);
+    public Node createTripleTerm(Node subject, Node predicate, Node object, long line, long col) {
+        return get().createTripleTerm(subject, predicate, object, line, col);
     }
 
     @Override
-    public Node createTripleNode(Triple triple, long line, long col) {
-        return get().createTripleNode(triple, line, col);
+    public Node createTripleTerm(Triple triple, long line, long col) {
+        return get().createTripleTerm(triple, line, col);
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Binding2Thrift.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Binding2Thrift.java
index d9fdff17a23..37d6f52c7da 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Binding2Thrift.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Binding2Thrift.java
@@ -18,84 +18,84 @@
 
 package org.apache.jena.riot.thrift;
 
-import java.io.OutputStream ;
+import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collection ;
-import java.util.Iterator ;
+import java.util.Collection;
+import java.util.Iterator;
 
-import org.apache.jena.graph.Node ;
-import org.apache.jena.riot.thrift.wire.RDF_DataTuple ;
-import org.apache.jena.riot.thrift.wire.RDF_Term ;
-import org.apache.jena.riot.thrift.wire.RDF_VAR ;
-import org.apache.jena.riot.thrift.wire.RDF_VarTuple ;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.thrift.TException ;
-import org.apache.thrift.protocol.TProtocol ;
-import org.apache.thrift.transport.TIOStreamTransport ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.riot.thrift.wire.RDF_DataTuple;
+import org.apache.jena.riot.thrift.wire.RDF_Term;
+import org.apache.jena.riot.thrift.wire.RDF_VAR;
+import org.apache.jena.riot.thrift.wire.RDF_VarTuple;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.binding.Binding;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TIOStreamTransport;
 import org.apache.thrift.transport.TTransportException;
 
 /** Converted from Bindings to SPARQL result set encoded in Thrift */
 public class Binding2Thrift implements AutoCloseable {
-    private final RDF_DataTuple row = new RDF_DataTuple() ;
-    private final Collection<Var> vars ;
-    private final OutputStream out ;
-    private final TProtocol protocol ;
-    private final boolean encodeValues ;
+    private final RDF_DataTuple row = new RDF_DataTuple();
+    private final Collection<Var> vars;
+    private final OutputStream out;
+    private final TProtocol protocol;
+    private final boolean encodeValues;
 
     public Binding2Thrift(OutputStream out, Collection<Var> vars, boolean encodeValues) {
-        this.out = out ;
-        this.vars = vars ;
+        this.out = out;
+        this.vars = vars;
         try {
-            TIOStreamTransport transport = new TIOStreamTransport(out) ;
-            this.protocol = TRDF.protocol(transport) ;
+            TIOStreamTransport transport = new TIOStreamTransport(out);
+            this.protocol = TRDF.protocol(transport);
         } catch (TTransportException ex) { throw new RiotThriftException(ex); }
-        this.encodeValues = encodeValues ;
-        varsRow() ;
+        this.encodeValues = encodeValues;
+        varsRow();
     }
 
     private void varsRow() {
-        RDF_VarTuple vrow = new RDF_VarTuple(new ArrayList<>(vars.size())) ;
+        RDF_VarTuple vrow = new RDF_VarTuple(new ArrayList<>(vars.size()));
         for ( Var v : vars ) {
-            RDF_VAR rv = new RDF_VAR() ;
-            rv.setName(v.getName()) ;
-            vrow.addToVars(rv) ;
+            RDF_VAR rv = new RDF_VAR();
+            rv.setName(v.getName());
+            vrow.addToVars(rv);
         }
-        try { vrow.write(protocol) ; }
-        catch (TException e) { TRDF.exception(e) ; }
+        try { vrow.write(protocol); }
+        catch (TException e) { TRDF.exception(e); }
     }
 
     public Binding2Thrift(TProtocol out, Collection<Var> vars, boolean encodeValues) {
-        this.vars = vars ;
-        this.out = null ;
-        this.protocol = out ;
-        this.encodeValues = encodeValues ;
-        varsRow() ;
+        this.vars = vars;
+        this.out = null;
+        this.protocol = out;
+        this.encodeValues = encodeValues;
+        varsRow();
     }
 
     public void output(Binding binding) {
-        Iterator<Var> vIter = (vars == null ? null : vars.iterator()) ;
+        Iterator<Var> vIter = (vars == null ? null : vars.iterator());
         if ( vIter == null )
-            vIter = binding.vars() ;
+            vIter = binding.vars();
         // ** Java8
 //        vIter.forEachRemaining(v -> {
-//            Node n = binding.get(v) ;
-//            RDF_Term rt = ( n == null ) ? TRDF.tUNDEF : ThriftConvert.convert(n) ;
-//            row.addToRow(rt) ;
-//        }) ;
+//            Node n = binding.get(v);
+//            RDF_Term rt = ( n == null ) ? TRDF.tUNDEF : ThriftConvert.convert(n);
+//            row.addToRow(rt);
+//        });
         while(vIter.hasNext()) {
             Var v = vIter.next();
-            Node n = binding.get(v) ;
-            RDF_Term rt = ( n == null ) ? TRDF.tUNDEF : ThriftConvert.convert(n, encodeValues) ;
-            row.addToRow(rt) ;
+            Node n = binding.get(v);
+            RDF_Term rt = ( n == null ) ? TRDF.tUNDEF : ThriftConvert.convert(n, encodeValues);
+            row.addToRow(rt);
         }
-        try { row.write(protocol) ; }
-        catch (TException e) { TRDF.exception(e) ; }
-        row.clear() ;
+        try { row.write(protocol); }
+        catch (TException e) { TRDF.exception(e); }
+        row.clear();
     }
 
     @Override
     public void close() {
-        TRDF.flush(protocol) ;
+        TRDF.flush(protocol);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java
index bcea6106d2b..6712397f848 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java
@@ -18,52 +18,52 @@
 
 package org.apache.jena.riot.thrift;
 
-import org.apache.jena.riot.system.* ;
-import org.apache.jena.riot.thrift.wire.RDF_StreamRow ;
-import org.apache.thrift.TException ;
-import org.apache.thrift.protocol.TProtocol ;
-import org.apache.thrift.transport.TTransportException ;
+import org.apache.jena.riot.system.*;
+import org.apache.jena.riot.thrift.wire.RDF_StreamRow;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TTransportException;
 
 /**
  *  Iterator over a Thrift-encoded RDF stream.
  */
 public class IteratorThriftRDF extends IteratorStreamRowRDF {
 
-    private final PrefixMap pmap = PrefixMapFactory.create() ;
-    private final StreamRDFCollectOne collector = new StreamRDFCollectOne(pmap) ;
-    private final Thrift2StreamRDF converter = new Thrift2StreamRDF(pmap, collector) ;
+    private final PrefixMap pmap = PrefixMapFactory.create();
+    private final StreamRDFCollectOne collector = new StreamRDFCollectOne(pmap);
+    private final Thrift2StreamRDF converter = new Thrift2StreamRDF(pmap, collector);
     
-    private final RDF_StreamRow row = new RDF_StreamRow() ;
-    private final TProtocol protocol ;
-    private StreamRDFCollectOne slot ;
-    private boolean finished = false ;
+    private final RDF_StreamRow row = new RDF_StreamRow();
+    private final TProtocol protocol;
+    private StreamRDFCollectOne slot;
+    private boolean finished = false;
 
     public IteratorThriftRDF(TProtocol protocol) {
-        this.protocol = protocol ;
+        this.protocol = protocol;
     }
     
     @Override
     protected boolean hasMore() {
-        return true ;
+        return true;
     }
 
     @Override
     protected StreamRowRDF moveToNext() {
         // THRIFT-5022 : isOpen for TIOStreamTransport is broken.
 //        if ( ! protocol.getTransport().isOpen() )
-//            return null ;
+//            return null;
 
-        try { row.read(protocol) ; }
+        try { row.read(protocol); }
         catch (TTransportException e) {
             if ( e.getType() == TTransportException.END_OF_FILE )
-                return null ;
+                return null;
         }
-        catch (TException ex) { TRDF.exception(ex) ; }
+        catch (TException ex) { TRDF.exception(ex); }
         
         TRDF.visit(row, converter); 
         
-        row.clear() ;
-        return collector.getRow() ;
+        row.clear();
+        return collector.getRow();
     }
 
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/RiotThriftException.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/RiotThriftException.java
index 13e3ebae170..911d15f8d11 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/RiotThriftException.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/RiotThriftException.java
@@ -18,12 +18,12 @@
 
 package org.apache.jena.riot.thrift;
 
-import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.RiotException;
 
 public class RiotThriftException extends RiotException {
-    public RiotThriftException()                          { super() ; }
-    public RiotThriftException(String msg)                { super(msg) ; }
-    public RiotThriftException(Throwable th)              { super(th) ; }
-    public RiotThriftException(String msg, Throwable th)  { super(msg, th) ; }
+    public RiotThriftException()                          { super(); }
+    public RiotThriftException(String msg)                { super(msg); }
+    public RiotThriftException(Throwable th)              { super(th); }
+    public RiotThriftException(String msg, Throwable th)  { super(msg, th); }
 }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRowTRDFPrinter.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRowTRDFPrinter.java
index ad4723bb8af..247a7f14168 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRowTRDFPrinter.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/StreamRowTRDFPrinter.java
@@ -18,67 +18,67 @@
 
 package org.apache.jena.riot.thrift;
 
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.riot.thrift.wire.RDF_PrefixDecl ;
-import org.apache.jena.riot.thrift.wire.RDF_Quad ;
-import org.apache.jena.riot.thrift.wire.RDF_Term ;
-import org.apache.jena.riot.thrift.wire.RDF_Triple ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.riot.thrift.wire.RDF_PrefixDecl;
+import org.apache.jena.riot.thrift.wire.RDF_Quad;
+import org.apache.jena.riot.thrift.wire.RDF_Term;
+import org.apache.jena.riot.thrift.wire.RDF_Triple;
 
 /** Print (in debug format) an rdf-thrift stream */ 
 public class StreamRowTRDFPrinter implements VisitorStreamRowTRDF
 {
-    private static final boolean ONELINE = false ;
-    private final IndentedWriter out ;
+    private static final boolean ONELINE = false;
+    private final IndentedWriter out;
 
-    public StreamRowTRDFPrinter(IndentedWriter out) { this.out = out ; }
+    public StreamRowTRDFPrinter(IndentedWriter out) { this.out = out; }
     
     @Override
     public void visit(RDF_Triple triple) {
-        out.print("RDF_Triple") ;
+        out.print("RDF_Triple");
         out.incIndent(); 
-        gap() ;
-        print(triple.getS()) ;
-        gap() ;
-        print(triple.getP()) ;
-        gap() ;
-        print(triple.getO()) ;
-        lineEnd() ;
+        gap();
+        print(triple.getS());
+        gap();
+        print(triple.getP());
+        gap();
+        print(triple.getO());
+        lineEnd();
         out.decIndent();
     }
 
     @Override
     public void visit(RDF_Quad quad) {
-        out.print("RDF_Quad") ;
+        out.print("RDF_Quad");
         out.incIndent(); 
-        gap() ;
-        print(quad.getS()) ;
-        gap() ;
-        print(quad.getP()) ;
-        gap() ;
-        print(quad.getO()) ;
+        gap();
+        print(quad.getS());
+        gap();
+        print(quad.getP());
+        gap();
+        print(quad.getO());
         if ( quad.isSetG() ) {
-            gap() ;
-            print(quad.getG()) ;
+            gap();
+            print(quad.getG());
         }
-        lineEnd() ;
+        lineEnd();
         out.decIndent();
     }
 
     @Override
     public void visit(RDF_PrefixDecl prefix) {
-        out.printf("RDF_PrefixDecl (%s: %s)\n", prefix.getPrefix(), prefix.getUri()) ;
+        out.printf("RDF_PrefixDecl (%s: %s)\n", prefix.getPrefix(), prefix.getUri());
     }
     
     private void gap() { 
         if ( ONELINE )
-            out.print(" ") ;
+            out.print(" ");
         else
-            out.println() ;
+            out.println();
     }
     
     private void lineEnd() {
         if ( ! ONELINE )
-            out.println() ;
+            out.println();
     }
     
     private void startRow() { }
@@ -86,6 +86,6 @@ private void startRow() { }
     private void finishRow() { }
     
     private void print(RDF_Term term) {
-        out.print(term.toString()) ;
+        out.print(term.toString());
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
index 5381ada36cf..5e21233bbb4 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/TRDF.java
@@ -20,26 +20,26 @@
 
 import java.io.*;
 
-import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.riot.thrift.wire.RDF_ANY ;
-import org.apache.jena.riot.thrift.wire.RDF_StreamRow ;
-import org.apache.jena.riot.thrift.wire.RDF_Term ;
-import org.apache.jena.riot.thrift.wire.RDF_UNDEF ;
-import org.apache.thrift.TException ;
-import org.apache.thrift.protocol.TCompactProtocol ;
-import org.apache.thrift.protocol.TJSONProtocol ;
-import org.apache.thrift.protocol.TProtocol ;
-import org.apache.thrift.protocol.TTupleProtocol ;
-import org.apache.thrift.transport.TIOStreamTransport ;
-import org.apache.thrift.transport.TTransport ;
+import org.apache.jena.atlas.io.IO;
+import org.apache.jena.atlas.logging.Log;
+import org.apache.jena.riot.RiotException;
+import org.apache.jena.riot.system.StreamRDF;
+import org.apache.jena.riot.thrift.wire.RDF_ANY;
+import org.apache.jena.riot.thrift.wire.RDF_StreamRow;
+import org.apache.jena.riot.thrift.wire.RDF_Term;
+import org.apache.jena.riot.thrift.wire.RDF_UNDEF;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TCompactProtocol;
+import org.apache.thrift.protocol.TJSONProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.transport.TTransport;
 
 /** Support operations for RDF Thrift */
 public class TRDF {
-    private static final int BUFSIZE_IN   = 128*1024 ;
-    private static final int BUFSIZE_OUT  = 128*1024; ;
+    private static final int BUFSIZE_IN   = 128*1024;
+    private static final int BUFSIZE_OUT  = 128*1024;;
 
     public static InputStream ensureBuffered(InputStream input) {
         if ( input instanceof BufferedInputStream )
@@ -64,11 +64,11 @@ public static OutputStream ensureBuffered(OutputStream output) {
     public static TProtocol protocol(InputStream in) {
         in = ensureBuffered(in);
         try {
-            TTransport transport = new TIOStreamTransport(in) ;
-            transport.open() ;
-            TProtocol protocol = protocol(transport) ;
-            return protocol ;
-        } catch (TException ex) { TRDF.exception(ex) ; return null ; }
+            TTransport transport = new TIOStreamTransport(in);
+            transport.open();
+            TProtocol protocol = protocol(transport);
+            return protocol;
+        } catch (TException ex) { TRDF.exception(ex); return null; }
     }
 
     /**
@@ -81,11 +81,11 @@ public static TProtocol protocol(OutputStream out) {
         out = ensureBuffered(out);
         try {
             // Flushing the protocol will flush the BufferedOutputStream
-            TTransport transport = new TIOStreamTransport(out) ;
-            transport.open() ;
-            TProtocol protocol = protocol(transport) ;
-            return protocol ;
-        } catch (TException ex) { TRDF.exception(ex) ; return null ; }
+            TTransport transport = new TIOStreamTransport(out);
+            transport.open();
+            TProtocol protocol = protocol(transport);
+            return protocol;
+        } catch (TException ex) { TRDF.exception(ex); return null; }
     }
 
     /**
@@ -93,55 +93,55 @@ public static TProtocol protocol(OutputStream out) {
      * @param filename
      */
     public static TProtocol protocol(String filename) {
-        InputStream in = IO.openFile(filename) ;
-        TProtocol protocol = protocol(in) ;
-        return protocol ;
+        InputStream in = IO.openFile(filename);
+        TProtocol protocol = protocol(in);
+        return protocol;
     }
 
     public static TProtocol protocol(TTransport transport) {
-        if ( true ) return new TCompactProtocol(transport) ;
+        if ( true ) return new TCompactProtocol(transport);
 
         // Keep the warnings down.
-        if ( false ) return new TTupleProtocol(transport) ;
-        if ( false ) return new TJSONProtocol(transport) ;
-        throw new RiotThriftException("No protocol impl choosen") ;
+        if ( false ) return new TTupleProtocol(transport);
+        if ( false ) return new TJSONProtocol(transport);
+        throw new RiotThriftException("No protocol impl choosen");
     }
 
     /** Flush a TProtocol; exceptions converted to {@link RiotException} */
     public static void flush(TProtocol protocol) {
-        flush(protocol.getTransport()) ;
+        flush(protocol.getTransport());
     }
 
     /** Flush a TTransport; exceptions converted to {@link RiotException} */
     public static void flush(TTransport transport) {
-        try { transport.flush() ; }
-        catch (TException ex) { TRDF.exception(ex) ; }
+        try { transport.flush(); }
+        catch (TException ex) { TRDF.exception(ex); }
     }
 
-    public static final RDF_ANY ANY = new RDF_ANY() ;
+    public static final RDF_ANY ANY = new RDF_ANY();
     /** The Thrift RDF Term 'ANY' */
-    public static final RDF_Term tANY = new RDF_Term() ;
+    public static final RDF_Term tANY = new RDF_Term();
     /** The Thrift RDF Term 'UNDEF' */
-    public static final RDF_UNDEF UNDEF = new RDF_UNDEF() ;
+    public static final RDF_UNDEF UNDEF = new RDF_UNDEF();
     public static final RDF_Term tUNDEF = new RDF_Term();
 
-    static { tANY.setAny(new RDF_ANY()) ; }
+    static { tANY.setAny(new RDF_ANY()); }
 
-    static { tUNDEF.setUndefined(new RDF_UNDEF()) ; }
+    static { tUNDEF.setUndefined(new RDF_UNDEF()); }
 
     public static void visit(RDF_StreamRow row, VisitorStreamRowTRDF visitor) {
         if ( row.isSetTriple() ) {
-            visitor.visit(row.getTriple()) ;
+            visitor.visit(row.getTriple());
         } else if ( row.isSetQuad() ) {
-            visitor.visit(row.getQuad()) ;
+            visitor.visit(row.getQuad());
         } else if ( row.isSetPrefixDecl() ) {
-            visitor.visit(row.getPrefixDecl()) ;
+            visitor.visit(row.getPrefixDecl());
         } else {
-            Log.warn(ThriftConvert.class, "visit: Unrecognized: "+row) ;
+            Log.warn(ThriftConvert.class, "visit: Unrecognized: "+row);
         }
     }
 
-    public static void exception(TException ex) { throw new RiotThriftException(ex) ; }
+    public static void exception(TException ex) { throw new RiotThriftException(ex); }
 
 }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java
index eb6f86b8145..a4e50658d07 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java
@@ -18,94 +18,94 @@
 
 package org.apache.jena.riot.thrift;
 
-import java.io.InputStream ;
-import java.util.ArrayList ;
-import java.util.Iterator ;
-import java.util.List ;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
-import org.apache.jena.atlas.iterator.IteratorSlotted ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.riot.thrift.wire.RDF_DataTuple ;
-import org.apache.jena.riot.thrift.wire.RDF_Term ;
-import org.apache.jena.riot.thrift.wire.RDF_VAR ;
-import org.apache.jena.riot.thrift.wire.RDF_VarTuple ;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.binding.Binding ;
+import org.apache.jena.atlas.iterator.IteratorSlotted;
+import org.apache.jena.graph.Node;
+import org.apache.jena.riot.thrift.wire.RDF_DataTuple;
+import org.apache.jena.riot.thrift.wire.RDF_Term;
+import org.apache.jena.riot.thrift.wire.RDF_VAR;
+import org.apache.jena.riot.thrift.wire.RDF_VarTuple;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.engine.binding.BindingBuilder;
-import org.apache.thrift.TException ;
-import org.apache.thrift.protocol.TProtocol ;
-import org.apache.thrift.transport.TIOStreamTransport ;
-import org.apache.thrift.transport.TTransportException ;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TIOStreamTransport;
+import org.apache.thrift.transport.TTransportException;
 
-/** Converted from SPARQL result set encoded in Thrift to Bindings */
-public class Thift2Binding extends IteratorSlotted<Binding> implements Iterator<Binding> {
+/** Convert from SPARQL result set encoded in Thrift to Bindings */
+class Thift2Binding extends IteratorSlotted<Binding> implements Iterator<Binding> {
 
-    private List<Var> vars = new ArrayList<>() ;
-    private List<String> varNames = new ArrayList<>() ;
-    private final RDF_DataTuple row = new RDF_DataTuple() ;
-    private InputStream in ;
-    private TProtocol protocol ;
-    private BindingBuilder b = Binding.builder() ;
+    private List<Var> vars = new ArrayList<>();
+    private List<String> varNames = new ArrayList<>();
+    private final RDF_DataTuple row = new RDF_DataTuple();
+    private InputStream in;
+    private TProtocol protocol;
+    private BindingBuilder b = Binding.builder();
 
-    public Thift2Binding(InputStream in) {
-        this.in = in ;
+    Thift2Binding(InputStream in) {
+        this.in = in;
         try {
-            TIOStreamTransport transport = new TIOStreamTransport(in) ;
-            this.protocol = TRDF.protocol(transport) ;
+            TIOStreamTransport transport = new TIOStreamTransport(in);
+            this.protocol = TRDF.protocol(transport);
         } catch (TTransportException ex) { throw new RiotThriftException(ex); }
-        readVars() ;
+        readVars();
     }
 
-    public Thift2Binding(TProtocol out) {
-        this.in = null ;
-        this.protocol = out ;
-        readVars() ;
+    Thift2Binding(TProtocol out) {
+        this.in = null;
+        this.protocol = out;
+        readVars();
     }
 
     private void readVars() {
-        RDF_VarTuple vrow = new RDF_VarTuple() ;
-        try { vrow.read(protocol) ; }
-        catch (TException e) { TRDF.exception(e) ; }
+        RDF_VarTuple vrow = new RDF_VarTuple();
+        try { vrow.read(protocol); }
+        catch (TException e) { TRDF.exception(e); }
         if ( vrow.getVars() != null ) {
             // It can be null if there are no variables and both the encoder
             // and the allocation above used RDF_VarTuple().
             for ( RDF_VAR rv : vrow.getVars() ) {
-                String vn = rv.getName() ;
-                varNames.add(vn) ;
+                String vn = rv.getName();
+                varNames.add(vn);
             }
         }
-        vars = Var.varList(varNames) ;
+        vars = Var.varList(varNames);
     }
 
-    public List<Var> getVars()              { return vars ; }
+    List<Var> getVars()              { return vars; }
 
-    public List<String> getVarNames()       { return varNames ; }
+    List<String> getVarNames()       { return varNames; }
 
     @Override
     protected Binding moveToNext() {
         b.reset();
-        try { row.read(protocol) ; }
-        catch (TTransportException e) { return null ; }
-        catch (TException e) { TRDF.exception(e) ; }
+        try { row.read(protocol); }
+        catch (TTransportException e) { return null; }
+        catch (TException e) { TRDF.exception(e); }
 
         if ( row.getRowSize() != vars.size() )
-            throw new RiotThriftException(String.format("Vars %d : Row length : %d", vars.size(), row.getRowSize())) ;
+            throw new RiotThriftException(String.format("Vars %d : Row length : %d", vars.size(), row.getRowSize()));
 
-        for ( int i = 0 ;  i < vars.size() ; i++ ) {
+        for ( int i = 0;  i < vars.size(); i++ ) {
             // Old school
-            Var v = vars.get(i) ;
-            RDF_Term rt = row.getRow().get(i) ;
+            Var v = vars.get(i);
+            RDF_Term rt = row.getRow().get(i);
             if ( rt.isSetUndefined() )
-                continue ;
-            Node n = ThriftConvert.convert(rt) ;
-            b.add(v, n) ;
+                continue;
+            Node n = ThriftConvert.convert(rt);
+            b.add(v, n);
         }
-        row.clear() ;
-        return b.build() ;
+        row.clear();
+        return b.build();
     }
 
     @Override
     protected boolean hasMore() {
-        return true ;
+        return true;
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
index 067a2232dc3..6f5a63a16d7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
@@ -27,9 +27,11 @@
 import org.apache.jena.atlas.lib.Pair;
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.datatypes.xsd.impl.RDFDirLangString;
 import org.apache.jena.datatypes.xsd.impl.RDFLangString;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.riot.system.PrefixMap;
 import org.apache.jena.riot.system.PrefixMapFactory;
@@ -174,11 +176,13 @@ public static void toThrift(Node node, PrefixMap pmap, RDF_Term term, boolean al
             String lex = node.getLiteralLexicalForm();
             String dt = node.getLiteralDatatypeURI();
             String lang = node.getLiteralLanguage();
+            TextDirection baseDir = node.getLiteralBaseDirection();
 
             // General encoding.
             RDF_Literal literal = new RDF_Literal(lex);
             if ( node.getLiteralDatatype().equals(XSDDatatype.XSDstring) ||
-                    node.getLiteralDatatype().equals(RDFLangString.rdfLangString) ) {
+                 node.getLiteralDatatype().equals(RDFLangString.rdfLangString) ||
+                 node.getLiteralDatatype().equals(RDFDirLangString.rdfDirLangString) ) {
                 dt = null;
             }
 
@@ -192,6 +196,12 @@ public static void toThrift(Node node, PrefixMap pmap, RDF_Term term, boolean al
             if ( lang != null && ! lang.isEmpty() )
                 literal.setLangtag(lang);
             term.setLiteral(literal);
+
+            if ( baseDir != null ) {
+                String baseStr = baseDir.direction();
+                literal.setBaseDirection(baseStr);
+            }
+            term.setLiteral(literal);
             return;
         }
 
@@ -201,7 +211,7 @@ public static void toThrift(Node node, PrefixMap pmap, RDF_Term term, boolean al
             return;
         }
 
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple triple = node.getTriple();
 
             RDF_Term sTerm = new RDF_Term();
@@ -277,7 +287,8 @@ else if ( lit.isSetDtPrefix()) {
             RDFDatatype dt = NodeFactory.getType(dtString);
 
             String lang = lit.getLangtag();
-            return NodeFactory.createLiteral(lex, lang, dt);
+            String baseDir = lit.getBaseDirection();
+            return NodeFactory.createLiteral(lex, lang, baseDir, dt);
         }
 
         if ( term.isSetValInteger() ) {
@@ -306,7 +317,7 @@ else if ( lit.isSetDtPrefix()) {
         if ( term.isSetTripleTerm() ) {
             RDF_Triple rt = term.getTripleTerm();
             Triple t = convert(rt, pmap);
-            return NodeFactory.createTripleNode(t);
+            return NodeFactory.createTripleTerm(t);
         }
 
         if ( term.isSetVariable() )
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftRDF.java
index b61728aae1d..91d14aad36c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftRDF.java
@@ -46,8 +46,8 @@
  */
 public class ThriftRDF {
 
-    private static int BUFSIZE_IN   = 128*1024 ;
-    private static int BUFSIZE_OUT  = 128*1024 ;
+    private static int BUFSIZE_IN   = 128*1024;
+    private static int BUFSIZE_OUT  = 128*1024;
 
     /**
      * Create an {@link StreamRDF} for output.  A filename ending {@code .gz} will have
@@ -59,7 +59,7 @@ public class ThriftRDF {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToFile(String filename) {
-        return streamToFile(filename, false) ;
+        return streamToFile(filename, false);
     }
 
     /**
@@ -73,10 +73,10 @@ public static StreamRDF streamToFile(String filename) {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToFile(String filename, boolean withValues) {
-        OutputStream out = IO.openOutputFile(filename) ;
-        BufferedOutputStream bout = new BufferedOutputStream(out, BUFSIZE_OUT) ;
-        TProtocol protocol = TRDF.protocol(bout) ;
-        return new StreamRDF2Thrift(protocol, withValues) ;
+        OutputStream out = IO.openOutputFile(filename);
+        BufferedOutputStream bout = new BufferedOutputStream(out, BUFSIZE_OUT);
+        TProtocol protocol = TRDF.protocol(bout);
+        return new StreamRDF2Thrift(protocol, withValues);
     }
 
     /**
@@ -87,7 +87,7 @@ public static StreamRDF streamToFile(String filename, boolean withValues) {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToOutputStream(OutputStream out) {
-        return streamToOutputStream(out, false) ;
+        return streamToOutputStream(out, false);
     }
 
     /**
@@ -99,7 +99,7 @@ public static StreamRDF streamToOutputStream(OutputStream out) {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToOutputStream(OutputStream out, boolean withValues) {
-        return new StreamRDF2Thrift(out, withValues) ;
+        return new StreamRDF2Thrift(out, withValues);
     }
 
     /**
@@ -110,7 +110,7 @@ public static StreamRDF streamToOutputStream(OutputStream out, boolean withValue
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToTProtocol(TProtocol protocol) {
-        return streamToTProtocol(protocol, false) ;
+        return streamToTProtocol(protocol, false);
     }
 
     /**
@@ -122,7 +122,7 @@ public static StreamRDF streamToTProtocol(TProtocol protocol) {
      * @return StreamRDF A stream to send to.
      */
     public static StreamRDF streamToTProtocol(TProtocol protocol, boolean withValues) {
-        return new StreamRDF2Thrift(protocol, withValues) ;
+        return new StreamRDF2Thrift(protocol, withValues);
     }
 
     /**
@@ -133,9 +133,9 @@ public static StreamRDF streamToTProtocol(TProtocol protocol, boolean withValues
      * @param dest Sink
      */
     public static void fileToStream(String filename, StreamRDF dest) {
-        InputStream in = IO.openFile(filename) ;
-        TProtocol protocol = TRDF.protocol(in) ;
-        protocolToStream(protocol, dest) ;
+        InputStream in = IO.openFile(filename);
+        TProtocol protocol = TRDF.protocol(in);
+        protocolToStream(protocol, dest);
     }
 
     /**
@@ -144,8 +144,8 @@ public static void fileToStream(String filename, StreamRDF dest) {
      * @param dest StreamRDF
      */
     public static void inputStreamToStream(InputStream in, StreamRDF dest) {
-        TProtocol protocol = TRDF.protocol(in) ;
-        protocolToStream(protocol, dest) ;
+        TProtocol protocol = TRDF.protocol(in);
+        protocolToStream(protocol, dest);
     }
 
     /**
@@ -154,12 +154,12 @@ public static void inputStreamToStream(InputStream in, StreamRDF dest) {
      * @param dest Sink
      */
     public static void protocolToStream(TProtocol protocol, StreamRDF dest) {
-        PrefixMap pmap = PrefixMapFactory.create() ;
-        final Thrift2StreamRDF s = new Thrift2StreamRDF(pmap, dest) ;
-        dest.start() ;
-        apply(protocol, z -> TRDF.visit(z, s)) ;
+        PrefixMap pmap = PrefixMapFactory.create();
+        final Thrift2StreamRDF s = new Thrift2StreamRDF(pmap, dest);
+        dest.start();
+        apply(protocol, z -> TRDF.visit(z, s));
         // Includes flushing the protocol.
-        dest.finish() ;
+        dest.finish();
     }
 
     /**
@@ -168,19 +168,19 @@ public static void protocolToStream(TProtocol protocol, StreamRDF dest) {
      * @param action   Code to act on the row.
      */
     public static void apply(TProtocol protocol, Consumer<RDF_StreamRow> action) {
-        RDF_StreamRow row = new RDF_StreamRow() ;
+        RDF_StreamRow row = new RDF_StreamRow();
         // Bug in 0.13.0 / TIOStreamTransport.isOpen / THRIFT-5022
         //while(protocol.getTransport().isOpen()) {
         while(true) {
-            try { row.read(protocol) ; }
+            try { row.read(protocol); }
             catch (TTransportException e) {
                 if ( e.getType() == TTransportException.END_OF_FILE )
                     // THRIFT-5022 // break;
                     return;
             }
-            catch (TException ex) { TRDF.exception(ex) ; }
-            action.accept(row) ;
-            row.clear() ;
+            catch (TException ex) { TRDF.exception(ex); }
+            action.accept(row);
+            row.clear();
         }
     }
 
@@ -190,34 +190,34 @@ public static void apply(TProtocol protocol, Consumer<RDF_StreamRow> action) {
      * @param in InputStream
      */
     public static void dump(OutputStream out, InputStream in) {
-        IndentedWriter iOut = new IndentedWriter(out) ;
-        StreamRowTRDFPrinter printer = new StreamRowTRDFPrinter(iOut) ;
-        TProtocol protocol = TRDF.protocol(in) ;
+        IndentedWriter iOut = new IndentedWriter(out);
+        StreamRowTRDFPrinter printer = new StreamRowTRDFPrinter(iOut);
+        TProtocol protocol = TRDF.protocol(in);
         apply(protocol, z -> TRDF.visit(z, printer));
-        iOut.flush() ;
+        iOut.flush();
     }
 
     public static RowSet readRowSet(InputStream in) {
-        return readRowSet(TRDF.protocol(in)) ;
+        return readRowSet(TRDF.protocol(in));
     }
 
     public static RowSet readRowSet(TProtocol protocol) {
-        Thift2Binding t2b = new Thift2Binding(protocol) ;
-        return RowSetStream.create(t2b.getVars(), t2b) ;
+        Thift2Binding t2b = new Thift2Binding(protocol);
+        return RowSetStream.create(t2b.getVars(), t2b);
     }
 
     public static void writeRowSet(OutputStream out, RowSet rowSet) {
-        writeRowSet(out, rowSet, false) ;
+        writeRowSet(out, rowSet, false);
     }
 
     public static void writeRowSet(OutputStream out, RowSet rowSet, boolean withValues) {
         out = TRDF.ensureBuffered(out);
-        writeRowSet(TRDF.protocol(out), rowSet, withValues) ;
-        IO.flush(out) ;
+        writeRowSet(TRDF.protocol(out), rowSet, withValues);
+        IO.flush(out);
     }
 
     public static void writeRowSet(TProtocol protocol, RowSet rowSet) {
-        writeRowSet(protocol, rowSet, false) ;
+        writeRowSet(protocol, rowSet, false);
     }
 
     public static void writeRowSet(TProtocol protocol, RowSet rowSet, boolean encodeValues) {
@@ -225,6 +225,6 @@ public static void writeRowSet(TProtocol protocol, RowSet rowSet, boolean encode
         try ( Binding2Thrift b2t = new Binding2Thrift(protocol, vars, encodeValues) ) {
             rowSet.forEachRemaining(b2t::output);
         }
-        //Done by Binding2Thrift.close() -- LibThriftRDF.flush(protocol) ;
+        //Done by Binding2Thrift.close() -- LibThriftRDF.flush(protocol);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/VisitorStreamRowTRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/VisitorStreamRowTRDF.java
index d5a419d1573..070f2b6bb56 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/VisitorStreamRowTRDF.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/VisitorStreamRowTRDF.java
@@ -18,13 +18,13 @@
 
 package org.apache.jena.riot.thrift;
 
-import org.apache.jena.riot.thrift.wire.RDF_PrefixDecl ;
-import org.apache.jena.riot.thrift.wire.RDF_Quad ;
-import org.apache.jena.riot.thrift.wire.RDF_Triple ;
+import org.apache.jena.riot.thrift.wire.RDF_PrefixDecl;
+import org.apache.jena.riot.thrift.wire.RDF_Quad;
+import org.apache.jena.riot.thrift.wire.RDF_Triple;
 
 /** Visitor for RDF_StreamRow */
 public interface VisitorStreamRowTRDF {
-    public void visit(RDF_Triple triple) ;
-    public void visit(RDF_Quad quad) ;
-    public void visit(RDF_PrefixDecl prefix) ;
+    public void visit(RDF_Triple triple);
+    public void visit(RDF_Quad quad);
+    public void visit(RDF_PrefixDecl prefix);
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterDatasetThrift.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterDatasetThrift.java
index 9cc6a87ef9a..6a4f24c53fe 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterDatasetThrift.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterDatasetThrift.java
@@ -18,40 +18,40 @@
 
 package org.apache.jena.riot.thrift;
 
-import static org.apache.jena.riot.RDFLanguages.RDFTHRIFT ;
+import static org.apache.jena.riot.RDFLanguages.RDFTHRIFT;
 
-import java.io.OutputStream ;
-import java.io.Writer ;
+import java.io.OutputStream;
+import java.io.Writer;
 
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFFormat ;
-import org.apache.jena.riot.WriterDatasetRIOT ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.StreamRDFOps ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFFormat;
+import org.apache.jena.riot.WriterDatasetRIOT;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.StreamRDFOps;
+import org.apache.jena.riot.system.StreamRDF;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.util.Context;
 
 /** Write a dataset as RDF Thrift */
 public class WriterDatasetThrift implements WriterDatasetRIOT
 {
-    private final boolean withValues ;
+    private final boolean withValues;
     public WriterDatasetThrift(RDFFormat fmt) {
-        this.withValues = RDFFormat.RDF_THRIFT_VALUES.equals(fmt) ;
+        this.withValues = RDFFormat.RDF_THRIFT_VALUES.equals(fmt);
     }
     @Override
     public Lang getLang() {
-        return RDFTHRIFT ;
+        return RDFTHRIFT;
     }
     @Override
     public void write(Writer out, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) {
-        throw new RiotThriftException("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream") ;
+        throw new RiotThriftException("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream");
     }
     @Override
     public void write(OutputStream out, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) {
-        StreamRDF stream = ThriftRDF.streamToOutputStream(out, withValues) ;
+        StreamRDF stream = ThriftRDF.streamToOutputStream(out, withValues);
         stream.start();
-        StreamRDFOps.sendDatasetToStream(dsg, stream, baseURI, prefixMap) ;
+        StreamRDFOps.sendDatasetToStream(dsg, stream, baseURI, prefixMap);
         stream.finish();
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterGraphThrift.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterGraphThrift.java
index a3509ed5aad..627fa268b9f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterGraphThrift.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/WriterGraphThrift.java
@@ -18,42 +18,42 @@
 
 package org.apache.jena.riot.thrift;
 
-import static org.apache.jena.riot.RDFLanguages.RDFTHRIFT ;
+import static org.apache.jena.riot.RDFLanguages.RDFTHRIFT;
 
-import java.io.OutputStream ;
-import java.io.Writer ;
+import java.io.OutputStream;
+import java.io.Writer;
 
-import org.apache.jena.atlas.lib.NotImplemented ;
-import org.apache.jena.graph.Graph ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFFormat ;
-import org.apache.jena.riot.WriterGraphRIOT ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.StreamRDFOps ;
-import org.apache.jena.riot.system.StreamRDF ;
-import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.atlas.lib.NotImplemented;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFFormat;
+import org.apache.jena.riot.WriterGraphRIOT;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.StreamRDFOps;
+import org.apache.jena.riot.system.StreamRDF;
+import org.apache.jena.sparql.util.Context;
 
 /** Write a graph as RDF Thrift */
 public class WriterGraphThrift implements WriterGraphRIOT
 {
-    private final boolean withValues ;
+    private final boolean withValues;
     public WriterGraphThrift(RDFFormat fmt) {
-        this.withValues = RDFFormat.RDF_THRIFT_VALUES.equals(fmt) ;
+        this.withValues = RDFFormat.RDF_THRIFT_VALUES.equals(fmt);
     }
     @Override
     public Lang getLang() {
-        return RDFTHRIFT ;
+        return RDFTHRIFT;
     }
     @Override
     public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
-        throw new NotImplemented("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream") ;
+        throw new NotImplemented("Writing binary data to a java.io.Writer is not supported. Please use an OutputStream");
     }
 
     @Override
     public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) {
-        StreamRDF stream = ThriftRDF.streamToOutputStream(out, withValues) ;
-        stream.start() ;
-        StreamRDFOps.graphToStream(graph, stream) ;
-        stream.finish() ;
+        StreamRDF stream = ThriftRDF.streamToOutputStream(out, withValues);
+        stream.start();
+        StreamRDFOps.graphToStream(graph, stream);
+        stream.finish();
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
index bfea1d858bd..a301294e126 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java
@@ -12,6 +12,7 @@ public class RDF_Literal implements org.apache.thrift.TBase<RDF_Literal, RDF_Lit
 
   private static final org.apache.thrift.protocol.TField LEX_FIELD_DESC = new org.apache.thrift.protocol.TField("lex", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField LANGTAG_FIELD_DESC = new org.apache.thrift.protocol.TField("langtag", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField BASE_DIRECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("baseDirection", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField DATATYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("datatype", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField DT_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("dtPrefix", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
@@ -20,6 +21,7 @@ public class RDF_Literal implements org.apache.thrift.TBase<RDF_Literal, RDF_Lit
 
   public @org.apache.thrift.annotation.Nullable java.lang.String lex; // required
   public @org.apache.thrift.annotation.Nullable java.lang.String langtag; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String baseDirection; // optional
   public @org.apache.thrift.annotation.Nullable java.lang.String datatype; // optional
   public @org.apache.thrift.annotation.Nullable RDF_PrefixName dtPrefix; // optional
 
@@ -27,6 +29,7 @@ public class RDF_Literal implements org.apache.thrift.TBase<RDF_Literal, RDF_Lit
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     LEX((short)1, "lex"),
     LANGTAG((short)2, "langtag"),
+    BASE_DIRECTION((short)5, "baseDirection"),
     DATATYPE((short)3, "datatype"),
     DT_PREFIX((short)4, "dtPrefix");
 
@@ -48,6 +51,8 @@ public static _Fields findByThriftId(int fieldId) {
           return LEX;
         case 2: // LANGTAG
           return LANGTAG;
+        case 5: // BASE_DIRECTION
+          return BASE_DIRECTION;
         case 3: // DATATYPE
           return DATATYPE;
         case 4: // DT_PREFIX
@@ -95,7 +100,7 @@ public java.lang.String getFieldName() {
   }
 
   // isset id assignments
-  private static final _Fields optionals[] = {_Fields.LANGTAG,_Fields.DATATYPE,_Fields.DT_PREFIX};
+  private static final _Fields optionals[] = {_Fields.LANGTAG,_Fields.BASE_DIRECTION,_Fields.DATATYPE,_Fields.DT_PREFIX};
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -103,6 +108,8 @@ public java.lang.String getFieldName() {
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.LANGTAG, new org.apache.thrift.meta_data.FieldMetaData("langtag", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.BASE_DIRECTION, new org.apache.thrift.meta_data.FieldMetaData("baseDirection", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DATATYPE, new org.apache.thrift.meta_data.FieldMetaData("datatype", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DT_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("dtPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -131,6 +138,9 @@ public RDF_Literal(RDF_Literal other) {
     if (other.isSetLangtag()) {
       this.langtag = other.langtag;
     }
+    if (other.isSetBaseDirection()) {
+      this.baseDirection = other.baseDirection;
+    }
     if (other.isSetDatatype()) {
       this.datatype = other.datatype;
     }
@@ -148,6 +158,7 @@ public RDF_Literal deepCopy() {
   public void clear() {
     this.lex = null;
     this.langtag = null;
+    this.baseDirection = null;
     this.datatype = null;
     this.dtPrefix = null;
   }
@@ -202,6 +213,31 @@ public void setLangtagIsSet(boolean value) {
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getBaseDirection() {
+    return this.baseDirection;
+  }
+
+  public RDF_Literal setBaseDirection(@org.apache.thrift.annotation.Nullable java.lang.String baseDirection) {
+    this.baseDirection = baseDirection;
+    return this;
+  }
+
+  public void unsetBaseDirection() {
+    this.baseDirection = null;
+  }
+
+  /** Returns true if field baseDirection is set (has been assigned a value) and false otherwise */
+  public boolean isSetBaseDirection() {
+    return this.baseDirection != null;
+  }
+
+  public void setBaseDirectionIsSet(boolean value) {
+    if (!value) {
+      this.baseDirection = null;
+    }
+  }
+
   @org.apache.thrift.annotation.Nullable
   public java.lang.String getDatatype() {
     return this.datatype;
@@ -271,6 +307,14 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
       }
       break;
 
+    case BASE_DIRECTION:
+      if (value == null) {
+        unsetBaseDirection();
+      } else {
+        setBaseDirection((java.lang.String)value);
+      }
+      break;
+
     case DATATYPE:
       if (value == null) {
         unsetDatatype();
@@ -300,6 +344,9 @@ public java.lang.Object getFieldValue(_Fields field) {
     case LANGTAG:
       return getLangtag();
 
+    case BASE_DIRECTION:
+      return getBaseDirection();
+
     case DATATYPE:
       return getDatatype();
 
@@ -322,6 +369,8 @@ public boolean isSet(_Fields field) {
       return isSetLex();
     case LANGTAG:
       return isSetLangtag();
+    case BASE_DIRECTION:
+      return isSetBaseDirection();
     case DATATYPE:
       return isSetDatatype();
     case DT_PREFIX:
@@ -361,6 +410,15 @@ public boolean equals(RDF_Literal that) {
         return false;
     }
 
+    boolean this_present_baseDirection = true && this.isSetBaseDirection();
+    boolean that_present_baseDirection = true && that.isSetBaseDirection();
+    if (this_present_baseDirection || that_present_baseDirection) {
+      if (!(this_present_baseDirection && that_present_baseDirection))
+        return false;
+      if (!this.baseDirection.equals(that.baseDirection))
+        return false;
+    }
+
     boolean this_present_datatype = true && this.isSetDatatype();
     boolean that_present_datatype = true && that.isSetDatatype();
     if (this_present_datatype || that_present_datatype) {
@@ -394,6 +452,10 @@ public int hashCode() {
     if (isSetLangtag())
       hashCode = hashCode * 8191 + langtag.hashCode();
 
+    hashCode = hashCode * 8191 + ((isSetBaseDirection()) ? 131071 : 524287);
+    if (isSetBaseDirection())
+      hashCode = hashCode * 8191 + baseDirection.hashCode();
+
     hashCode = hashCode * 8191 + ((isSetDatatype()) ? 131071 : 524287);
     if (isSetDatatype())
       hashCode = hashCode * 8191 + datatype.hashCode();
@@ -433,6 +495,16 @@ public int compareTo(RDF_Literal other) {
         return lastComparison;
       }
     }
+    lastComparison = java.lang.Boolean.compare(isSetBaseDirection(), other.isSetBaseDirection());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetBaseDirection()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.baseDirection, other.baseDirection);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = java.lang.Boolean.compare(isSetDatatype(), other.isSetDatatype());
     if (lastComparison != 0) {
       return lastComparison;
@@ -494,6 +566,16 @@ public java.lang.String toString() {
       }
       first = false;
     }
+    if (isSetBaseDirection()) {
+      if (!first) sb.append(", ");
+      sb.append("baseDirection:");
+      if (this.baseDirection == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.baseDirection);
+      }
+      first = false;
+    }
     if (isSetDatatype()) {
       if (!first) sb.append(", ");
       sb.append("datatype:");
@@ -581,6 +663,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, RDF_Literal struct)
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 5: // BASE_DIRECTION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.baseDirection = iprot.readString();
+              struct.setBaseDirectionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           case 3: // DATATYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.datatype = iprot.readString();
@@ -640,6 +730,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, RDF_Literal struct
           oprot.writeFieldEnd();
         }
       }
+      if (struct.baseDirection != null) {
+        if (struct.isSetBaseDirection()) {
+          oprot.writeFieldBegin(BASE_DIRECTION_FIELD_DESC);
+          oprot.writeString(struct.baseDirection);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -663,16 +760,22 @@ public void write(org.apache.thrift.protocol.TProtocol prot, RDF_Literal struct)
       if (struct.isSetLangtag()) {
         optionals.set(0);
       }
-      if (struct.isSetDatatype()) {
+      if (struct.isSetBaseDirection()) {
         optionals.set(1);
       }
-      if (struct.isSetDtPrefix()) {
+      if (struct.isSetDatatype()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetDtPrefix()) {
+        optionals.set(3);
+      }
+      oprot.writeBitSet(optionals, 4);
       if (struct.isSetLangtag()) {
         oprot.writeString(struct.langtag);
       }
+      if (struct.isSetBaseDirection()) {
+        oprot.writeString(struct.baseDirection);
+      }
       if (struct.isSetDatatype()) {
         oprot.writeString(struct.datatype);
       }
@@ -686,16 +789,20 @@ public void read(org.apache.thrift.protocol.TProtocol prot, RDF_Literal struct)
       org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       struct.lex = iprot.readString();
       struct.setLexIsSet(true);
-      java.util.BitSet incoming = iprot.readBitSet(3);
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.langtag = iprot.readString();
         struct.setLangtagIsSet(true);
       }
       if (incoming.get(1)) {
+        struct.baseDirection = iprot.readString();
+        struct.setBaseDirectionIsSet(true);
+      }
+      if (incoming.get(2)) {
         struct.datatype = iprot.readString();
         struct.setDatatypeIsSet(true);
       }
-      if (incoming.get(2)) {
+      if (incoming.get(3)) {
         struct.dtPrefix = new RDF_PrefixName();
         struct.dtPrefix.read(iprot);
         struct.setDtPrefixIsSet(true);
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
index 0f046bd583a..9e315870c6d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerText.java
@@ -1178,13 +1178,13 @@ private String langTag() {
             int ch = reader.peekChar();
             if ( ch == '-' ) {
                 if ( seenTextDirection )
-                   fatal("Bad language tag with text direction");
+                   fatal("Bad language tag with base direction");
                 reader.readChar();
                 insertCodepointDirect(stringBuilder, ch);
                 int ch2 = reader.peekChar();
                 if ( ch2 == '-' ) {
                     reader.readChar();
-                    // Initial text direction
+                    // base direction
                     insertCodepointDirect(stringBuilder, ch2);
                     seenTextDirection = true;
                 }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
index b9b06505110..89cff086e5d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
@@ -220,7 +220,7 @@ private static void write(IndentedWriter out, Node node, PrefixMap prefixMap) {
             out.println();
             return;
         }
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             StreamWriterTriX.write(out, node.getTriple(), prefixMap);
             return;
         }
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index 73072a7eb78..a134d9fa0db 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -857,11 +857,11 @@ private void findBNodesSyntax1() {
                         if ( sConn == 0 && containedInOneGraph(subj) )
                             // Not used as an object in this graph.
                             freeBnodes.add(subj);
-                    } else if ( subj.isNodeTriple() ) {
+                    } else if ( subj.isTripleTerm() ) {
                         extractBlankNodesInTripleTerms(blankNodesInTripleTerms, subj);
                     }
 
-                    if ( obj.isNodeTriple() ) {
+                    if ( obj.isTripleTerm() ) {
                         extractBlankNodesInTripleTerms(blankNodesInTripleTerms, obj);
                         continue;
                     }
@@ -896,12 +896,12 @@ private void extractBlankNodesInTripleTerms(Set<Node> blankNodesInTripleTerms, N
 
             if ( tSubj.isBlank() )
                 blankNodesInTripleTerms.add(tSubj);
-            else if ( tSubj.isNodeTriple() )
+            else if ( tSubj.isTripleTerm() )
                 extractBlankNodesInTripleTerms(blankNodesInTripleTerms, tSubj);
 
             if ( tObj.isBlank() )
                 blankNodesInTripleTerms.add(tObj);
-            else if ( tObj.isNodeTriple() )
+            else if ( tObj.isTripleTerm() )
                 extractBlankNodesInTripleTerms(blankNodesInTripleTerms, tObj);
         }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
index d18420b3f6d..627dade41f3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
@@ -68,6 +68,9 @@ public class ARQConstants
     /** XML namespace */
     public static final String XML_NS = "http://www.w3.org/XML/1998/namespace" ;
 
+    /** ITS namespace (Internationalization Tag Set (ITS) Version 2.0) */
+    public static final String ITS_NS = "http://www.w3.org/2005/11/its" ;
+
     /** XML Schema namespace */
     public static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema#" ;
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
index 016a0240c9d..1adeda4bbeb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
@@ -307,6 +307,13 @@ protected Op compileOneInGroup(Element elt, Op current, Deque<Op> acc) {
         if ( elt instanceof ElementLateral eltLateral )
             return compileElementLateral(current, eltLateral);
 
+        if ( elt instanceof ElementSemiJoin eltSemiJoin )
+            return compileElementSemiJoin(current, eltSemiJoin);
+
+        if ( elt instanceof ElementAntiJoin eltAntiJoin )
+            return compileElementAntiJoin(current, eltAntiJoin);
+
+
         if ( elt instanceof ElementMinus elt2 )
             return compileElementMinus(current, elt2);
 
@@ -401,6 +408,18 @@ protected Op compileElementLateral(Op current, ElementLateral eltLateral) {
         return OpLateral.create(current, op);
     }
 
+    protected Op compileElementSemiJoin(Op current, ElementSemiJoin eltSemiJoin) {
+        Element subElt = eltSemiJoin.getSubElement();
+        Op op = compileElement(subElt);
+        return OpSemiJoin.create(current, op);
+    }
+
+    protected Op compileElementAntiJoin(Op current, ElementAntiJoin eltAntiJoin) {
+        Element subElt = eltAntiJoin.getSubElement();
+        Op op = compileElement(subElt);
+        return OpAntiJoin.create(current, op);
+    }
+
     protected Op compileBasicPattern(BasicPattern pattern) {
         return new OpBGP(pattern);
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
index 594139040cf..dd7ac6cad2d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpAsQuery.java
@@ -20,6 +20,8 @@
 
 import java.util.* ;
 import java.util.function.BiConsumer ;
+import java.util.function.Function;
+
 import org.apache.jena.atlas.lib.NotImplemented ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
@@ -661,11 +663,6 @@ private void convertLeftJoin(Op opLeft, Op opRight, ExprList exprs) {
             g.addElement(opt) ;
         }
 
-        @Override
-        public void visit(OpDiff opDiff) {
-            throw new ARQNotImplemented("OpDiff") ;
-        }
-
         @Override
         public void visit(OpMinus opMinus) {
             Element eLeft = asElement(opMinus.getLeft()) ;
@@ -700,10 +697,24 @@ public void visit(OpUnion opUnion) {
             currentGroup().addElement(elUnion) ;
         }
 
+        @Override
+        public void visit(OpSemiJoin opSemiJoin) {
+            visitGroupPatternRight(opSemiJoin, ElementSemiJoin::new);
+        }
+
+        @Override
+        public void visit(OpAntiJoin opAntiJoin) {
+            visitGroupPatternRight(opAntiJoin, ElementAntiJoin::new);
+        }
         @Override
         public void visit(OpLateral opLateral) {
-            Element eLeft = asElement(opLateral.getLeft()) ;
-            ElementGroup eRight = asElementGroup(opLateral.getRight()) ;
+            visitGroupPatternRight(opLateral, ElementLateral::new);
+        }
+
+        // Op2 where the syntax form is "left WORD { right }"
+        private void visitGroupPatternRight(Op2 op2, Function<ElementGroup, Element> functionRightToElement) {
+            Element eLeft = asElement(op2.getLeft()) ;
+            ElementGroup eRight = asElementGroup(op2.getRight()) ;
             ElementGroup g = currentGroup() ;
             if ( !emptyGroup(eLeft) ) {
                 if ( eLeft instanceof ElementGroup )
@@ -711,8 +722,8 @@ public void visit(OpLateral opLateral) {
                 else
                     g.addElement(eLeft) ;
             }
-            ElementLateral eltLateral = new ElementLateral(eRight) ;
-            g.addElement(eltLateral) ;
+            Element elt = functionRightToElement.apply(eRight) ;
+            g.addElement(elt) ;
         }
 
         @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitor.java
index a7a74c79195..94221468084 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitor.java
@@ -18,44 +18,45 @@
 
 package org.apache.jena.sparql.algebra;
 
-import org.apache.jena.sparql.algebra.op.* ;
+import org.apache.jena.sparql.algebra.op.*;
 
 public interface OpVisitor
 {
     // Op0
-    public void visit(OpBGP opBGP) ;
-    public void visit(OpQuadPattern quadPattern) ;
-    public void visit(OpQuadBlock quadBlock) ;
-    public void visit(OpTriple opTriple) ;
-    public void visit(OpQuad opQuad) ;
-    public void visit(OpPath opPath) ;
-    public void visit(OpTable opTable) ;
-    public void visit(OpNull opNull) ;
+    public void visit(OpBGP opBGP);
+    public void visit(OpQuadPattern quadPattern);
+    public void visit(OpQuadBlock quadBlock);
+    public void visit(OpTriple opTriple);
+    public void visit(OpQuad opQuad);
+    public void visit(OpPath opPath);
+    public void visit(OpTable opTable);
+    public void visit(OpNull opNull);
 
     //Op1
-    public void visit(OpProcedure opProc) ;
-    public void visit(OpPropFunc opPropFunc) ;
-    public void visit(OpFilter opFilter) ;
-    public void visit(OpGraph opGraph) ;
-    public void visit(OpService opService) ;
-    public void visit(OpDatasetNames dsNames) ;
-    public void visit(OpLabel opLabel) ;
-    public void visit(OpAssign opAssign) ;
-    public void visit(OpExtend opExtend) ;
-    public void visit(OpUnfold opUnfold) ;
+    public void visit(OpProcedure opProc);
+    public void visit(OpPropFunc opPropFunc);
+    public void visit(OpFilter opFilter);
+    public void visit(OpGraph opGraph);
+    public void visit(OpService opService);
+    public void visit(OpDatasetNames dsNames);
+    public void visit(OpLabel opLabel);
+    public void visit(OpAssign opAssign);
+    public void visit(OpExtend opExtend);
+    public void visit(OpUnfold opUnfold);
 
     // Op2
-    public void visit(OpJoin opJoin) ;
-    public void visit(OpLeftJoin opLeftJoin) ;
-    public void visit(OpUnion opUnion) ;
-    public void visit(OpDiff opDiff) ;
-    public void visit(OpMinus opMinus) ;
-    public void visit(OpLateral opLateral) ;
-    public void visit(OpConditional opCondition) ;
+    public void visit(OpJoin opJoin);
+    public void visit(OpLeftJoin opLeftJoin);
+    public void visit(OpUnion opUnion);
+    public void visit(OpMinus opMinus);
+    public void visit(OpConditional opCondition);
+    public void visit(OpLateral opLateral);
+    public void visit(OpSemiJoin opSemiJoin);
+    public void visit(OpAntiJoin opAntiJoin);
 
     // OpN
-    public void visit(OpSequence opSequence) ;
-    public void visit(OpDisjunction opDisjunction) ;
+    public void visit(OpSequence opSequence);
+    public void visit(OpDisjunction opDisjunction);
 
     public default void visit(OpExt opExt) {
         Op effective = opExt.effectiveOp();
@@ -64,13 +65,13 @@ public default void visit(OpExt opExt) {
     }
 
     // OpModifier
-    public void visit(OpList opList) ;
-    public void visit(OpOrder opOrder) ;
-    public void visit(OpProject opProject) ;
-    public void visit(OpReduced opReduced) ;
-    public void visit(OpDistinct opDistinct) ;
-    public void visit(OpSlice opSlice) ;
+    public void visit(OpList opList);
+    public void visit(OpOrder opOrder);
+    public void visit(OpProject opProject);
+    public void visit(OpReduced opReduced);
+    public void visit(OpDistinct opDistinct);
+    public void visit(OpSlice opSlice);
 
-    public void visit(OpGroup opGroup) ;
-    public void visit(OpTopN opTop) ;
+    public void visit(OpGroup opGroup);
+    public void visit(OpTopN opTop);
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
index 89cbe7692de..879a2645ed5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
@@ -49,13 +49,15 @@ public OpVisitorBase() {}
 
     @Override public void visit(OpLeftJoin opLeftJoin)          {}
 
-    @Override public void visit(OpLateral opLateral)            {}
-
     @Override public void visit(OpConditional opCond)           {}
 
     @Override public void visit(OpMinus opMinus)                {}
 
-    @Override public void visit(OpDiff opDiff)                  {}
+    @Override public void visit(OpLateral opLateral)            {}
+
+    @Override public void visit(OpSemiJoin opSemiJoin)          {}
+
+    @Override public void visit(OpAntiJoin opAntiJoin)          {}
 
     @Override public void visit(OpUnion opUnion)                {}
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorByType.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorByType.java
index fd8f0b4b8b6..1930941554e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorByType.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorByType.java
@@ -91,10 +91,6 @@ public void visit(OpDisjunction opDisjunction)
     public void visit(OpLeftJoin opLeftJoin)
     { visitLeftJoin(opLeftJoin) ; }
 
-    @Override
-    public void visit(OpDiff opDiff)
-    { visit2(opDiff) ; }
-
     @Override
     public void visit(OpMinus opMinus)
     { visit2(opMinus) ; }
@@ -103,9 +99,18 @@ public void visit(OpMinus opMinus)
     public void visit(OpUnion opUnion)
     { visit2(opUnion) ; }
 
-    @Override public void visit(OpLateral opLateral)
+    @Override
+    public void visit(OpLateral opLateral)
     { visit2(opLateral) ; }
 
+    @Override
+    public void visit(OpSemiJoin opSemiJoin)
+    { visit2(opSemiJoin) ; }
+
+    @Override
+    public void visit(OpAntiJoin opAntiJoin)
+    { visit2(opAntiJoin) ; }
+
     @Override
     public void visit(OpConditional opCond)
     { visit2(opCond) ; }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Transform.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Transform.java
index bdebe52b986..d86fb47c876 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Transform.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Transform.java
@@ -18,57 +18,58 @@
 
 package org.apache.jena.sparql.algebra;
 
-import java.util.List ;
+import java.util.List;
 
-import org.apache.jena.sparql.algebra.op.* ;
+import org.apache.jena.sparql.algebra.op.*;
 
 public interface Transform
 {
     // Op0
-    public Op transform(OpTable opUnit) ;
-    public Op transform(OpBGP opBGP) ;
-    public Op transform(OpTriple opTriple) ;
-    public Op transform(OpQuad opQuad) ;
-    public Op transform(OpPath opPath) ;
-    public Op transform(OpDatasetNames dsNames) ;
-    public Op transform(OpQuadPattern quadPattern) ;
-    public Op transform(OpQuadBlock quadBlock) ;
-    public Op transform(OpNull opNull) ;
+    public Op transform(OpTable opUnit);
+    public Op transform(OpBGP opBGP);
+    public Op transform(OpTriple opTriple);
+    public Op transform(OpQuad opQuad);
+    public Op transform(OpPath opPath);
+    public Op transform(OpDatasetNames dsNames);
+    public Op transform(OpQuadPattern quadPattern);
+    public Op transform(OpQuadBlock quadBlock);
+    public Op transform(OpNull opNull);
 
     // Op1
-    public Op transform(OpFilter opFilter, Op subOp) ;
-    public Op transform(OpGraph opGraph, Op subOp) ;
-    public Op transform(OpService opService, Op subOp) ;
-    public Op transform(OpProcedure opProcedure, Op subOp) ;
-    public Op transform(OpPropFunc opPropFunc, Op subOp) ;
-    public Op transform(OpLabel opLabel, Op subOp) ;
-    public Op transform(OpAssign opAssign, Op subOp) ;
-    public Op transform(OpExtend opExtend, Op subOp) ;
-    public Op transform(OpUnfold opUnfold, Op subOp) ;
+    public Op transform(OpFilter opFilter, Op subOp);
+    public Op transform(OpGraph opGraph, Op subOp);
+    public Op transform(OpService opService, Op subOp);
+    public Op transform(OpProcedure opProcedure, Op subOp);
+    public Op transform(OpPropFunc opPropFunc, Op subOp);
+    public Op transform(OpLabel opLabel, Op subOp);
+    public Op transform(OpAssign opAssign, Op subOp);
+    public Op transform(OpExtend opExtend, Op subOp);
+    public Op transform(OpUnfold opUnfold, Op subOp);
 
     // Op2
-    public Op transform(OpJoin opJoin, Op left, Op right) ;
-    public Op transform(OpLeftJoin opLeftJoin, Op left, Op right) ;
-    public Op transform(OpDiff opDiff, Op left, Op right) ;
-    public Op transform(OpMinus opMinus, Op left, Op right) ;
-    public Op transform(OpUnion opUnion, Op left, Op right) ;
-    public Op transform(OpLateral opLater, Op left, Op right) ;
-    public Op transform(OpConditional opCondition, Op left, Op right) ;
+    public Op transform(OpJoin opJoin, Op left, Op right);
+    public Op transform(OpLeftJoin opLeftJoin, Op left, Op right);
+    public Op transform(OpMinus opMinus, Op left, Op right);
+    public Op transform(OpUnion opUnion, Op left, Op right);
+    public Op transform(OpLateral opLateral, Op left, Op right);
+    public Op transform(OpSemiJoin opSemiJoin, Op left, Op right);
+    public Op transform(OpAntiJoin opAntiJoin, Op left, Op right);
+    public Op transform(OpConditional opCondition, Op left, Op right);
 
     // OpN
-    public Op transform(OpSequence opSequence, List<Op> elts) ;
-    public Op transform(OpDisjunction opDisjunction, List<Op> elts) ;
+    public Op transform(OpSequence opSequence, List<Op> elts);
+    public Op transform(OpDisjunction opDisjunction, List<Op> elts);
 
     // Extensions
-    public Op transform(OpExt opExt) ;
+    public Op transform(OpExt opExt);
 
     // OpModifier
-    public Op transform(OpList opList, Op subOp) ;
-    public Op transform(OpOrder opOrder, Op subOp) ;
-    public Op transform(OpTopN opTop, Op subOp) ;
-    public Op transform(OpProject opProject, Op subOp) ;
-    public Op transform(OpDistinct opDistinct, Op subOp) ;
-    public Op transform(OpReduced opReduced, Op subOp) ;
-    public Op transform(OpSlice opSlice, Op subOp) ;
-    public Op transform(OpGroup opGroup, Op subOp) ;
+    public Op transform(OpList opList, Op subOp);
+    public Op transform(OpOrder opOrder, Op subOp);
+    public Op transform(OpTopN opTop, Op subOp);
+    public Op transform(OpProject opProject, Op subOp);
+    public Op transform(OpDistinct opDistinct, Op subOp);
+    public Op transform(OpReduced opReduced, Op subOp);
+    public Op transform(OpSlice opSlice, Op subOp);
+    public Op transform(OpGroup opGroup, Op subOp);
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformCopy.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformCopy.java
index 6c21d89be85..2c32f8c7601 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformCopy.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformCopy.java
@@ -76,20 +76,22 @@ public class TransformCopy implements Transform
     @Override
     public Op transform(OpLeftJoin opLeftJoin, Op left, Op right)   { return xform(opLeftJoin, left, right) ; }
     @Override
-    public Op transform(OpDiff opDiff, Op left, Op right)           { return xform(opDiff, left, right) ; }
-    @Override
     public Op transform(OpMinus opMinus, Op left, Op right)         { return xform(opMinus, left, right) ; }
     @Override
     public Op transform(OpUnion opUnion, Op left, Op right)         { return xform(opUnion, left, right) ; }
     @Override
     public Op transform(OpLateral opLateral, Op left, Op right)     { return xform(opLateral, left, right) ; }
     @Override
+    public Op transform(OpSemiJoin opSemiJoin, Op left, Op right)   { return xform(opSemiJoin, left, right) ; }
+    @Override
+    public Op transform(OpAntiJoin opAntiJoin, Op left, Op right)   { return xform(opAntiJoin, left, right) ; }
+    @Override
     public Op transform(OpConditional opCond, Op left, Op right)    { return xform(opCond, left, right) ; }
 
     @Override
-    public Op transform(OpSequence opSequence, List<Op> elts)           { return xform(opSequence, elts) ; }
+    public Op transform(OpSequence opSequence, List<Op> elts)       { return xform(opSequence, elts) ; }
     @Override
-    public Op transform(OpDisjunction opDisjunction, List<Op> elts)     { return xform(opDisjunction, elts) ; }
+    public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return xform(opDisjunction, elts) ; }
 
     @Override
     public Op transform(OpExt opExt)                                { return xform(opExt) ; }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformSingle.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformSingle.java
index 69a525bd769..6bb1df90deb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformSingle.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformSingle.java
@@ -72,13 +72,16 @@ public class TransformSingle implements Transform
     @Override
     public Op transform(OpLeftJoin opLeftJoin, Op left, Op right)   { return opLeftJoin ; }
     @Override
-    public Op transform(OpDiff opDiff, Op left, Op right)           { return opDiff ; }
-    @Override
     public Op transform(OpMinus opMinus, Op left, Op right)         { return opMinus ; }
     @Override
     public Op transform(OpUnion opUnion, Op left, Op right)         { return opUnion ; }
     @Override
     public Op transform(OpLateral opCopLateral, Op left, Op right)  { return opCopLateral ; }
+    @Override
+    public Op transform(OpSemiJoin opSemiJoin, Op left, Op right)   { return opSemiJoin ; }
+    @Override
+    public Op transform(OpAntiJoin opAntiJoin, Op left, Op right)   { return opAntiJoin ; }
+
     @Override
     public Op transform(OpConditional opCond, Op left, Op right)    { return opCond ; }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformWrapper.java
index 0be481886f0..1e110633e66 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/TransformWrapper.java
@@ -18,98 +18,100 @@
 
 package org.apache.jena.sparql.algebra;
 
-import java.util.List ;
+import java.util.List;
 
-import org.apache.jena.sparql.algebra.op.* ;
+import org.apache.jena.sparql.algebra.op.*;
 
 /** Wrap another transform and pass on the transform operation */
 public class TransformWrapper implements Transform
 {
-    protected final Transform transform ;
+    protected final Transform transform;
 
     public TransformWrapper(Transform transform)
     {
-        this.transform = transform ;
+        this.transform = transform;
     }
 
     @Override
-    public Op transform(OpTable opTable)                    { return transform.transform(opTable) ; }
+    public Op transform(OpTable opTable)                    { return transform.transform(opTable); }
     @Override
-    public Op transform(OpBGP opBGP)                        { return transform.transform(opBGP) ; }
+    public Op transform(OpBGP opBGP)                        { return transform.transform(opBGP); }
     @Override
-    public Op transform(OpTriple opTriple)                  { return transform.transform(opTriple) ; }
+    public Op transform(OpTriple opTriple)                  { return transform.transform(opTriple); }
     @Override
-    public Op transform(OpQuad opQuad)                      { return transform.transform(opQuad) ; }
+    public Op transform(OpQuad opQuad)                      { return transform.transform(opQuad); }
     @Override
-    public Op transform(OpPath opPath)                      { return transform.transform(opPath) ; }
+    public Op transform(OpPath opPath)                      { return transform.transform(opPath); }
 
     @Override
-    public Op transform(OpProcedure opProc, Op subOp)       { return transform.transform(opProc, subOp) ; }
+    public Op transform(OpProcedure opProc, Op subOp)       { return transform.transform(opProc, subOp); }
     @Override
-    public Op transform(OpPropFunc opPropFunc, Op subOp)    { return transform.transform(opPropFunc, subOp) ; }
+    public Op transform(OpPropFunc opPropFunc, Op subOp)    { return transform.transform(opPropFunc, subOp); }
 
     @Override
-    public Op transform(OpDatasetNames dsNames)             { return transform.transform(dsNames) ; }
+    public Op transform(OpDatasetNames dsNames)             { return transform.transform(dsNames); }
     @Override
-    public Op transform(OpQuadPattern quadPattern)          { return transform.transform(quadPattern) ; }
+    public Op transform(OpQuadPattern quadPattern)          { return transform.transform(quadPattern); }
     @Override
-    public Op transform(OpQuadBlock quadBlock)              { return transform.transform(quadBlock) ; }
+    public Op transform(OpQuadBlock quadBlock)              { return transform.transform(quadBlock); }
 
     @Override
-    public Op transform(OpFilter opFilter, Op subOp)        { return transform.transform(opFilter, subOp) ; }
+    public Op transform(OpFilter opFilter, Op subOp)        { return transform.transform(opFilter, subOp); }
     @Override
-    public Op transform(OpGraph opGraph, Op subOp)          { return transform.transform(opGraph, subOp) ; }
+    public Op transform(OpGraph opGraph, Op subOp)          { return transform.transform(opGraph, subOp); }
     @Override
-    public Op transform(OpService opService, Op subOp)      { return transform.transform(opService, subOp) ; }
+    public Op transform(OpService opService, Op subOp)      { return transform.transform(opService, subOp); }
 
     @Override
-    public Op transform(OpAssign opAssign, Op subOp)        { return transform.transform(opAssign, subOp) ; }
+    public Op transform(OpAssign opAssign, Op subOp)        { return transform.transform(opAssign, subOp); }
     @Override
-    public Op transform(OpExtend opExtend, Op subOp)        { return transform.transform(opExtend, subOp) ; }
+    public Op transform(OpExtend opExtend, Op subOp)        { return transform.transform(opExtend, subOp); }
     @Override
-    public Op transform(OpUnfold opUnfold, Op subOp)        { return transform.transform(opUnfold, subOp) ; }
+    public Op transform(OpUnfold opUnfold, Op subOp)        { return transform.transform(opUnfold, subOp); }
 
     @Override
-    public Op transform(OpJoin opJoin, Op left, Op right)           { return transform.transform(opJoin, left, right) ; }
+    public Op transform(OpJoin opJoin, Op left, Op right)           { return transform.transform(opJoin, left, right); }
     @Override
-    public Op transform(OpLeftJoin opLeftJoin, Op left, Op right)   { return transform.transform(opLeftJoin, left, right) ; }
+    public Op transform(OpLeftJoin opLeftJoin, Op left, Op right)   { return transform.transform(opLeftJoin, left, right); }
     @Override
-    public Op transform(OpDiff opDiff, Op left, Op right)           { return transform.transform(opDiff, left, right) ; }
+    public Op transform(OpMinus opMinus, Op left, Op right)         { return transform.transform(opMinus, left, right); }
     @Override
-    public Op transform(OpMinus opMinus, Op left, Op right)         { return transform.transform(opMinus, left, right) ; }
+    public Op transform(OpUnion opUnion, Op left, Op right)         { return transform.transform(opUnion, left, right); }
     @Override
-    public Op transform(OpUnion opUnion, Op left, Op right)         { return transform.transform(opUnion, left, right) ; }
+    public Op transform(OpLateral opLateral, Op left, Op right)     { return transform.transform(opLateral, left, right); }
     @Override
-    public Op transform(OpLateral opLateral, Op left, Op right)     { return transform.transform(opLateral, left, right) ; }
+    public Op transform(OpSemiJoin opSemiJoin, Op left, Op right)   { return transform.transform(opSemiJoin, left, right); }
     @Override
-    public Op transform(OpConditional opCond, Op left, Op right)    { return transform.transform(opCond, left, right) ; }
+    public Op transform(OpAntiJoin opAntiJoin, Op left, Op right)   { return transform.transform(opAntiJoin, left, right); }
+    @Override
+    public Op transform(OpConditional opCond, Op left, Op right)    { return transform.transform(opCond, left, right); }
 
     @Override
-    public Op transform(OpSequence opSequence, List<Op> elts)       { return transform.transform(opSequence, elts) ; }
+    public Op transform(OpSequence opSequence, List<Op> elts)       { return transform.transform(opSequence, elts); }
     @Override
-    public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return transform.transform(opDisjunction, elts) ; }
+    public Op transform(OpDisjunction opDisjunction, List<Op> elts) { return transform.transform(opDisjunction, elts); }
 
     @Override
-    public Op transform(OpExt opExt)                        { return transform.transform(opExt) ; }
+    public Op transform(OpExt opExt)                        { return transform.transform(opExt); }
     @Override
-    public Op transform(OpNull opNull)                      { return transform.transform(opNull) ; }
+    public Op transform(OpNull opNull)                      { return transform.transform(opNull); }
     @Override
-    public Op transform(OpLabel opLabel, Op subOp)          { return transform.transform(opLabel, subOp) ; }
+    public Op transform(OpLabel opLabel, Op subOp)          { return transform.transform(opLabel, subOp); }
 
     @Override
-    public Op transform(OpList opList, Op subOp)            { return transform.transform(opList, subOp) ; }
+    public Op transform(OpList opList, Op subOp)            { return transform.transform(opList, subOp); }
     @Override
-    public Op transform(OpOrder opOrder, Op subOp)          { return transform.transform(opOrder, subOp) ; }
+    public Op transform(OpOrder opOrder, Op subOp)          { return transform.transform(opOrder, subOp); }
     @Override
-    public Op transform(OpTopN opTop, Op subOp)             { return transform.transform(opTop, subOp) ; }
+    public Op transform(OpTopN opTop, Op subOp)             { return transform.transform(opTop, subOp); }
     @Override
-    public Op transform(OpProject opProject, Op subOp)      { return transform.transform(opProject, subOp) ; }
+    public Op transform(OpProject opProject, Op subOp)      { return transform.transform(opProject, subOp); }
     @Override
-    public Op transform(OpDistinct opDistinct, Op subOp)    { return transform.transform(opDistinct, subOp) ; }
+    public Op transform(OpDistinct opDistinct, Op subOp)    { return transform.transform(opDistinct, subOp); }
     @Override
-    public Op transform(OpReduced opReduced, Op subOp)      { return transform.transform(opReduced, subOp) ; }
+    public Op transform(OpReduced opReduced, Op subOp)      { return transform.transform(opReduced, subOp); }
     @Override
-    public Op transform(OpSlice opSlice, Op subOp)          { return transform.transform(opSlice, subOp) ; }
+    public Op transform(OpSlice opSlice, Op subOp)          { return transform.transform(opSlice, subOp); }
     @Override
-    public Op transform(OpGroup opGroup, Op subOp)          { return transform.transform(opGroup, subOp) ; }
+    public Op transform(OpGroup opGroup, Op subOp)          { return transform.transform(opGroup, subOp); }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpDiff.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAntiJoin.java
similarity index 83%
rename from jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpDiff.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAntiJoin.java
index 598ee0d49cb..1ce57373c81 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpDiff.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpAntiJoin.java
@@ -24,17 +24,17 @@
 import org.apache.jena.sparql.sse.Tags;
 import org.apache.jena.sparql.util.NodeIsomorphismMap;
 
-public class OpDiff extends Op2
+public class OpAntiJoin extends Op2
 {
     public static Op create(Op left, Op right)
     {
-        return new OpDiff(left, right);
+        return new OpAntiJoin(left, right);
     }
 
-    private OpDiff(Op left, Op right) { super(left, right); }
+    private OpAntiJoin(Op left, Op right) { super(left, right); }
 
     @Override
-    public String getName() { return Tags.tagDiff; }
+    public String getName() { return Tags.tagSemiJoin; }
 
     @Override
     public Op apply(Transform transform, Op left, Op right)
@@ -45,11 +45,11 @@ public Op apply(Transform transform, Op left, Op right)
 
     @Override
     public Op2 copy(Op newLeft, Op newRight)
-    { return new OpDiff(newLeft, newRight); }
+    { return new OpAntiJoin(newLeft, newRight); }
 
     @Override
     public boolean equalTo(Op op2, NodeIsomorphismMap labelMap) {
-        if ( ! ( op2 instanceof OpDiff) ) return false;
+        if ( ! ( op2 instanceof OpAntiJoin) ) return false;
         return super.sameArgumentsAs((Op2)op2, labelMap);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpSemiJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpSemiJoin.java
new file mode 100644
index 00000000000..956297ec884
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/op/OpSemiJoin.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.algebra.op;
+
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.algebra.OpVisitor;
+import org.apache.jena.sparql.algebra.Transform;
+import org.apache.jena.sparql.sse.Tags;
+import org.apache.jena.sparql.util.NodeIsomorphismMap;
+
+public class OpSemiJoin extends Op2
+{
+    public static Op create(Op left, Op right)
+    {
+        return new OpSemiJoin(left, right);
+    }
+
+    private OpSemiJoin(Op left, Op right) { super(left, right); }
+
+    @Override
+    public String getName() { return Tags.tagSemiJoin; }
+
+    @Override
+    public Op apply(Transform transform, Op left, Op right)
+    { return transform.transform(this, left, right); }
+
+    @Override
+    public void visit(OpVisitor opVisitor) { opVisitor.visit(this); }
+
+    @Override
+    public Op2 copy(Op newLeft, Op newRight)
+    { return new OpSemiJoin(newLeft, newRight); }
+
+    @Override
+    public boolean equalTo(Op op2, NodeIsomorphismMap labelMap) {
+        if ( ! ( op2 instanceof OpSemiJoin) ) return false;
+        return super.sameArgumentsAs((Op2)op2, labelMap);
+    }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByType.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByType.java
index 2ec2fbb8020..62a2025afd3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByType.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByType.java
@@ -22,7 +22,8 @@
 import org.apache.jena.sparql.algebra.op.* ;
 
 /** A visitor helper that maps all visits to a few general ones.
- *  Does not visit expressions at all. */ 
+ *  Does not visit expressions at all.
+ */
 public interface OpVisitorByType extends OpVisitor
 {
     public void DUMMY() ;
@@ -30,11 +31,11 @@ public interface OpVisitorByType extends OpVisitor
     public void visitN(OpN op) ;
 
     public void visit2(Op2 op) ;
-    
+
     public void visit1(Op1 op) ;
-    
-    public void visit0(Op0 op) ;    
-    
+
+    public void visit0(Op0 op) ;
+
     public default void visitExt(OpExt op) {
         op.effectiveOp().visit(this);
     }
@@ -103,11 +104,6 @@ public default void visit(OpLeftJoin opLeftJoin) {
         visit2(opLeftJoin);
     }
 
-    @Override
-    public default void visit(OpDiff opDiff) {
-        visit2(opDiff);
-    }
-
     @Override
     public default void visit(OpMinus opMinus) {
         visit2(opMinus);
@@ -118,6 +114,22 @@ public default void visit(OpUnion opUnion) {
         visit2(opUnion);
     }
 
+    @Override
+    public default void visit(OpLateral opLateral) {
+        visit2(opLateral);
+    }
+
+    @Override
+    public default void visit(OpSemiJoin opSemiJoin) {
+        visit2(opSemiJoin);
+    }
+
+    @Override
+    public default void visit(OpAntiJoin opAntiJoin) {
+        visit2(opAntiJoin);
+    }
+
+
     @Override
     public default void visit(OpConditional opCond) {
         visit2(opCond);
@@ -177,7 +189,7 @@ public default void visit(OpGroup opGroup) {
     public default void visit(OpTopN opTop) {
         visit1(opTop);
     }
-    
+
     @Override
     public default void visit(OpAssign opAssign) {
         visit1(opAssign);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByTypeAndExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByTypeAndExpr.java
index bf3d3589646..99afca5eb29 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByTypeAndExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/walker/OpVisitorByTypeAndExpr.java
@@ -118,11 +118,6 @@ public default void visit(OpLeftJoin opLeftJoin) {
         visit2(opLeftJoin);
     }
 
-    @Override
-    public default void visit(OpDiff opDiff) {
-        visit2(opDiff);
-    }
-
     @Override
     public default void visit(OpMinus opMinus) {
         visit2(opMinus);
@@ -138,6 +133,16 @@ public default void visit(OpLateral opLateral) {
         visit2(opLateral);
     }
 
+    @Override
+    public default void visit(OpSemiJoin opSemiJoin) {
+        visit2(opSemiJoin);
+    }
+
+    @Override
+    public default void visit(OpAntiJoin opAntiJoin) {
+        visit2(opAntiJoin);
+    }
+
     @Override
     public default void visit(OpConditional opCond) {
         visit2(opCond);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
index 19cbadc2963..9277d8bd55c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/Substitute.java
@@ -162,7 +162,7 @@ public static Node substitute(Node n, Binding binding) {
             return null;
         if ( isNotNeeded(binding) )
             return n;
-        if ( ! n.isNodeTriple() )
+        if ( ! n.isTripleTerm() )
             return Var.lookup(binding::get, n);
         if ( n.isConcrete() )
             return n;
@@ -182,12 +182,12 @@ public static Node substitute(Node n, Binding binding) {
             return n;
 
         // Change. Create new.
-        return NodeFactory.createTripleNode(s1, p1, o1);
+        return NodeFactory.createTripleTerm(s1, p1, o1);
     }
 
     /** Substitute for a node that makes up a triple in a Node_Triple. Recursively. */
     private static Node subTripleTermNode(Node n, Binding binding) {
-        if ( n.isNodeTriple() ) {
+        if ( n.isTripleTerm() ) {
             if ( ! n.isConcrete() )
                 n = substitute(n, binding);
         } else if ( Var.isVar(n) ) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/Rename.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/Rename.java
index daad7e44f65..dc0b0c08a56 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/Rename.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/Rename.java
@@ -110,10 +110,10 @@ public static Node reverseVarRename(Node node) {
     }
 
     private static Node reverseVarRename(Node node, String varPrefix, boolean repeatedly) {
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple t1 = node.getTriple();
             Triple t2 = NodeTransformLib.transform(n->Rename.reverseVarRename(n, varPrefix, repeatedly), t1);
-            return Objects.equals(t1, t2) ? node : NodeFactory.createTripleNode(t2);
+            return Objects.equals(t1, t2) ? node : NodeFactory.createTripleTerm(t2);
         }
 
         if ( !Var.isVar(node) )
@@ -170,10 +170,10 @@ public RenameAnyVars(Collection<Var> constants) {
 
         @Override
         public final Node apply(Node node) {
-            if ( node.isNodeTriple() ) {
+            if ( node.isTripleTerm() ) {
                 Triple t1 = node.getTriple();
                 Triple t2 = NodeTransformLib.transform(this, t1);
-                return Objects.equals(t1, t2) ? node : NodeFactory.createTripleNode(t2);
+                return Objects.equals(t1, t2) ? node : NodeFactory.createTripleTerm(t2);
             } else if ( !Var.isVar(node) ) {
                 return node;
             }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetStream.java
index 1041102180f..3b6ba846c73 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetStream.java
@@ -49,7 +49,7 @@ public class ResultSetStream implements ResultSet
 
     /** Create a streaming ResultSet, with resources sharing a common Model */
     public static ResultSet create(List<String> resultVars, Model m, Iterator<Binding> iter) {
-        return new ResultSetStream(0, resultVars, m, iter);
+        return new ResultSetStream(resultVars, m, iter);
     }
 
     /** Create a {@code ResultSet} from a {@literal List<Var>} and an {@literal Iterator<Binding>}. */
@@ -57,7 +57,7 @@ public static ResultSet create(List<Var> resultVars, Iterator<Binding> iter) {
         return ResultSet.adapt(RowSetStream.create(resultVars, iter));
     }
 
-    protected ResultSetStream(int dummy, List<String> resultVars, Model m, Iterator<Binding> iter) {
+    protected ResultSetStream(List<String> resultVars, Model m, Iterator<Binding> iter) {
         this.queryExecutionIter = iter;
         this.resultVars = resultVars;
         this.currentQuerySolution = null;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
index 50a2b6a27c1..c614360e532 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2LoopOnLeft.java
@@ -24,59 +24,55 @@
 import org.apache.jena.sparql.engine.QueryIterator ;
 import org.apache.jena.sparql.engine.binding.Binding ;
 
-/** Binary operation done by looping on the left, and materializing the right - this is not streamed on the right
- * See also QueryIterRepeatApply */
+/**
+ * Binary operation done by looping on the left, and materializing the right - this
+ * is not streamed on the right See also QueryIterRepeatApply
+ */
 public abstract class QueryIter2LoopOnLeft extends QueryIter2
 {
-    Table tableRight ; 
-    Binding slot = null ;
-    
-    public QueryIter2LoopOnLeft(QueryIterator left, QueryIterator right, ExecutionContext qCxt)
-    {
-        super(left, right, qCxt) ;
-        
+    protected Table tableRight ;
+    private Binding slot = null ;
+
+    public QueryIter2LoopOnLeft(QueryIterator left, QueryIterator right, ExecutionContext qCxt) {
+        super(left, right, qCxt);
+
         // Materialized right.
-        tableRight = TableFactory.create(getRight()) ;
+        tableRight = TableFactory.create(getRight());
         getRight().close();
     }
 
     @Override
-    protected final void closeSubIterator()
-    { tableRight.close(); }
-    
+    protected final void closeSubIterator() {
+        getLeft().close();
+        tableRight.close(); }
+
     @Override
-    protected void requestSubCancel()
-    { }
-   
+    protected void requestSubCancel() {
+        getLeft().cancel();
+    }
+
     @Override
-    protected final boolean hasNextBinding()
-    {
+    protected final boolean hasNextBinding() {
         if ( slot != null )
-            return true ;
-        
-        while ( getLeft().hasNext() )
-        {
-            Binding bindingLeft = getLeft().nextBinding() ;
-            slot = getNextSlot(bindingLeft) ;
+            return true;
+        while (getLeft().hasNext()) {
+            Binding bindingLeft = getLeft().nextBinding();
+            slot = getNextSlot(bindingLeft);
             if ( slot != null )
-            {
-                slot = bindingLeft ; 
-                return true ;
-            }
+                return true;
         }
-        getLeft().close() ;
-        return false ;
+        getLeft().close();
+        return false;
     }
 
-    protected abstract Binding getNextSlot(Binding bindingLeft) ;
+    protected abstract Binding getNextSlot(Binding bindingLeft);
 
     @Override
-    protected final Binding moveToNextBinding()
-    {
-        if ( ! hasNextBinding() )
-            return null ;
-        Binding x = slot ;
-        slot = null ;
-        return x ;
+    protected final Binding moveToNextBinding() {
+        if ( !hasNextBinding() )
+            return null;
+        Binding x = slot;
+        slot = null;
+        return x;
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAddTripleTerm.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAddTripleTerm.java
index 114e73a2772..c329a3b2018 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAddTripleTerm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAddTripleTerm.java
@@ -57,7 +57,7 @@ private static Binding convert(Var var, Triple triple, Binding binding) {
         if ( ! matchedTriple.isConcrete() )
             // Not all concrete terms.
             return null;
-        Node nt = NodeFactory.createTripleNode(matchedTriple);
+        Node nt = NodeFactory.createTripleTerm(matchedTriple);
         // This makes it a filter. Syntactically not allowed but execution support
         // "AS ?t" for existing ?t where it must be the same RDF term.
         if ( binding.contains(var) ) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDiff.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDiff.java
deleted file mode 100644
index cea024ed02c..00000000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDiff.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.engine.iterator;
-
-import java.util.Iterator ;
-
-import org.apache.jena.sparql.algebra.Algebra ;
-import org.apache.jena.sparql.engine.ExecutionContext ;
-import org.apache.jena.sparql.engine.QueryIterator ;
-import org.apache.jena.sparql.engine.binding.Binding ;
-
-/** Diff by materializing the RHS - this is not streamed on the right */
-public class QueryIterDiff extends QueryIter2LoopOnLeft
-{
-    public QueryIterDiff(QueryIterator left, QueryIterator right, ExecutionContext qCxt)
-    {
-        super(left, right, qCxt) ;
-    }
-
-    @Override
-    protected Binding getNextSlot(Binding bindingLeft)
-    {
-        boolean accept = true ;
-
-        for ( Iterator<Binding> iter = tableRight.iterator(null) ; iter.hasNext() ; )
-        {
-            Binding bindingRight = iter.next() ;
-            if ( Algebra.compatible(bindingLeft, bindingRight) )
-            {
-                accept = false ;
-                break ;
-            }
-        }
-
-        if ( accept )
-            return bindingLeft ;
-        return null ;
-    }
-}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterHalfJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterHalfJoin.java
new file mode 100644
index 00000000000..48d111e6915
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterHalfJoin.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.engine.iterator;
+
+import java.util.Iterator;
+
+import org.apache.jena.sparql.algebra.Algebra;
+import org.apache.jena.sparql.engine.ExecutionContext;
+import org.apache.jena.sparql.engine.QueryIterator;
+import org.apache.jena.sparql.engine.binding.Binding;
+
+/** SemiJoin and AntiJoin */
+public class QueryIterHalfJoin extends QueryIter2LoopOnLeft {
+
+    public static QueryIterator semiJoin(QueryIterator left, QueryIterator right, ExecutionContext execCxt) {
+        return new QueryIterHalfJoin(HALF_JOIN.SEMI, left, right, execCxt);
+    }
+
+    public static QueryIterator antiJoin(QueryIterator left, QueryIterator right, ExecutionContext execCxt) {
+        return new QueryIterHalfJoin(HALF_JOIN.ANTI, left, right, execCxt);
+    }
+
+    private final HALF_JOIN halfJoin;
+
+    private QueryIterHalfJoin(HALF_JOIN halfJoin, QueryIterator left, QueryIterator right, ExecutionContext qCxt) {
+        super(left, right, qCxt);
+        this.halfJoin = halfJoin;
+    }
+
+    private enum HALF_JOIN {
+        SEMI {
+            @Override public Binding onOneMatch(Binding bindingLeft) { return bindingLeft; }
+            @Override public Binding onNoMatches(Binding bindingLeft) { return null; }
+        } ,
+        ANTI {
+            @Override public Binding onOneMatch(Binding bindingLeft) { return null; }
+            @Override public Binding onNoMatches(Binding bindingLeft) { return bindingLeft; }
+        }
+        ;
+        public abstract Binding onOneMatch(Binding bindingLeft);
+        public abstract Binding onNoMatches(Binding bindingLeft);
+    };
+
+    // If this is to become serious it needs improving - take the hash join code from QueryIterMinus.
+    @Override
+    protected Binding getNextSlot(Binding bindingLeft) {
+        boolean accept = true;
+        for ( Iterator<Binding> iter = tableRight.iterator(null) ; iter.hasNext() ; ) {
+            Binding bindingRight = iter.next();
+            boolean matches = Algebra.compatible(bindingLeft, bindingRight);
+            if ( matches )
+                return halfJoin.onOneMatch(bindingLeft);
+        }
+        return halfJoin.onNoMatches(bindingLeft);
+    }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/ExecutionDispatch.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/ExecutionDispatch.java
index 96974249939..f2eac4c9546 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/ExecutionDispatch.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/ExecutionDispatch.java
@@ -132,13 +132,6 @@ public void visit(OpLeftJoin opLeftJoin) {
         push(qIter);
     }
 
-    @Override
-    public void visit(OpDiff opDiff) {
-        QueryIterator input = pop();
-        QueryIterator qIter = opExecutor.execute(opDiff, input);
-        push(qIter);
-    }
-
     @Override
     public void visit(OpMinus opMinus) {
         QueryIterator input = pop();
@@ -160,6 +153,21 @@ public void visit(OpLateral opLateral) {
         push(qIter);
     }
 
+    @Override
+    public void visit(OpSemiJoin opSemiJoin) {
+        QueryIterator input = pop();
+        QueryIterator qIter = opExecutor.execute(opSemiJoin, input);
+        push(qIter);
+    }
+
+
+    @Override
+    public void visit(OpAntiJoin opAntiJoin) {
+        QueryIterator input = pop();
+        QueryIterator qIter = opExecutor.execute(opAntiJoin, input);
+        push(qIter);
+    }
+
     @Override
     public void visit(OpConditional opCondition) {
         QueryIterator input = pop();
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
index 9488b5e35e1..61523d4eb6e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/JoinClassifier.java
@@ -55,7 +55,8 @@ static public boolean isLinear(Op _left, Op _right) {
         if ( right instanceof OpExtend )    return false ;
         if ( right instanceof OpAssign )    return false ;
         if ( right instanceof OpGroup )     return false ;
-//        if ( right instanceof OpDiff )      return false ;
+//        if ( right instanceof OpSemiJoin )      return false ;
+//        if ( right instanceof OpAntiJoin )      return false ;
 //        if ( right instanceof OpMinus )     return false ;
 
         if ( right instanceof OpSlice )     return false ;
@@ -83,7 +84,8 @@ private static class UnsafeLinearOpException extends RuntimeException {
     }
     private static OpVisitor checkForUnsafeVisitor = new OpVisitorBase() {
         @Override public void visit(OpMinus opMinus) { throw new UnsafeLinearOpException(); }
-        @Override public void visit(OpDiff opDiff)   { throw new UnsafeLinearOpException(); }
+        @Override public void visit(OpSemiJoin opSemiJoin)   { throw new UnsafeLinearOpException(); }
+        @Override public void visit(OpAntiJoin opAntiJoin)   { throw new UnsafeLinearOpException(); }
     };
 
     private static boolean isSafeForLinear(Op op) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
index 8e015e7a9a0..25194fc1b6e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/OpExecutor.java
@@ -200,7 +200,7 @@ protected QueryIterator execute(OpJoin opJoin, QueryIterator input) {
         // the results.
 
         if ( false ) {
-            // If needed, applies to OpDiff and OpLeftJoin as well.
+            // If needed, applies to OpLeftJoin as well.
             List<Binding> a = all(input);
             QueryIterator qIter1 = QueryIterPlainWrapper.create(a.iterator(), execCxt);
             QueryIterator qIter2 = QueryIterPlainWrapper.create(a.iterator(), execCxt);
@@ -241,18 +241,26 @@ protected QueryIterator execute(OpLateral opLateral, QueryIterator input) {
         return qIter;
     }
 
+    protected QueryIterator execute(OpSemiJoin opSemiJoin, QueryIterator input) {
+        QueryIterator left = exec(opSemiJoin.getLeft(), input);
+        QueryIterator right = exec(opSemiJoin.getRight(), root());
+        QueryIterator qIter = QueryIterHalfJoin.semiJoin(left, right, execCxt);
+        return qIter;
+    }
+
+    protected QueryIterator execute(OpAntiJoin opAntiJoin, QueryIterator input) {
+        QueryIterator left = exec(opAntiJoin.getLeft(), input);
+        QueryIterator right = exec(opAntiJoin.getRight(), root());
+        QueryIterator qIter = QueryIterHalfJoin.antiJoin(left, right, execCxt);
+        return qIter;
+    }
+
     protected QueryIterator execute(OpConditional opCondition, QueryIterator input) {
         QueryIterator left = exec(opCondition.getLeft(), input);
         QueryIterator qIter = new QueryIterOptionalIndex(left, opCondition.getRight(), execCxt);
         return qIter;
     }
 
-    protected QueryIterator execute(OpDiff opDiff, QueryIterator input) {
-        QueryIterator left = exec(opDiff.getLeft(), input);
-        QueryIterator right = exec(opDiff.getRight(), root());
-        return new QueryIterDiff(left, right, execCxt);
-    }
-
     protected QueryIterator execute(OpMinus opMinus, QueryIterator input) {
         Op lhsOp = opMinus.getLeft();
         Op rhsOp = opMinus.getRight();
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
index 46d0f6dbc85..b0844fb529a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/VarFinder.java
@@ -205,15 +205,11 @@ public void visit(OpLeftJoin opLeftJoin) {
 
         @Override
         public void visit(OpMinus opMinus) {
-            mergeMinusDiff(opMinus.getLeft(), opMinus.getRight()) ;
+            mergeRightMask(opMinus.getLeft(), opMinus.getRight()) ;
         }
 
-        @Override
-        public void visit(OpDiff opDiff) {
-            mergeMinusDiff(opDiff.getLeft(), opDiff.getRight()) ;
-        }
-
-        private void mergeMinusDiff(Op left, Op right) {
+        // Operations whose RHS does not contribute to the variables in-scope (MINUS, SEMIJOIN, ANTIJOIN)
+        private void mergeRightMask(Op left, Op right) {
             mergeVars(left) ;
             VarUsageVisitor usage = VarUsageVisitor.apply(right);
             // Everything in the right side is really a filter.
@@ -225,6 +221,14 @@ private void mergeMinusDiff(Op left, Op right) {
             filterMentions.addAll(usage.assignMentions) ;
         }
 
+        @Override
+        public void visit(OpSemiJoin opSemiJoin)
+        { mergeRightMask(opSemiJoin.getLeft(), opSemiJoin.getRight()) ; }
+
+        @Override
+        public void visit(OpAntiJoin opAntiJoin)
+        { mergeRightMask(opAntiJoin.getLeft(), opAntiJoin.getRight()) ; }
+
         private static void combinefilterMentions(VarUsageVisitor usage, Set<Var> mentions) {
             for ( Var v : mentions ) {
                 if ( ! usage.defines.contains(v) )
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
index 05644f97bee..b1e67811e44 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/RX_PG.java
@@ -114,14 +114,14 @@ private static Pair<QueryIterator, Triple> preprocessForTripleTerms(QueryIterato
         Node o1 = null;
 
         // Recurse.
-        if ( s.isNodeTriple() ) {
+        if ( s.isTripleTerm() ) {
             Triple t2 = s.getTriple();
             Var var = varAlloc(execCxt).allocVar();
             Triple tripleTerm = Triple.create(t2.getSubject(), t2.getPredicate(), t2.getObject());
             chain = matchTripleStar(chain, var, tripleTerm, execCxt);
             s1 = var;
         }
-        if ( o.isNodeTriple() ) {
+        if ( o.isTripleTerm() ) {
             Triple t2 = o.getTriple();
             Var var = varAlloc(execCxt).allocVar();
             Triple tripleTerm = Triple.create(t2.getSubject(), t2.getPredicate(), t2.getObject());
@@ -167,9 +167,9 @@ private static QueryIterator matchData(QueryIterator chain, Triple pattern, Exec
      * Test whether a triple has an triple term as one of its components.
      */
     private static boolean tripleHasNodeTriple(Triple triple) {
-        return triple.getSubject().isNodeTriple()
+        return triple.getSubject().isTripleTerm()
                /*|| triple.getPredicate().isNodeTriple()*/
-               || triple.getObject().isNodeTriple();
+               || triple.getObject().isTripleTerm();
     }
 
     private static VarAlloc varAlloc(ExecutionContext execCxt) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
index fb753609e39..a4ff36cfaca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverLib.java
@@ -47,19 +47,19 @@ public static <T> Iterator<T> makeAbortable(Iterator<T> iter, List<Abortable> ki
      * Test whether a triple has an triple term as one of its components.
      */
     public static boolean tripleHasNodeTriple(Triple triple) {
-        return triple.getSubject().isNodeTriple()
+        return triple.getSubject().isTripleTerm()
                /*|| triple.getPredicate().isNodeTriple()*/
-               || triple.getObject().isNodeTriple();
+               || triple.getObject().isTripleTerm();
     }
 
     /**
      * Test whether a quad has an triple term as one of its components.
      */
     public static boolean quadHasNodeTriple(Quad quad) {
-        return quad.getSubject().isNodeTriple()
+        return quad.getSubject().isTripleTerm()
                // || triple.getPredicate().isNodeTriple()
                // || quad.getGraph().isNodeTriple()
-               || quad.getObject().isNodeTriple();
+               || quad.getObject().isTripleTerm();
     }
 
     /**
@@ -84,7 +84,7 @@ public static boolean quadHasEmbTripleWithVars(Quad quad) {
     }
 
     private static boolean isTripleTermWithVars(Node node) {
-        if ( ! node.isNodeTriple() )
+        if ( ! node.isTripleTerm() )
             return false;
         if ( node.getTriple().isConcrete() )
             return false;
@@ -105,7 +105,7 @@ public static Node nodeTopLevel(Node node) {
         // Public so TDB code can use it.
         if ( Var.isVar(node) )
             return Node.ANY;
-        if ( node.isNodeTriple() ) { //|| node.isNodeGraph() )
+        if ( node.isTripleTerm() ) { //|| node.isNodeGraph() )
             if ( ! node.getTriple().isConcrete() )
                 // Nested variables.
                 return Node.ANY;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
index 99e7f3369f5..1cf344d83a8 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX3.java
@@ -135,7 +135,7 @@ private static boolean match(BindingBuilder bb, Node nData, Node nPattern) {
         }
 
         // nPattern is <<>> with variables. Is the data a <<>>?
-        if ( !nData.isNodeTriple() )
+        if ( !nData.isTripleTerm() )
             return false;
 
         // nData is <<>>, nPattern is <<>>
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
index c3ed678af12..7c14490e286 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/SolverRX4.java
@@ -54,7 +54,7 @@ public static Iterator<Binding> rdfStarQuad(Iterator<Binding> chain, Node graphN
         // Should all work without this trap for plain RDF.
         if ( DATAPATH ) {
             if ( ! tripleHasEmbTripleWithVars(pattern) &&
-                    (graphName == null || ! graphName.isNodeTriple() ) )
+                    (graphName == null || ! graphName.isTripleTerm() ) )
                 // No variables inside <<>>
                 return matchDataQuad(chain, graphName, pattern, execCxt);
         }
@@ -154,7 +154,7 @@ private static boolean match(BindingBuilder bb, Node nData, Node nPattern) {
         }
 
         // nPattern is <<>> with variables. Is the data a <<>>?
-        if ( !nData.isNodeTriple() )
+        if ( !nData.isTripleTerm() )
             return false;
 
         // nData is <<>>, nPattern is <<>>
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
index 58e59fab66b..3f689444cff 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/solver/StageMatchTriple.java
@@ -60,7 +60,8 @@ private static Iterator<Binding> accessTriple(Binding binding, Graph graph, Trip
         Node o2 = tripleNode(o) ;
         // ExtendedIterator<Triple> graphIter = graph.find(s2, p2, o2) ;
         // Language tags.
-        ExtendedIterator<Triple> graphIter = G.findByLang(graph, s2, p2, o2);
+        //ExtendedIterator<Triple> graphIter = G.findByLang(graph, s2, p2, o2);
+        ExtendedIterator<Triple> graphIter = G.find(graph, s2, p2, o2);
         ExtendedIterator<Binding> iter = graphIter.mapWith( r -> mapper(resultsBuilder, s, p, o, r)).filterDrop(Objects::isNull);
         return iter;
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/Evaluator.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/Evaluator.java
index 201ce5a8922..ee6c890f50b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/Evaluator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/Evaluator.java
@@ -54,9 +54,12 @@ public interface Evaluator
     public Table diff(Table tableLeft, Table tableRight);
     public Table minus(Table left, Table right);
     public Table union(Table tableLeft, Table tableRight);
-    public Table lateral(Table left, Op right);
     public Table condition(Table left, Table right);
 
+    public Table lateral(Table left, Op right);
+    public Table semiJoin(Table left, Table right);
+    public Table antiJoin(Table left, Table right);
+
     public Table filter(ExprList expressions, Table tableLeft);
 
     public Table unit();
@@ -68,4 +71,5 @@ public interface Evaluator
     public Table distinct(Table table);
     public Table reduced(Table table);
     public Table slice(Table table, long start, long length);
+
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorDispatch.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorDispatch.java
index b459ce606ba..b313e74a84e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorDispatch.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorDispatch.java
@@ -151,19 +151,10 @@ public void visit(OpLeftJoin opLeftJoin) {
             System.out.println("NULL");
         }
 
-
         Table table = evaluator.leftJoin(left, right, opLeftJoin.getExprs());
         push(table);
     }
 
-    @Override
-    public void visit(OpDiff opDiff) {
-        Table left = eval(opDiff.getLeft());
-        Table right = eval(opDiff.getRight());
-        Table table = evaluator.diff(left, right);
-        push(table);
-    }
-
     @Override
     public void visit(OpMinus opMinus) {
         Table left = eval(opMinus.getLeft());
@@ -196,6 +187,22 @@ public void visit(OpLateral opLateral) {
         push(table);
     }
 
+    @Override
+    public void visit(OpSemiJoin opSemiJoin) {
+        Table left = eval(opSemiJoin.getLeft());
+        Table right = eval(opSemiJoin.getRight());
+        Table table = evaluator.semiJoin(left, right);
+        push(table);
+    }
+
+    @Override
+    public void visit(OpAntiJoin opAntiJoin) {
+        Table left = eval(opAntiJoin.getLeft());
+        Table right = eval(opAntiJoin.getRight());
+        Table table = evaluator.antiJoin(left, right);
+        push(table);
+    }
+
     @Override
     public void visit(OpFilter opFilter) {
         Table table = eval(opFilter.getSubOp());
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
index 5b1c3fb58bc..90746f06727 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
@@ -19,6 +19,7 @@
 package org.apache.jena.sparql.engine.ref;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.jena.atlas.lib.Lib;
@@ -189,6 +190,65 @@ public Table lateral(Table left, Op right) {
         return result;
     }
 
+    private enum HALF_JOIN {
+        SEMI {
+            @Override
+            public Binding onOneMatch(Binding bindingLeft) { return bindingLeft; }
+            @Override
+            public Binding onNoMatches(Binding bindingLeft) { return null; }
+        } ,
+        ANTI {
+            @Override
+            public Binding onOneMatch(Binding bindingLeft) { return null; }
+            @Override
+            public Binding onNoMatches(Binding bindingLeft) { return null; }
+        }
+        ;
+        public abstract Binding onOneMatch(Binding bindingLeft);
+        public abstract Binding onNoMatches(Binding bindingLeft);
+    };
+
+
+    @Override
+    public Table semiJoin(Table left, Table right) {
+        return halfJoin(HALF_JOIN.SEMI, left, right);
+    }
+
+    @Override
+    public Table antiJoin(Table left, Table right) {
+        return halfJoin(HALF_JOIN.ANTI, left, right);
+    }
+
+    // SemiJoin and AnitJoin
+    private Table halfJoin(HALF_JOIN halfJoin, Table left, Table right) {
+        if ( left.isEmpty() ) {
+            left.close();
+            return TableFactory.createEmpty();
+        }
+        TableN result = new TableN();
+
+        left.iterator(getExecContext()).forEachRemaining(bindingLeft->{
+            boolean hasMatch = false;
+            for ( Iterator<Binding> iterRight = right.rows(); iterRight.hasNext() ; ) {
+                Binding bindingRight = iterRight.next();
+                boolean matches = Algebra.compatible(bindingLeft, bindingRight);
+                if ( matches ) {
+                    hasMatch = true;
+                    if ( halfJoin == HALF_JOIN.SEMI )
+                        result.addBinding(bindingLeft);
+                    break;
+                }
+            }
+            if ( !hasMatch ) {
+                if ( halfJoin == HALF_JOIN.ANTI )
+                    result.addBinding(bindingLeft);
+            }
+        });
+        return result;
+    }
+
+
+
     @Override
     public Table list(Table table) {
         return table;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/RefEval.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/RefEval.java
index 83ddfd42563..2980f0c1bdb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/RefEval.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/RefEval.java
@@ -27,6 +27,7 @@
 import org.apache.jena.graph.Node;
 import org.apache.jena.query.ARQ;
 import org.apache.jena.sparql.ARQInternalErrorException;
+import org.apache.jena.sparql.algebra.Algebra;
 import org.apache.jena.sparql.algebra.Op;
 import org.apache.jena.sparql.algebra.Table;
 import org.apache.jena.sparql.algebra.TableFactory;
@@ -34,6 +35,7 @@
 import org.apache.jena.sparql.algebra.op.OpGraph;
 import org.apache.jena.sparql.algebra.op.OpQuadPattern;
 import org.apache.jena.sparql.algebra.table.TableEmpty;
+import org.apache.jena.sparql.algebra.table.TableN;
 import org.apache.jena.sparql.algebra.table.TableUnit;
 import org.apache.jena.sparql.core.BasicPattern;
 import org.apache.jena.sparql.core.DatasetGraph;
@@ -193,4 +195,62 @@ private static QueryIterator executeBGP(BasicPattern pattern, QueryIterator inpu
             qIter = new QueryIterDistinguishedVars(qIter, execCxt);
         return qIter;
     }
+
+    // SemiJoin And AntiJoin
+
+    private enum HALF_JOIN {
+        SEMI {
+            @Override
+            public Binding onOneMatch(Binding bindingLeft) { return bindingLeft; }
+            @Override
+            public Binding onNoMatches(Binding bindingLeft) { return null; }
+        } ,
+        ANTI {
+            @Override
+            public Binding onOneMatch(Binding bindingLeft) { return null; }
+            @Override
+            public Binding onNoMatches(Binding bindingLeft) { return null; }
+        }
+        ;
+        public abstract Binding onOneMatch(Binding bindingLeft);
+        public abstract Binding onNoMatches(Binding bindingLeft);
+    };
+
+
+    static Table semiJoin(Table left, Table right) {
+        return halfJoin(HALF_JOIN.SEMI, left, right);
+    }
+
+    static Table antiJoin(Table left, Table right) {
+        return halfJoin(HALF_JOIN.ANTI, left, right);
+    }
+
+    static Table halfJoin(HALF_JOIN halfJoin, Table left, Table right) {
+        if ( left.isEmpty() ) {
+            left.close();
+            return TableFactory.createEmpty();
+        }
+        TableN result = new TableN();
+        left.rows().forEachRemaining(bindingLeft->{
+            boolean hasMatch = false;
+            for ( Iterator<Binding> iterRight = right.rows(); iterRight.hasNext() ; ) {
+                Binding bindingRight = iterRight.next();
+                boolean matches = Algebra.compatible(bindingLeft, bindingRight);
+                if ( matches ) {
+                    hasMatch = true;
+                    Binding b = halfJoin.onOneMatch(bindingLeft);
+                    if ( b != null )
+                        result.addBinding(b);
+                    break;
+                }
+            }
+            if ( ! hasMatch ) {
+                Binding b = halfJoin.onNoMatches(bindingLeft);
+                if ( b != null )
+                    result.addBinding(b);
+            }
+        });
+        right.close();
+        return result;
+    }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
index f2a82bae69b..d8e97a5fa39 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/TableJoin.java
@@ -37,8 +37,9 @@
 import org.apache.jena.sparql.expr.Expr;
 import org.apache.jena.sparql.expr.ExprList;
 
-/** Table join - this only happens if the patterns can not be streamed.
- * This code is simple!
+/**
+ * Table join.
+ * This code is simple! Reference query engine.
  * Primarily for use in testing and also the reference query engine which is designed for simplicity, not performance.
  */
 public class TableJoin
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/exec/ResultSetAdapter.java b/jena-arq/src/main/java/org/apache/jena/sparql/exec/ResultSetAdapter.java
index 20ca0a3d557..6f62e14249f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/exec/ResultSetAdapter.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/exec/ResultSetAdapter.java
@@ -27,12 +27,12 @@ public class ResultSetAdapter extends ResultSetStream /*implements ResultSet*/ {
     private final RowSet rowSet;
 
     public ResultSetAdapter(RowSet rowSet) {
-        super(0, Var.varNames(rowSet.getResultVars()), null, rowSet);
+        super(Var.varNames(rowSet.getResultVars()), null, rowSet);
         this.rowSet = rowSet;
     }
 
     public ResultSetAdapter(RowSet rowSet, Model m) {
-        super(0, Var.varNames(rowSet.getResultVars()), m, rowSet);
+        super(Var.varNames(rowSet.getResultVars()), m, rowSet);
         this.rowSet = rowSet;
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLang.java
new file mode 100644
index 00000000000..d20bc71e805
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLang.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr;
+
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.sparql.sse.Tags;
+
+/**
+ * Does the argument have a language tag?
+ * It tests for a language tag for both {@code rdf:langString} and {@code rdf:dirLangString}.
+ */
+public class E_HasLang extends ExprFunction1 {
+    private static final String symbol = Tags.tagHasLang;
+
+    public E_HasLang(Expr expr) {
+        super(expr, symbol);
+    }
+
+    @Override
+    public NodeValue eval(NodeValue v) {
+        return NodeFunctions.hasLang(v);
+    }
+
+    @Override
+    public Expr copy(Expr expr) { return new E_HasLang(expr); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLangDir.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLangDir.java
new file mode 100644
index 00000000000..c7082fba505
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_HasLangDir.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr;
+
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.sparql.sse.Tags ;
+
+
+public class E_HasLangDir extends ExprFunction1
+{
+    private static final String symbol = Tags.tagHasLangDir;
+
+    public E_HasLangDir(Expr expr)
+    {
+        super(expr, symbol) ;
+    }
+
+    @Override
+    public NodeValue eval(NodeValue v) {
+        return NodeFunctions.hasLangDir(v);
+    }
+
+    @Override
+    public Expr copy(Expr expr) { return new E_HasLangDir(expr) ; }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsNumeric.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsNumeric.java
index 627d8c1cb6d..9e32b0583b6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsNumeric.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsNumeric.java
@@ -18,26 +18,24 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.sse.Tags ;
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.sparql.sse.Tags;
 
 
 public class E_IsNumeric extends ExprFunction1
 {
-    private static final String symbol = Tags.tagIsNumeric ;
+    private static final String symbol = Tags.tagIsNumeric;
 
     public E_IsNumeric(Expr expr)
     {
-        super(expr, symbol) ;
+        super(expr, symbol);
     }
-    
+
     @Override
-    public NodeValue eval(NodeValue v)
-    { 
-        if ( v.isNumber() )
-            return NodeValue.TRUE ;
-        return NodeValue.FALSE ;
+    public NodeValue eval(NodeValue v) {
+        return NodeFunctions.isNumeric(v);
     }
-    
+
     @Override
-    public Expr copy(Expr expr) { return new E_IsNumeric(expr) ; } 
+    public Expr copy(Expr expr) { return new E_IsNumeric(expr); }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsTriple.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsTriple.java
index 4f04a185ac0..9e73282eb09 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsTriple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_IsTriple.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.function.library.triple.EmbeddedTripleFunctions;
+import org.apache.jena.sparql.function.library.triple.TripleTermOps;
 import org.apache.jena.sparql.sse.Tags ;
 
 public class E_IsTriple extends ExprFunction1
@@ -31,7 +31,7 @@ public E_IsTriple(Expr expr)
     }
 
     @Override
-    public NodeValue eval(NodeValue nv) { return EmbeddedTripleFunctions.isTriple(nv); }
+    public NodeValue eval(NodeValue nv) { return TripleTermOps.isTriple(nv); }
 
     @Override
     public Expr copy(Expr expr) { return new E_IsTriple(expr) ; }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Lang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Lang.java
index 5295a295a7e..c9f5d50c730 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Lang.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_Lang.java
@@ -29,10 +29,10 @@ public E_Lang(Expr expr)
     {
         super(expr, symbol) ;
     }
-    
+
     @Override
     public NodeValue eval(NodeValue v) { return NodeFunctions.lang(v) ;  }
-    
+
     @Override
-    public Expr copy(Expr expr) { return new E_Lang(expr) ; } 
+    public Expr copy(Expr expr) { return new E_Lang(expr) ; }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangDir.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangDir.java
new file mode 100644
index 00000000000..7079674dc4c
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_LangDir.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr;
+
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.sparql.sse.Tags;
+
+public class E_LangDir extends ExprFunction1 {
+    private static final String symbol = Tags.tagLangDir;
+
+    public E_LangDir(Expr expr) {
+        super(expr, symbol);
+    }
+
+    @Override
+    public NodeValue eval(NodeValue v) {
+        return NodeFunctions.langdir(v);
+    }
+
+    @Override
+    public Expr copy(Expr expr) { return new E_LangDir(expr); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java
index c3acb6ab963..c71b8d34aa6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLang.java
@@ -21,23 +21,20 @@
 import org.apache.jena.sparql.expr.nodevalue.NodeFunctions ;
 import org.apache.jena.sparql.sse.Tags ;
 
-/** Create a literal from lexical form and language tag */ 
+/** Create a literal from lexical form and language tag */
 public class E_StrLang extends ExprFunction2
 {
-    private static final String symbol = Tags.tagStrLang ;
+    private static final String symbol = Tags.tagStrLang;
 
-    public E_StrLang(Expr expr1, Expr expr2)
-    {
-        super(expr1, expr2, symbol) ;
+    public E_StrLang(Expr expr1, Expr expr2) {
+        super(expr1, expr2, symbol);
     }
-    
+
     @Override
-    public NodeValue eval(NodeValue v1, NodeValue v2)
-    {
-        return NodeFunctions.strLang(v1, v2) ;
+    public NodeValue eval(NodeValue v1, NodeValue v2) {
+        return NodeFunctions.strLang(v1, v2);
     }
-    
-    
+
     @Override
-    public Expr copy(Expr e1, Expr e2) { return new E_StrLang(e1, e2) ; } 
+    public Expr copy(Expr e1, Expr e2) { return new E_StrLang(e1, e2); }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLangDir.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLangDir.java
new file mode 100644
index 00000000000..c07b2303b17
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_StrLangDir.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr;
+
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.sparql.sse.Tags;
+
+/** Create a literal from lexical form and language tag */
+public class E_StrLangDir extends ExprFunction3 {
+    private static final String symbol = Tags.tagStrLangDir;
+
+    public E_StrLangDir(Expr expr1, Expr expr2, Expr expr3) {
+        super(expr1, expr2, expr3, symbol);
+    }
+
+    @Override
+    public NodeValue eval(NodeValue v1, NodeValue v2, NodeValue v3) {
+        return NodeFunctions.strLangDir(v1, v2, v3);
+    }
+
+    @Override
+    public Expr copy(Expr e1, Expr e2, Expr e3) { return new E_StrLangDir(e1, e2, e3); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleFn.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleFn.java
index a440a8069fc..d544ba8f155 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleFn.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleFn.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.function.library.triple.EmbeddedTripleFunctions;
+import org.apache.jena.sparql.function.library.triple.TripleTermOps;
 import org.apache.jena.sparql.sse.Tags;
 
 public class E_TripleFn extends ExprFunction3 {
@@ -32,7 +32,7 @@ public E_TripleFn(Expr expr1, Expr expr2, Expr expr3) {
 
     @Override
     public NodeValue eval(NodeValue s, NodeValue p, NodeValue o) {
-        return EmbeddedTripleFunctions.fnTriple(s, p, o);
+        return TripleTermOps.fnTriple(s, p, o);
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleObject.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleObject.java
index 2f4e1ce5874..628955b59de 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleObject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleObject.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.function.library.triple.EmbeddedTripleFunctions;
+import org.apache.jena.sparql.function.library.triple.TripleTermOps;
 import org.apache.jena.sparql.sse.Tags ;
 
 public class E_TripleObject extends ExprFunction1
@@ -31,7 +31,7 @@ public E_TripleObject(Expr expr) {
 
     @Override
     public NodeValue eval(NodeValue nv) {
-        return EmbeddedTripleFunctions.tripleObject(nv);
+        return TripleTermOps.tripleObject(nv);
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TriplePredicate.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TriplePredicate.java
index a752b5700ec..fa54a66dc77 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TriplePredicate.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TriplePredicate.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.function.library.triple.EmbeddedTripleFunctions;
+import org.apache.jena.sparql.function.library.triple.TripleTermOps;
 import org.apache.jena.sparql.sse.Tags ;
 
 public class E_TriplePredicate extends ExprFunction1
@@ -31,7 +31,7 @@ public E_TriplePredicate(Expr expr) {
 
     @Override
     public NodeValue eval(NodeValue nv) {
-        return EmbeddedTripleFunctions.triplePredicate(nv);
+        return TripleTermOps.triplePredicate(nv);
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleSubject.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleSubject.java
index b3255003c96..bc32d1c79fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleSubject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_TripleSubject.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.sparql.expr;
 
-import org.apache.jena.sparql.function.library.triple.EmbeddedTripleFunctions;
+import org.apache.jena.sparql.function.library.triple.TripleTermOps;
 import org.apache.jena.sparql.sse.Tags ;
 
 public class E_TripleSubject extends ExprFunction1
@@ -31,7 +31,7 @@ public E_TripleSubject(Expr expr) {
 
     @Override
     public NodeValue eval(NodeValue nv) {
-        return EmbeddedTripleFunctions.tripleSubject(nv);
+        return TripleTermOps.tripleSubject(nv);
     }
 
     @Override
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction3.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction3.java
index 61eee256abd..e11afa86bbe 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction3.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprFunction3.java
@@ -86,7 +86,7 @@ final public NodeValue eval(Binding binding, FunctionEnv env) {
     /** Special form evaluation (example, don't eval the arguments first) */
     protected NodeValue evalSpecial(Binding binding, FunctionEnv env) { return null; }
 
-    public NodeValue eval(NodeValue x, NodeValue y, NodeValue z, FunctionEnv env) { return eval(x,y, z); }
+    public NodeValue eval(NodeValue x, NodeValue y, NodeValue z, FunctionEnv env) { return eval(x, y, z); }
 
     public abstract NodeValue eval(NodeValue x, NodeValue y, NodeValue z);
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
index 5e7b443212b..584643664e7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprLib.java
@@ -225,7 +225,7 @@ private static class ExprUnstable extends ExprException {
     public static Expr nodeToExpr(Node n) {
         if ( n.isVariable() )
             return new ExprVar(n) ;
-        if ( n.isNodeTriple() )
+        if ( n.isTripleTerm() )
             return new ExprTripleTerm(n);
         return NodeValue.makeNode(n) ;
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprTripleTerm.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprTripleTerm.java
index 7fa4d654667..878f810dc2a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprTripleTerm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprTripleTerm.java
@@ -40,7 +40,7 @@ public class ExprTripleTerm extends ExprNode {
     private final NodeValue nvTripleTerm;
 
     public ExprTripleTerm(Node node) {
-        if ( ! node.isNodeTriple() )
+        if ( ! node.isTripleTerm() )
             throw new ARQInternalErrorException("Not a triple term "+node) ;
         Node_Triple tripleTerm = (Node_Triple)node;
         this.tripleTerm = tripleTerm;
@@ -60,7 +60,7 @@ public ExprTripleTerm(Node node) {
         Triple t1 = tripleTerm.getTriple();
         Triple t2 = Substitute.substitute(t1, binding);
         if ( t2.isConcrete() ) {
-            Node tripleTerm2 = NodeFactory.createTripleNode(t2);
+            Node tripleTerm2 = NodeFactory.createTripleTerm(t2);
             return NodeValue.makeNode(tripleTerm2);
         }
         throw new VariableNotBoundException("Not concrete: triple "+tripleTerm) ;
@@ -85,7 +85,7 @@ public Expr copySubstitute(Binding binding) {
         Triple t2 = Substitute.substitute(tripleTerm.getTriple(), binding);
         if ( t2 == t1 )
             return this;
-        Node nodeTriple = NodeFactory.createTripleNode(t2);
+        Node nodeTriple = NodeFactory.createTripleTerm(t2);
         return new ExprTripleTerm(nodeTriple);
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
index 89f1902ae5a..a504d330cfb 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprVars.java
@@ -159,7 +159,7 @@ private void process(Node node) {
                 action.var(acc, Var.alloc(node));
                 return;
             }
-            if ( node.isNodeTriple() )
+            if ( node.isTripleTerm() )
                 process(node.getTriple());
         }
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index aaad999235f..55113b49e92 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -39,6 +39,7 @@
 import org.apache.jena.ext.xerces.DatatypeFactoryInst;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.impl.LiteralLabel;
 import org.apache.jena.sparql.ARQInternalErrorException;
 import org.apache.jena.sparql.SystemARQ;
@@ -188,6 +189,12 @@ public static NodeValue makeSortKey(String s, String collation)
     public static NodeValue makeLangString(String s, String lang)
     { return new NodeValueLang(s, lang); }
 
+    public static NodeValue makeDirLangString(String s, String lang, String langDir)
+    { return new NodeValueLangDir(s, lang, langDir); }
+
+    public static NodeValue makeDirLangString(String s, String lang, TextDirection textDirection)
+    { return new NodeValueLangDir(s, lang, textDirection); }
+
     public static NodeValue makeDecimal(BigDecimal d)
     { return new NodeValueDecimal(d); }
 
@@ -395,7 +402,7 @@ public boolean isBlank() {
 
     public boolean isTripleTerm() {
         forceToNode();
-        return node.isNodeTriple();
+        return node.isTripleTerm();
     }
 
     public ValueSpace getValueSpace() {
@@ -548,7 +555,8 @@ public boolean isDayTimeDuration()
 
     public boolean     getBoolean()     { raise(new ExprEvalTypeException("Not a boolean: "+this)); return false; }
     public String      getString()      { raise(new ExprEvalTypeException("Not a string: "+this)); return null; }
-    public String      getLang()        { raise(new ExprEvalTypeException("Not a string: "+this)); return null; }
+    public String      getLang()        { raise(new ExprEvalTypeException("Not a lang string: "+this)); return null; }
+    public String      getLangDir()     { raise(new ExprEvalTypeException("Not a langdir string: "+this)); return null; }
     public NodeValueSortKey getSortKey()        { raise(new ExprEvalTypeException("Not a sort key: "+this)); return null; }
 
     public BigInteger  getInteger()     { raise(new ExprEvalTypeException("Not an integer: "+this)); return null; }
@@ -582,6 +590,9 @@ private static NodeValue nodeToNodeValue(Node node) {
                 if ( NodeValue.VerboseWarnings )
                     Log.warn(NodeValue.class, "Lang tag and datatype (datatype ignored)");
             }
+            // RDF 1.2
+            if ( NodeUtils.hasLangDir(node) )
+                    return new NodeValueLangDir(node);
             return new NodeValueLang(node);
         }
 
@@ -616,9 +627,12 @@ private static NodeValue nodeToNodeValue(Node node) {
     // Returns null for unrecognized literal.
     private static NodeValue _setByValue(Node node) {
         // This should not happen.
-        // nodeToNodeValue should have dealt with it.
-        if ( NodeUtils.hasLang(node) )
+        // nodeToNodeValue should have been dealt with it.
+        if ( NodeUtils.hasLang(node) ) {
+            if ( NodeUtils.hasLangDir(node) )
+                return new NodeValueLangDir(node);
             return new NodeValueLang(node);
+        }
         LiteralLabel lit = node.getLiteral();
         RDFDatatype datatype = lit.getDatatype();
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
index 829aeb314e3..a81390a6988 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -32,6 +32,7 @@
 import org.apache.jena.datatypes.xsd.XSDDatatype ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.irix.IRIException;
 import org.apache.jena.irix.IRIs;
@@ -137,7 +138,7 @@ public static boolean sameTerm(Node node1, Node node2) {
                 return false;
             return node1.getLiteralLanguage().equalsIgnoreCase(node2.getLiteralLanguage());
         }
-        if ( node1.isNodeTriple() && node2.isNodeTriple() ) {
+        if ( node1.isTripleTerm() && node2.isTripleTerm() ) {
             return sameTriples(node1.getTriple(), node2.getTriple());
         }
         return false ;
@@ -179,7 +180,7 @@ public static boolean rdfTermEquals(Node n1, Node n2) {
             NodeValue.raise(new ExprEvalException("Mismatch in RDFterm-equals: " + n1 + ", " + n2)) ;
         }
 
-        if ( n1.isNodeTriple() && n2.isNodeTriple() ) {
+        if ( n1.isTripleTerm() && n2.isTripleTerm() ) {
             Triple t1 = n1.getTriple();
             Triple t2 = n2.getTriple();
             return rdfTermEquals(t1.getSubject(), t2.getSubject())
@@ -203,7 +204,7 @@ public static String str(Node node) {
             return node.getURI() ;
         if ( node.isBlank() && ! ARQ.isTrue(ARQ.strictSPARQL) )
              return RiotLib.blankNodeToIriString(node);
-        if ( node.isNodeTriple() && ! ARQ.isTrue(ARQ.strictSPARQL) ) {
+        if ( node.isTripleTerm() && ! ARQ.isTrue(ARQ.strictSPARQL) ) {
             Triple t = node.getTriple();
             // Recursion. Assumes no cycles!
             Function<Node, String> f = NodeFmtLib::strTTL;
@@ -211,7 +212,7 @@ public static String str(Node node) {
         }
         if ( node.isBlank() )
             NodeValue.raise(new ExprEvalException("Blank node: " + node)) ;
-        if ( node.isNodeTriple())
+        if ( node.isTripleTerm())
             NodeValue.raise(new ExprEvalException("Quoted triple: " + node)) ;
         NodeValue.raise(new ExprEvalException("Not valid for STR(): " + node)) ;
         return "[undef]" ;
@@ -246,8 +247,28 @@ public static Node datatype(Node node) {
         return NodeFactory.createURI(s) ;
     }
 
+    public static NodeValue isNumeric(NodeValue nv) {
+        return NodeValue.booleanReturn( nv.isNumber() );
+    }
+
     // -------- lang
 
+    public static NodeValue hasLang(NodeValue nv) {
+        return NodeValue.booleanReturn(hasLang(nv.asNode())) ;
+    }
+
+    public static boolean hasLang(Node node) {
+        return NodeUtils.hasLang(node);
+    }
+
+    public static NodeValue hasLangDir(NodeValue nv) {
+        return NodeValue.booleanReturn(hasLangDir(nv.asNode())) ;
+    }
+
+    public static boolean hasLangDir(Node node) {
+        return NodeUtils.hasLangDir(node);
+    }
+
     public static NodeValue lang(NodeValue nv) {
         if ( nv.isLangString() )
             return NodeValue.makeString(nv.getLang()) ;
@@ -263,10 +284,29 @@ public static String lang(Node node) {
 
         String s = node.getLiteralLanguage() ;
         if ( s == null )
-            s = "" ;
+            return "" ;
         return s ;
     }
 
+    public static NodeValue langdir(NodeValue nv) {
+        if ( nv.isLangString() )
+            return NodeValue.makeString(nv.getLangDir()) ;
+        if ( nv.isLiteral() )
+            return NodeValue.nvEmptyString ;
+        NodeValue.raise(new ExprTypeException("lang: Not a literal: " + nv.asQuotedString())) ;
+        return null;
+    }
+
+    public static String langdir(Node node) {
+        if ( !node.isLiteral() )
+            NodeValue.raise(new ExprTypeException("lang: Not a literal: " + FmtUtils.stringForNode(node))) ;
+
+        TextDirection textDir = node.getLiteralBaseDirection() ;
+        if ( textDir == null )
+            return "";
+        return textDir.direction();
+    }
+
     // -------- langMatches
     /** LANGMATCHES
      *
@@ -503,6 +543,26 @@ public static NodeValue strLang(NodeValue v1, NodeValue v2) {
         return NodeValue.makeLangString(lex, lang) ;
     }
 
+    public static NodeValue strLangDir(NodeValue v1, NodeValue v2, NodeValue v3) {
+        if ( !v1.isString() )
+            throw new ExprEvalException("Not a string (arg 1): " + v1) ;
+        if ( !v2.isString() )
+            throw new ExprEvalException("Not a string (arg 2): " + v2) ;
+        if ( !v2.isString() )
+            throw new ExprEvalException("Not a string (arg 3): " + v2) ;
+        String lex = v1.asString() ;
+        String lang = v2.asString() ;
+        if ( lang.isEmpty() )
+            throw new ExprEvalException("Empty lang tag") ;
+        String textDirStr = v3.asString();
+        if ( textDirStr.isEmpty() )
+            throw new ExprEvalException("Empty base direction") ;
+        TextDirection textDir = TextDirection.createOrNull(v3.asString());
+        if ( textDir == null )
+            throw new ExprEvalException("Invalid base direction: '"+textDirStr+"'") ;
+        return NodeValue.makeDirLangString(lex, lang, textDir);
+    }
+
     /** A duration, tided */
     public static Duration duration(int seconds) {
         if ( seconds == 0 )
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
index ffae70c9f24..ba192b1f0b4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java
@@ -18,62 +18,68 @@
 
 package org.apache.jena.sparql.expr.nodevalue;
 
-import java.util.Objects ;
+import java.util.Objects;
 
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.FmtUtils ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.util.FmtUtils;
 
-/** A NodeValue that is a lang tagged literal (rdf:langString).
+/**
+ * A NodeValue that is a lang tagged literal (rdf:langString).
  * A string + language tag which is not ""
  */
 public class NodeValueLang extends NodeValue {
-    // We could extends NodeValueString for the machinery
-    // but it get confusing as then it is a NodeValueString 
+    // We could extend NodeValueString for the machinery
+    // but it get confusing as then it is a NodeValueString
     // but isString is false.
-    
-    private final String string ; 
+
+    private final String string;
     private final String lang;
 
     public NodeValueLang(String lex, String lang) {
-        this.string = Objects.requireNonNull(lex) ;
-        this.lang = Objects.requireNonNull(lang) ;
+        this.string = Objects.requireNonNull(lex);
+        this.lang = Objects.requireNonNull(lang);
         if ( lang.isEmpty() )
-            throw new IllegalArgumentException("lang is the empty string") ;
+            throw new IllegalArgumentException("lang is the empty string");
     }
-    
+
     public NodeValueLang(Node n) {
-        super(Objects.requireNonNull(n)) ;
-        this.string = n.getLiteralLexicalForm() ;
-        this.lang = n.getLiteralLanguage() ;
+        super(Objects.requireNonNull(n));
+        this.string = n.getLiteralLexicalForm();
+        this.lang = n.getLiteralLanguage();
+        TextDirection textDir = n.getLiteralBaseDirection();
     }
 
     @Override
     public boolean isLangString() {
         return true;
     }
-    
+
+    @Override
+    public String getString()   { return string; }
+
     @Override
-    public String getString()   { return string ; }
+    public String getLang()     { return lang; }
 
     @Override
-    public String getLang()     { return lang ; }
-    
+    public String getLangDir()  { return ""; }
+
     @Override
-    public String asString()    { return string ; }
-    
+    public String asString()    { return string; }
+
     @Override
     protected Node makeNode()
-    { return NodeFactory.createLiteralLang(string, lang) ; }
-    
+    { return NodeFactory.createLiteralLang(string, lang); }
+
     @Override
-    public String toString() { 
+    public String toString() {
         if ( getNode() != null )
-            return FmtUtils.stringForNode(getNode()) ;
-        return "'"+getString()+"'@"+lang  ;
+            return FmtUtils.stringForNode(getNode());
+        return "'"+getString()+"'@"+lang ;
     }
-    
+
     @Override
-    public void visit(NodeValueVisitor visitor) { visitor.visit(this) ; }
+    public void visit(NodeValueVisitor visitor) { visitor.visit(this); }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java
new file mode 100644
index 00000000000..f73b529ef11
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.expr.nodevalue;
+
+import java.util.Objects;
+
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.util.FmtUtils;
+
+/**
+ * A NodeValue that is a lang tagged literal with base direction (rdf:dirLangString).
+ * A string + language tag which is not "" + base direction which is "ltr" or "rtl".
+ */
+public class NodeValueLangDir extends NodeValue {
+    // We could extend NodeValueString for the machinery
+    // but it get confusing as then it is a NodeValueString
+    // but isString is false.
+
+    private final String string;
+    private final String lang;
+    private final TextDirection textDir;
+
+    public NodeValueLangDir(String lex, String lang, String textDirStr) {
+        this.string = Objects.requireNonNull(lex);
+        this.lang = Objects.requireNonNull(lang);
+        if ( lang.isEmpty() )
+            throw new IllegalArgumentException("lang is the empty string");
+        Objects.requireNonNull(textDirStr);
+        this.textDir = TextDirection.createOrNull(textDirStr);
+        if ( textDir == null )
+            throw new IllegalArgumentException("base direction is not valid : '"+textDirStr+"'");
+    }
+
+    public NodeValueLangDir(String lex, String lang, TextDirection textDir) {
+        this.string = Objects.requireNonNull(lex);
+        this.lang = Objects.requireNonNull(lang);
+        if ( lang.isEmpty() )
+            throw new IllegalArgumentException("lang is the empty string");
+        this.textDir = Objects.requireNonNull(textDir);
+    }
+
+    public NodeValueLangDir(Node n) {
+        super(Objects.requireNonNull(n));
+        this.string = n.getLiteralLexicalForm();
+        this.lang = n.getLiteralLanguage();
+        this.textDir = n.getLiteralBaseDirection();
+    }
+
+    @Override
+    public boolean isLangString() {
+        return true;
+    }
+
+    @Override
+    public String getString()   { return string; }
+
+    @Override
+    public String getLang()     { return lang; }
+
+    @Override
+    public String getLangDir()  { return textDir.direction(); }
+
+    @Override
+    public String asString()    { return string; }
+
+    @Override
+    protected Node makeNode()
+    { return NodeFactory.createLiteralDirLang(string, lang, textDir); }
+
+    @Override
+    public String toString() {
+        if ( getNode() != null )
+            return FmtUtils.stringForNode(getNode());
+        return "'"+getString()+"'@"+lang+"--"+textDir.direction() ;
+    }
+
+    @Override
+    public void visit(NodeValueVisitor visitor) { visitor.visit(this); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueVisitor.java
index c830ffb6ac0..8a2143968c9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueVisitor.java
@@ -29,6 +29,7 @@ public interface NodeValueVisitor
     public void visit(NodeValueInteger nv) ;
     public void visit(NodeValueNode nv) ;
     public void visit(NodeValueLang nv) ;
+    public void visit(NodeValueLangDir nv) ;
     public void visit(NodeValueString nv) ;
     public void visit(NodeValueSortKey nv) ;
     public void visit(NodeValueDateTime nv) ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java
index ae62a122f9b..29aa5a9e71d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionEnvBase.java
@@ -25,7 +25,6 @@
 import org.apache.jena.sparql.util.Context ;
 
 /** Environment passed to functions -- see also {@link org.apache.jena.sparql.engine.ExecutionContext} */
-
 public class FunctionEnvBase implements FunctionEnv
 {
     private Context context ;
@@ -34,11 +33,11 @@ public class FunctionEnvBase implements FunctionEnv
     private ExecutionContext execContext = null ;
 
     public FunctionEnvBase() { this(ARQ.getContext(), null, null) ; }
-    
+
     public FunctionEnvBase(Context context) { this ( context, null, null) ; }
-    
+
     public FunctionEnvBase(ExecutionContext execCxt)
-    { 
+    {
         this(execCxt.getContext(), execCxt.getActiveGraph(), execCxt.getDataset()) ;
         execContext = execCxt ;
     }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/IsTripleTerm.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/IsTripleTerm.java
index 7d506ec02dd..2a14e235da5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/IsTripleTerm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/IsTripleTerm.java
@@ -28,6 +28,6 @@ public IsTripleTerm() {}
 
     @Override
     public NodeValue exec(NodeValue nv) {
-        return EmbeddedTripleFunctions.isTriple(nv);
+        return TripleTermOps.isTriple(nv);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleObject.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleObject.java
index b4597b4ca2d..511d42b1ee9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleObject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleObject.java
@@ -31,6 +31,6 @@ public TripleObject() {}
 
     @Override
     public NodeValue exec(NodeValue nv) {
-        return EmbeddedTripleFunctions.tripleObject(nv);
+        return TripleTermOps.tripleObject(nv);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TriplePredicate.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TriplePredicate.java
index 27fad833a71..5b9e89ee7b7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TriplePredicate.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TriplePredicate.java
@@ -31,6 +31,6 @@ public TriplePredicate() {}
 
     @Override
     public NodeValue exec(NodeValue nv) {
-        return EmbeddedTripleFunctions.triplePredicate(nv);
+        return TripleTermOps.triplePredicate(nv);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleSubject.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleSubject.java
index 0afe9047977..9d12f22074d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleSubject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleSubject.java
@@ -31,6 +31,6 @@ public TripleSubject() {}
 
     @Override
     public NodeValue exec(NodeValue nv) {
-        return EmbeddedTripleFunctions.tripleSubject(nv);
+        return TripleTermOps.tripleSubject(nv);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTerm.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTerm.java
index 827b3b75e8b..488a80be22a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTerm.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTerm.java
@@ -32,6 +32,6 @@ public TripleTerm() {}
 
     @Override
     public NodeValue exec(NodeValue nv1, NodeValue nv2, NodeValue nv3) {
-        return EmbeddedTripleFunctions.fnTriple(nv1, nv2, nv3);
+        return TripleTermOps.fnTriple(nv1, nv2, nv3);
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/EmbeddedTripleFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTermOps.java
similarity index 93%
rename from jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/EmbeddedTripleFunctions.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTermOps.java
index 0cb5a844923..a3e0bffe4c7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/EmbeddedTripleFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/triple/TripleTermOps.java
@@ -26,7 +26,7 @@
 import org.apache.jena.sparql.expr.ExprEvalException;
 import org.apache.jena.sparql.expr.NodeValue;
 
-public class EmbeddedTripleFunctions {
+public class TripleTermOps {
     /**
      * Create a triple term.
      * Throws {@link ExprEvalException} if the predicate argument is not a URI.
@@ -37,18 +37,18 @@ public static NodeValue fnTriple(NodeValue nv1, NodeValue nv2, NodeValue nv3) {
         if ( ! p.isURI() )
             throw new ExprEvalException("triple: Predicate not a URI: "+nv2);
         Node o = nv3.asNode();
-        Node t = NodeFactory.createTripleNode(s, p, o);
+        Node t = NodeFactory.createTripleTerm(s, p, o);
         return NodeValue.makeNode(t);
     }
 
     /** Test whether a {@link NodeValue} is an triple term. */
     public static NodeValue isTriple(NodeValue nv) {
-        return NodeValue.booleanReturn(nv.asNode().isNodeTriple());
+        return NodeValue.booleanReturn(nv.asNode().isTripleTerm());
     }
 
     private static NodeValue tripleGetter(String name, NodeValue nv, Function<Triple, Node> accessor) {
         Node n = nv.asNode();
-        if ( ! n.isNodeTriple() )
+        if ( ! n.isTripleTerm() )
             throw new ExprEvalException(name+": Not a triple term: "+nv);
         Triple t = n.getTriple();
         Node x = accessor.apply(t);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
index c34a443f099..847664c172e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
@@ -46,24 +46,24 @@ private static Node uri(String uriStr) {
     public static final Node nodeTen       = literal("10", XSDDatatype.XSDinteger);
     public static final Node nodeMinusOne  = literal("-1", XSDDatatype.XSDinteger);
     public static final Node emptyString   = NodeFactory.createLiteralString("");
-    public static final Node TRUE = NodeConst.nodeTrue;
-    public static final Node FALSE = NodeConst.nodeFalse;
+    public static final Node TRUE          = NodeConst.nodeTrue;
+    public static final Node FALSE         = NodeConst.nodeFalse;
 
     // It should be safe to use RDF.Nodes.
-    // Fallback code "just in case"
-    public static final Node nodeRDFType   = RDF.Nodes.type;  // uri(RDF.uri+"type")
-    public static final Node nodeFirst     = RDF.Nodes.first; // uri(RDF.uri+"first")
-    public static final Node nodeRest      = RDF.Nodes.rest;  // uri(RDF.uri+"rest")
-    public static final Node nodeNil       = RDF.Nodes.nil;   // uri(RDF.uri+"nil")
+    // Code 'uri(RDF.uri+"type")' as fallback
+    public static final Node nodeRDFType   = RDF.Nodes.type;
+    public static final Node nodeFirst     = RDF.Nodes.first;
+    public static final Node nodeRest      = RDF.Nodes.rest;
+    public static final Node nodeReifies   = RDF.Nodes.reifies;
+    public static final Node nodeNil       = RDF.Nodes.nil;
     public static final Node nodeANY       = Node.ANY;
 
-
     public static final Node nodeOwlImports       = OWL.imports.asNode();   // uri("http://www.w3.org/2002/07/owl#imports")
     public static final Node nodeOwlOntology      = OWL.Ontology.asNode();  // uri("http://www.w3.org/2002/07/owl#Ontology")
     public static final Node nodeOwlSameAs        = OWL.sameAs.asNode();    // uri("http://www.w3.org/2002/07/owl#sameAs")
     public static final Node rdfLangString        = RDF.Nodes.langString;
     public static final RDFDatatype dtLangString  = RDF.dtLangString;
-    
+
     public static Literal mTRUE = ResourceFactory.createTypedLiteral(true);
     public static Literal mFALSE = ResourceFactory.createTypedLiteral(false);
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java
index e1dae3eb6d5..006c9f8fda1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/QueryParserBase.java
@@ -30,6 +30,7 @@
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple;
 import org.apache.jena.irix.IRIException;
 import org.apache.jena.irix.IRIx;
@@ -56,21 +57,22 @@
 import org.slf4j.LoggerFactory;
 
 /** Base class parsers, mainly SPARQL related */
-public class QueryParserBase
-{
+public class QueryParserBase {
     // NodeConst
-    protected final Node XSD_TRUE       = NodeConst.nodeTrue;
-    protected final Node XSD_FALSE      = NodeConst.nodeFalse;
+    protected final Node XSD_TRUE = NodeConst.nodeTrue;
+    protected final Node XSD_FALSE = NodeConst.nodeFalse;
 
-    protected final Node nRDFtype       = NodeConst.nodeRDFType;
+    protected final Node nRDFtype = NodeConst.nodeRDFType;
 
-    protected final Node nRDFnil        = NodeConst.nodeNil;
-    protected final Node nRDFfirst      = NodeConst.nodeFirst;
-    protected final Node nRDFrest       = NodeConst.nodeRest;
+    protected final Node nRDFnil = NodeConst.nodeNil;
+    protected final Node nRDFfirst = NodeConst.nodeFirst;
+    protected final Node nRDFrest = NodeConst.nodeRest;
 
-    protected final Node nRDFsubject    = RDF.Nodes.subject;
-    protected final Node nRDFpredicate  = RDF.Nodes.predicate;
-    protected final Node nRDFobject     = RDF.Nodes.object;
+    protected final Node nRDFsubject = RDF.Nodes.subject;
+    protected final Node nRDFpredicate = RDF.Nodes.predicate;
+    protected final Node nRDFobject = RDF.Nodes.object;
+
+    protected final Node nRDFreifies = RDF.Nodes.reifies;
 
     // ----
     // Graph patterns, true; in templates, false.
@@ -88,7 +90,7 @@ public class QueryParserBase
     // This is the map used allocate blank node labels during parsing.
     // 1/ It is different between CONSTRUCT and the query pattern
     // 2/ Each BasicGraphPattern is a scope for blank node labels so each
-    //    BGP causes the map to be cleared at the start of the BGP
+    // BGP causes the map to be cleared at the start of the BGP
 
     protected LabelToNodeMap activeLabelMap = anonVarLabels;
     protected Set<String> previousLabels = new HashSet<>();
@@ -96,16 +98,21 @@ public class QueryParserBase
     // Aggregates are only allowed in places where grouping can happen.
     // e.g. SELECT clause but not a FILTER.
     private boolean allowAggregatesInExpressions = false;
-    private int     aggregateDepth               = 0;
+    private int aggregateDepth = 0;
 
-    //LabelToNodeMap listLabelMap = new LabelToNodeMap(true, new VarAlloc("L"));
+    // LabelToNodeMap listLabelMap = new LabelToNodeMap(true, new VarAlloc("L"));
     // ----
 
     public QueryParserBase() {}
 
     protected Prologue prologue;
-    public void setPrologue(Prologue prologue) { this.prologue = prologue; }
-    public Prologue getPrologue() { return prologue; }
+    public void setPrologue(Prologue prologue) {
+        this.prologue = prologue;
+    }
+
+    public Prologue getPrologue() {
+        return prologue;
+    }
 
     protected void setBase(String iriStr, int line, int column) {
         if ( isBNodeIRI(iriStr) )
@@ -116,7 +123,7 @@ protected void setBase(String iriStr, int line, int column) {
 
     protected void setPrefix(String prefix, String uriStr, int line, int column) {
         // Should have happen in the parser because this step is "token to prefix".
-        //prefix = fixupPrefix(prefix, line, column);
+        // prefix = fixupPrefix(prefix, line, column);
         getPrologue().setPrefix(prefix, uriStr);
     }
 
@@ -124,7 +131,9 @@ protected void setInConstructTemplate(boolean b) {
         setBNodesAreVariables(!b);
     }
 
-    protected boolean getBNodesAreVariables()   { return bNodesAreVariables; }
+    protected boolean getBNodesAreVariables() {
+        return bNodesAreVariables;
+    }
 
     protected void setBNodesAreVariables(boolean bNodesAreVariables) {
         this.bNodesAreVariables = bNodesAreVariables;
@@ -134,7 +143,9 @@ protected void setBNodesAreVariables(boolean bNodesAreVariables) {
             activeLabelMap = bNodeLabels;
     }
 
-    protected boolean getBNodesAreAllowed()   { return bNodesAreAllowed; }
+    protected boolean getBNodesAreAllowed() {
+        return bNodesAreAllowed;
+    }
 
     protected void setBNodesAreAllowed(boolean bNodesAreAllowed) {
         this.bNodesAreAllowed = bNodesAreAllowed;
@@ -149,9 +160,17 @@ protected void setAllowAggregatesInExpressions(boolean allowAggregatesInExpressi
     }
 
     // Tracking for nested aggregates.
-    protected void startAggregate()   { aggregateDepth++; }
-    protected int getAggregateDepth() { return aggregateDepth; }
-    protected void finishAggregate()  { aggregateDepth--; }
+    protected void startAggregate() {
+        aggregateDepth++;
+    }
+
+    protected int getAggregateDepth() {
+        return aggregateDepth;
+    }
+
+    protected void finishAggregate() {
+        aggregateDepth--;
+    }
 
     protected Element compressGroupOfOneGroup(ElementGroup elg) {
         // remove group of one group.
@@ -190,7 +209,7 @@ protected Node stripSign(Node node) {
     }
 
     protected void checkString(String string, int line, int column) {
-        for ( int i = 0; i < string.length(); i++ ) {
+        for ( int i = 0 ; i < string.length() ; i++ ) {
             // Not "codePointAt" which does surrogate processing.
             char ch = string.charAt(i);
             // Check surrogate pairs are pairs.
@@ -199,7 +218,7 @@ protected void checkString(String string, int line, int column) {
                 if ( i == string.length() )
                     throw new QueryParseException("Bad surrogate pair (end of string)", line, column);
                 char ch1 = string.charAt(i);
-                if ( ! Character.isLowSurrogate(ch1) ) {
+                if ( !Character.isLowSurrogate(ch1) ) {
                     throw new QueryParseException("Bad surrogate pair (high surrogate not followed by low surrogate)", line, column);
                 }
             } else if ( Character.isLowSurrogate(ch) ) {
@@ -208,20 +227,81 @@ protected void checkString(String string, int line, int column) {
         }
     }
 
-    protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
+    // ---- Literals
+    // Strings, lang strings, dirlang strings and datatyped literals.
+
+    protected Node createLiteralString(String lexicalForm, int line, int column) {
+        return NodeFactory.createLiteralString(lexicalForm);
+    }
+
+    protected Node createLiteralDT(String lexicalForm, String datatypeURI, int line, int column) {
+        // Can't have type and lang tag in parsing.
+        return createLiteralAny(lexicalForm, null, null, datatypeURI, line, column);
+    }
+
+    protected Node createLiteralLang(String lexicalForm, String langTagDir, int line, int column) {
+        // Can't have type and lang tag in parsing.
+        return createLiteralAny(lexicalForm, langTagDir, null, null, line, column);
+    }
+
+    /**
+     * Create a literal, given all possible component parts.
+     */
+    private Node createLiteralAny(String lexicalForm, String langTag, String textDirStr, String datatypeURI, int line, int column) {
         Node n = null;
         // Can't have type and lang tag in parsing.
         if ( datatypeURI != null ) {
+            if ( langTag != null || textDirStr != null )
+                throw new ARQInternalErrorException("Datatype with lang/langDir");
             RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI);
             n = NodeFactory.createLiteralDT(lexicalForm, dType);
-        } else if ( langTag != null && !langTag.isEmpty() )
-            n = NodeFactory.createLiteralLang(lexicalForm, langTag);
-        else
-            n = NodeFactory.createLiteralString(lexicalForm);
-        return n;
+            return n;
+        }
+
+        // datatypeURI is null
+        if ( langTag == null && textDirStr == null )
+            return NodeFactory.createLiteralString(lexicalForm);
+
+         // Strip '@'
+        langTag = langTag.substring(1);
+
+        // See if we split langTag into language tag and base direction.
+        String textDirStr2 = textDirStr;
+        String langTag2 = langTag;
+        if ( textDirStr == null ) {
+            int idx = langTag.indexOf("--");
+            if ( idx >= 0 ) {
+                textDirStr2 = langTag.substring(idx+2);
+                langTag2 = langTag.substring(0, idx);
+            }
+        }
+
+        if ( langTag2 != null && textDirStr2 != null ) {
+            if ( ! TextDirection.isValid(textDirStr2) )
+                throw new QueryParseException("Illegal base direction: '"+textDirStr2+"'", line, column);
+            return NodeFactory.createLiteralDirLang(lexicalForm, langTag2, textDirStr2);
+        }
+        // langTag != null, textDirStr == null.
+        return NodeFactory.createLiteralLang(lexicalForm, langTag2);
     }
 
-    protected long integerValue(String s) {
+//     protected String langFromToken(String image) {
+//         int idx = image.indexOf("--");
+//         if ( idx < 0 )
+//             // No direction; remove @
+//             return image.substring(1);
+//         return image.substring(1, idx);
+//     }
+//
+//     protected String dirFromToken(String image) {
+//         int idx = image.indexOf("--");
+//         if ( idx < 0 )
+//             return null;
+//         // Not checked for value
+//         return image.substring(idx+2);
+// 	}
+
+	protected long integerValue(String s) {
         try {
             if ( s.startsWith("+") )
                 s = s.substring(1);
@@ -231,14 +311,12 @@ protected long integerValue(String s) {
                 return Long.parseLong(s, 16);
             }
             return Long.parseLong(s);
-        }
-        catch (NumberFormatException ex) {
+        } catch (NumberFormatException ex) {
             try {
                 // Possible too large for a long.
                 BigInteger integer = new BigInteger(s);
                 throwParseException("Number '" + s + "' is a valid number but can't not be stored in a long");
-            }
-            catch (NumberFormatException ex2) {}
+            } catch (NumberFormatException ex2) {}
             throw new QueryParseException(ex, -1, -1);
         }
     }
@@ -274,6 +352,10 @@ protected Var createVariable(String s, int line, int column) {
         return Var.alloc(s);
     }
 
+    protected Node createTripleTerm(Node s, Node p, Node o, int line, int column) {
+        return NodeFactory.createTripleTerm(s, p, o);
+    }
+
     // ---- IRIs and Nodes
 
     protected String resolveQuotedIRI(String iriStr, int line, int column) {
@@ -309,7 +391,7 @@ private IRIx resolveIRIx(String iriStr, long line, long col) {
         try {
             IRIx resolvedIRIx = getPrologue().getBase().resolve(iriStr);
             return resolvedIRIx;
-        } catch (RelativeIRIException ex ) {
+        } catch (RelativeIRIException ex) {
             errorHandler.error("Relative IRI: " + iriStr, line, col);
             return IRIx.createAny(iriStr);
         } catch (IRIException ex) {
@@ -358,17 +440,17 @@ protected boolean isBNodeIRI(String iri) {
     // A BasicGraphPattern is any sequence of TripleBlocks, separated by filters,
     // but not by other graph patterns.
 
-    protected void startBasicGraphPattern()
-    { activeLabelMap.clear(); }
+    protected void startBasicGraphPattern() {
+        activeLabelMap.clear();
+    }
 
-    protected void endBasicGraphPattern()
-    { previousLabels.addAll(activeLabelMap.getLabels()); }
+    protected void endBasicGraphPattern() {
+        previousLabels.addAll(activeLabelMap.getLabels());
+    }
 
-    protected void startTriplesBlock()
-    { }
+    protected void startTriplesBlock() {}
 
-    protected void endTriplesBlock()
-    { }
+    protected void endTriplesBlock() {}
 
     // On entry to a new group, the current BGP is ended.
     protected void startGroup(ElementGroup elg) {
@@ -383,15 +465,17 @@ protected void endGroup(ElementGroup elg) {
     // --------
 
     protected void checkConcrete(Node n, int line, int column) {
-        if ( ! n.isConcrete() )
-            throwParseException("Term is not concrete: "+n, line, column);
+        if ( !n.isConcrete() )
+            throwParseException("Term is not concrete: " + n, line, column);
     }
 
     // BNode from a list
-//    protected Node createListNode()
-//    { return listLabelMap.allocNode(); }
+// protected Node createListNode()
+// { return listLabelMap.allocNode(); }
 
-    protected Node createListNode(int line, int column) { return createBNode(line, column); }
+    protected Node createListNode(int line, int column) {
+        return createBNode(line, column);
+    }
 
     // Unlabelled bNode.
     protected Node createBNode(int line, int column) {
@@ -411,19 +495,15 @@ protected Node createBNode(String label, int line, int column) {
         return activeLabelMap.asNode(label);
     }
 
-    protected Node preConditionAnnotation(Node s, Node p, Path path, Node o, int line, int column) {
+    protected Node preConditionReifier(Node s, Node p, Path path, Node o, int line, int column) {
         if ( p != null )
             return p;
         if ( path instanceof P_Link )
             return ((P_Link)path).getNode();
-        throwParseException("Only simple paths allowed with annotation syntax", line, column);
+        throwParseException("Only simple paths allowed with reifier syntax", line, column);
         return null;
     }
 
-    protected Node createQuotedTriple(Node s, Node p, Node o, int line, int column) {
-        return NodeFactory.createTripleNode(s, p, o);
-    }
-
     protected Expr createExprExists(Element element) {
         return new E_Exists(element);
     }
@@ -477,15 +557,34 @@ protected void insert(TripleCollector target, ElementPathBlock source) {
         }
     }
 
-    protected Expr asExpr(Node n) {
-        return ExprLib.nodeToExpr(n);
+    protected Node insertTripleReifier(TripleCollector acc, Node reifierId, Node s, Node p, Node o, int line, int column) {
+        Node tripleTerm = createTripleTerm(s, p, o, line, column);
+        if ( reifierId == null )
+            reifierId = createBNode(line, column);
+        Triple t = Triple.create(reifierId, nRDFreifies, tripleTerm);
+        acc.addTriple(t);
+        return reifierId;
+    }
+
+    private Node annotationReifierId = null;
+
+    protected void setReifierId(Node reifId) {
+        annotationReifierId = reifId;
+    }
+
+    protected Node getOrAllocReifierId(TripleCollector acc, Node s, Node p, Node o, int line, int column) {
+        if ( annotationReifierId != null )
+            return annotationReifierId;
+        Node reifierId = createBNode(-1, -1);
+        insertTripleReifier(acc, reifierId, s, p, o, line, column);
+        return reifierId;
     }
 
-    protected Expr asExprNoSign(Node n) {
-        String lex = n.getLiteralLexicalForm();
-        String lang = n.getLiteralLanguage();
-        String dtURI = n.getLiteralDatatypeURI();
-        n = createLiteral(lex, lang, dtURI);
+    protected void clearReifierId() {
+        annotationReifierId = null;
+    }
+
+    protected Expr asExpr(Node n) {
         return ExprLib.nodeToExpr(n);
     }
 
@@ -524,21 +623,22 @@ protected Expr makeFunction_BNode(Expr expr) {
 
     // Utilities to remove escapes in strings.
 
-    /*package-testing*/ static String unescapeStr(String s)
-    { return unescapeStr(s, -1, -1); }
+    /* package-testing */ static String unescapeStr(String s) {
+        return unescapeStr(s, -1, -1);
+    }
 //
-//    public static String unescapeCodePoint(String s)
-//    { return unescape(s, '\\', true, 1, 1); }
+// public static String unescapeCodePoint(String s)
+// { return unescape(s, '\\', true, 1, 1); }
 //
-//    protected String unescapeCodePoint(String s, int line, int column)
-//    { return unescape(s, '\\', true, line, column); }
-
+// protected String unescapeCodePoint(String s, int line, int column)
+// { return unescape(s, '\\', true, line, column); }
 
     // Do we need the line/column versions?
-    // Why not catch exceptions and comvert to  QueryParseException
+    // Why not catch exceptions and comvert to QueryParseException
 
-    protected static String unescapeStr(String s, int line, int column)
-    { return unescape(s, '\\', false, line, column); }
+    protected static String unescapeStr(String s, int line, int column) {
+        return unescape(s, '\\', false, line, column);
+    }
 
     // Worker function
     protected static String unescape(String s, char escape, boolean pointCodeOnly, int line, int column) {
@@ -564,7 +664,7 @@ protected static String unescapePName(String s, int line, int column) {
         int len = s.length();
         StringBuilder sb = new StringBuilder();
 
-        for ( int i = 0; i < len; i++ ) {
+        for ( int i = 0 ; i < len ; i++ ) {
             char ch = s.charAt(i);
             // Keep line and column numbers.
             switch (ch) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index dec80e38c2e..51ece29bc05 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -215,15 +215,19 @@ final public void SubSelect() throws ParseException {
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -324,15 +328,19 @@ final public void SubSelect() throws ParseException {
         case CALL:
         case STR:
         case STRLANG:
+        case STRLANGDIR:
         case STRDT:
         case DTYPE:
         case LANG:
         case LANGMATCHES:
+        case LANGDIR:
         case IS_URI:
         case IS_IRI:
         case IS_BLANK:
         case IS_LITERAL:
         case IS_NUMERIC:
+        case HAS_LANG:
+        case HAS_LANGDIR:
         case REGEX:
         case SAME_TERM:
         case RAND:
@@ -497,15 +505,19 @@ final public void SubSelect() throws ParseException {
         case CALL:
         case STR:
         case STRLANG:
+        case STRLANGDIR:
         case STRDT:
         case DTYPE:
         case LANG:
         case LANGMATCHES:
+        case LANGDIR:
         case IS_URI:
         case IS_IRI:
         case IS_BLANK:
         case IS_LITERAL:
         case IS_NUMERIC:
+        case HAS_LANG:
+        case HAS_LANGDIR:
         case REGEX:
         case SAME_TERM:
         case RAND:
@@ -953,15 +965,19 @@ final public void GroupClause() throws ParseException {
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -1047,15 +1063,19 @@ final public void GroupClause() throws ParseException {
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -1179,15 +1199,19 @@ final public void HavingClause() throws ParseException {
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -1292,15 +1316,19 @@ final public void OrderClause() throws ParseException {
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -1414,15 +1442,19 @@ final public void OrderClause() throws ParseException {
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -1500,15 +1532,19 @@ final public void OrderClause() throws ParseException {
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -1637,15 +1673,19 @@ final public void OrderClause() throws ParseException {
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -1723,15 +1763,19 @@ final public void OrderClause() throws ParseException {
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -2337,6 +2381,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -2392,6 +2437,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesTemplate(acc);
         break;
@@ -2434,6 +2480,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -2473,6 +2520,7 @@ final public void ConstructQuads(QuadAcc acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -2529,6 +2577,7 @@ final public void ConstructQuads(QuadAcc acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesTemplate(acc);
         break;
@@ -2580,6 +2629,7 @@ final public void ConstructQuads(QuadAcc acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -2664,6 +2714,7 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
 startTriplesBlock() ;
       el = TriplesBlock(null);
@@ -2686,6 +2737,8 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
       case SERVICE:
       case LET:
       case LATERAL:
+      case SEMIJOIN:
+      case ANTIJOIN:
       case UNFOLD:
       case EXISTS:
       case NOT:
@@ -2735,6 +2788,7 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
 startTriplesBlock() ;
         el = TriplesBlock(null);
@@ -2785,6 +2839,7 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesBlock(acc);
         break;
@@ -2803,6 +2858,20 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Node ReifiedTripleBlock(TripleCollector acc) throws ParseException {Node reifId ;
+    reifId = ReifiedTriple(acc);
+    PropertyList(reifId, acc);
+{if ("" != null) return reifId ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTripleBlockPath(TripleCollector acc) throws ParseException {Node reifId ;
+    reifId = ReifiedTriple(acc);
+    PropertyListPath(reifId, acc);
+{if ("" != null) return reifId ;}
+    throw new Error("Missing return statement in function");
+}
+
   final public Element GraphPatternNotTriples() throws ParseException {Element el = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
@@ -2817,6 +2886,14 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
       el = LateralGraphPattern();
       break;
       }
+    case SEMIJOIN:{
+      el = SemiJoinGraphPattern();
+      break;
+      }
+    case ANTIJOIN:{
+      el = AntiJoinGraphPattern();
+      break;
+      }
     case MINUS_P:{
       el = MinusGraphPattern();
       break;
@@ -2880,6 +2957,20 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Element SemiJoinGraphPattern() throws ParseException {Element el ;
+    jj_consume_token(SEMIJOIN);
+    el = GroupGraphPattern();
+{if ("" != null) return new ElementSemiJoin(el) ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Element AntiJoinGraphPattern() throws ParseException {Element el ;
+    jj_consume_token(ANTIJOIN);
+    el = GroupGraphPattern();
+{if ("" != null) return new ElementAntiJoin(el) ;}
+    throw new Error("Missing return statement in function");
+}
+
   final public Element GraphGraphPattern() throws ParseException {Element el ; Node n ;
     jj_consume_token(GRAPH);
     n = VarOrIri();
@@ -2974,7 +3065,7 @@ final public void DataBlock() throws ParseException {
       case STRING_LITERAL2:
       case STRING_LITERAL_LONG1:
       case STRING_LITERAL_LONG2:
-      case LT2:{
+      case L_TRIPLE:{
         ;
         break;
         }
@@ -3061,7 +3152,7 @@ final public void DataBlock() throws ParseException {
           case STRING_LITERAL2:
           case STRING_LITERAL_LONG1:
           case STRING_LITERAL_LONG2:
-          case LT2:{
+          case L_TRIPLE:{
             ;
             break;
             }
@@ -3134,8 +3225,8 @@ final public void DataBlock() throws ParseException {
 {if ("" != null) return null ;}
       break;
       }
-    case LT2:{
-      n = QuotedTripleData();
+    case L_TRIPLE:{
+      n = TripleTermData();
 {if ("" != null) return n ;}
       break;
       }
@@ -3147,6 +3238,56 @@ final public void DataBlock() throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Node Reifier() throws ParseException {Token tok = null ; Node reifId = null ;
+    tok = jj_consume_token(TILDE);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:
+    case BLANK_NODE_LABEL:
+    case VAR1:
+    case VAR2:
+    case ANON:{
+      reifId = VarOrReifierId();
+      break;
+      }
+    default:
+      jj_la1[92] = jj_gen;
+      ;
+    }
+{if ("" != null) return reifId;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node VarOrReifierId() throws ParseException {Node n = null; String iri = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+{if ("" != null) return n;}
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+{if ("" != null) return createNode(iri) ;}
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+{if ("" != null) return n ;}
+      break;
+      }
+    default:
+      jj_la1[93] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+}
+
   final public Element Assignment() throws ParseException {Var v ; Expr expr ;
     jj_consume_token(LET);
     jj_consume_token(LPAREN);
@@ -3187,7 +3328,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[92] = jj_gen;
+      jj_la1[94] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -3212,7 +3353,7 @@ final public void DataBlock() throws ParseException {
         break;
         }
       default:
-        jj_la1[93] = jj_gen;
+        jj_la1[95] = jj_gen;
         break label_24;
       }
       jj_consume_token(UNION);
@@ -3274,15 +3415,19 @@ final public void DataBlock() throws ParseException {
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -3332,7 +3477,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[96] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3345,7 +3490,7 @@ final public void DataBlock() throws ParseException {
     a = ArgList();
 if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if ("" != null) return exprAgg ;}
@@ -3373,7 +3518,7 @@ final public void DataBlock() throws ParseException {
         break;
         }
       default:
-        jj_la1[95] = jj_gen;
+        jj_la1[97] = jj_gen;
         ;
       }
       expr = Expression();
@@ -3386,7 +3531,7 @@ final public void DataBlock() throws ParseException {
           break;
           }
         default:
-          jj_la1[96] = jj_gen;
+          jj_la1[98] = jj_gen;
           break label_25;
         }
         jj_consume_token(COMMA);
@@ -3397,7 +3542,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[99] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3423,7 +3568,7 @@ final public void DataBlock() throws ParseException {
           break;
           }
         default:
-          jj_la1[98] = jj_gen;
+          jj_la1[100] = jj_gen;
           break label_26;
         }
         jj_consume_token(COMMA);
@@ -3434,7 +3579,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[99] = jj_gen;
+      jj_la1[101] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3471,7 +3616,7 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[102] = jj_gen;
       ;
     }
 }
@@ -3501,7 +3646,7 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       s = VarOrTerm();
       PropertyListNotEmpty(s, acc);
       break;
@@ -3514,8 +3659,12 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
 insert(acc, tempAcc) ;
       break;
       }
+    case LT2:{
+      ReifiedTripleBlock(acc);
+      break;
+      }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[103] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3533,7 +3682,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
       break;
       }
     default:
-      jj_la1[102] = jj_gen;
+      jj_la1[104] = jj_gen;
       ;
     }
 }
@@ -3549,7 +3698,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[105] = jj_gen;
         break label_28;
       }
       jj_consume_token(SEMICOLON);
@@ -3565,7 +3714,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[104] = jj_gen;
+        jj_la1[106] = jj_gen;
         ;
       }
     }
@@ -3587,7 +3736,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
       break;
       }
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[107] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3605,7 +3754,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[106] = jj_gen;
+        jj_la1[108] = jj_gen;
         break label_29;
       }
       jj_consume_token(COMMA);
@@ -3645,7 +3794,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       s = VarOrTerm();
       PropertyListPathNotEmpty(s, acc);
       break;
@@ -3658,8 +3807,12 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
 insert(acc, tempAcc) ;
       break;
       }
+    case LT2:{
+      ReifiedTripleBlockPath(acc);
+      break;
+      }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3683,7 +3836,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[108] = jj_gen;
+      jj_la1[110] = jj_gen;
       ;
     }
 }
@@ -3709,7 +3862,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[111] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3722,7 +3875,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[110] = jj_gen;
+        jj_la1[112] = jj_gen;
         break label_30;
       }
       jj_consume_token(SEMICOLON);
@@ -3760,7 +3913,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
           break;
           }
         default:
-          jj_la1[111] = jj_gen;
+          jj_la1[113] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -3768,7 +3921,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[112] = jj_gen;
+        jj_la1[114] = jj_gen;
         ;
       }
     }
@@ -3796,7 +3949,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[113] = jj_gen;
+        jj_la1[115] = jj_gen;
         break label_31;
       }
       jj_consume_token(COMMA);
@@ -3835,7 +3988,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[114] = jj_gen;
+        jj_la1[116] = jj_gen;
         break label_32;
       }
       jj_consume_token(VBAR);
@@ -3857,7 +4010,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[115] = jj_gen;
+        jj_la1[117] = jj_gen;
         break label_33;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -3874,7 +4027,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[116] = jj_gen;
+        jj_la1[118] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3894,7 +4047,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[117] = jj_gen;
+      jj_la1[119] = jj_gen;
       ;
     }
 {if ("" != null) return p ;}
@@ -3922,7 +4075,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[118] = jj_gen;
+      jj_la1[120] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3980,7 +4133,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
             break;
             }
           default:
-            jj_la1[119] = jj_gen;
+            jj_la1[121] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3992,7 +4145,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
           break;
           }
         default:
-          jj_la1[120] = jj_gen;
+          jj_la1[122] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -4006,20 +4159,26 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[121] = jj_gen;
+        jj_la1[123] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[122] = jj_gen;
+      jj_la1[124] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
 }
 
+  final public long Integer() throws ParseException {Token t ;
+    t = jj_consume_token(INTEGER);
+{if ("" != null) return integerValue(t.image) ;}
+    throw new Error("Missing return statement in function");
+}
+
   final public Path PathPrimary() throws ParseException {String str ; Path p ; Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -4070,7 +4229,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[123] = jj_gen;
+      jj_la1[125] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4108,7 +4267,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
             break;
             }
           default:
-            jj_la1[124] = jj_gen;
+            jj_la1[126] = jj_gen;
             break label_34;
           }
           jj_consume_token(VBAR);
@@ -4118,14 +4277,14 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[125] = jj_gen;
+        jj_la1[127] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
       break;
       }
     default:
-      jj_la1[126] = jj_gen;
+      jj_la1[128] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4163,26 +4322,20 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[127] = jj_gen;
+        jj_la1[129] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[128] = jj_gen;
+      jj_la1[130] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
 }
 
-  final public long Integer() throws ParseException {Token t ;
-    t = jj_consume_token(INTEGER);
-{if ("" != null) return integerValue(t.image) ;}
-    throw new Error("Missing return statement in function");
-}
-
   final public Node TriplesNode(TripleCollectorMark acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPAREN:{
@@ -4196,7 +4349,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[129] = jj_gen;
+      jj_la1[131] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4225,7 +4378,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[130] = jj_gen;
+      jj_la1[132] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4281,12 +4434,13 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         ;
         break;
         }
       default:
-        jj_la1[131] = jj_gen;
+        jj_la1[133] = jj_gen;
         break label_35;
       }
     }
@@ -4337,12 +4491,13 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         ;
         break;
         }
       default:
-        jj_la1[132] = jj_gen;
+        jj_la1[134] = jj_gen;
         break label_36;
       }
     }
@@ -4353,38 +4508,91 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
     throw new Error("Missing return statement in function");
 }
 
-  final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case L_ANN:{
-      jj_consume_token(L_ANN);
-Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, pAnn, o, token.beginLine, token.beginColumn);
-      PropertyListPathNotEmpty(x, acc);
-      jj_consume_token(R_ANN);
-      break;
+  final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
+    label_37:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case L_ANN:
+      case TILDE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[135] = jj_gen;
+        break label_37;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+        reifId = Reifier();
+reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ;
+setReifierId(reifId);
+        break;
+        }
+      case L_ANN:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+clearReifierId();
+        AnnotationBlockPath(acc, reifId);
+        break;
+        }
+      default:
+        jj_la1[136] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[133] = jj_gen;
-      ;
     }
+clearReifierId();
 }
 
-  final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case L_ANN:{
-      jj_consume_token(L_ANN);
-Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      PropertyListNotEmpty(x, acc);
-      jj_consume_token(R_ANN);
-      break;
+  final public void AnnotationBlockPath(TripleCollector acc, Node reifId) throws ParseException {
+    jj_consume_token(L_ANN);
+    PropertyListPathNotEmpty(reifId, acc);
+    jj_consume_token(R_ANN);
+}
+
+  final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
+    label_38:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case L_ANN:
+      case TILDE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[137] = jj_gen;
+        break label_38;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+        reifId = Reifier();
+reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ;
+setReifierId(reifId);
+        break;
+        }
+      case L_ANN:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+clearReifierId();
+        AnnotationBlock(acc, reifId);
+        break;
+        }
+      default:
+        jj_la1[138] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[134] = jj_gen;
-      ;
     }
 }
 
+  final public void AnnotationBlock(TripleCollector acc, Node reifId) throws ParseException {
+    jj_consume_token(L_ANN);
+    PropertyListNotEmpty(reifId, acc);
+    jj_consume_token(R_ANN);
+}
+
   final public Node GraphNode(TripleCollectorMark acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
@@ -4410,7 +4618,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       n = VarOrTerm();
 {if ("" != null) return n ;}
       break;
@@ -4418,11 +4626,16 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case LPAREN:
     case LBRACKET:{
       n = TriplesNode(acc);
+{if ("" != null) return n ;}
+      break;
+      }
+    case LT2:{
+      n = ReifiedTriple(acc);
 {if ("" != null) return n ;}
       break;
       }
     default:
-      jj_la1[135] = jj_gen;
+      jj_la1[139] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4454,7 +4667,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       n = VarOrTerm();
 {if ("" != null) return n ;}
       break;
@@ -4462,11 +4675,16 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case LPAREN:
     case LBRACKET:{
       n = TriplesNodePath(acc);
+{if ("" != null) return n ;}
+      break;
+      }
+    case LT2:{
+      n = ReifiedTriple(acc);
 {if ("" != null) return n ;}
       break;
       }
     default:
-      jj_la1[136] = jj_gen;
+      jj_la1[140] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4492,7 +4710,6 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:{
       n = RDFLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case INTEGER:
@@ -4505,19 +4722,16 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case DECIMAL_NEGATIVE:
     case DOUBLE_NEGATIVE:{
       n = NumericLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case TRUE:
     case FALSE:{
       n = BooleanLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case BLANK_NODE_LABEL:
     case ANON:{
       n = BlankNode();
-{if ("" != null) return n ;}
       break;
       }
     case NIL:{
@@ -4525,73 +4739,59 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return nRDFnil ;}
       break;
       }
-    case LT2:{
-      n = QuotedTriple();
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
       break;
       }
     default:
-      jj_la1[137] = jj_gen;
+      jj_la1[141] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return n ;}
-    throw new Error("Missing return statement in function");
-}
-
-  final public Node QuotedTriple() throws ParseException {Node n = null ; Token t ; Node s , p , o ;
-    t = jj_consume_token(LT2);
-    s = VarOrTerm();
-    p = Verb();
-    o = VarOrTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    jj_consume_token(GT2);
 {if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node QuotedTripleData() throws ParseException {Node n = null ; Token t ; String iri ; Node s , p , o ;
-    t = jj_consume_token(LT2);
-    s = DataValueTerm();
+  final public Node ReifiedTriple(TripleCollector acc) throws ParseException {Node reifId = null ; Token tok ; Node s; Node p ; Node o ;
+    tok = jj_consume_token(LT2);
+    s = ReifiedTripleSubject(acc);
+    p = Verb();
+    o = ReifiedTripleObject(acc);
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IRIref:
-    case PNAME_NS:
-    case PNAME_LN:{
-      iri = iri();
-p = createNode(iri) ;
-      break;
-      }
-    case KW_A:{
-      jj_consume_token(KW_A);
-p = nRDFtype ;
+    case TILDE:{
+      reifId = Reifier();
       break;
       }
     default:
-      jj_la1[138] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+      jj_la1[142] = jj_gen;
+      ;
     }
-    o = DataValueTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
+reifId = insertTripleReifier(acc, reifId, s, p, o, tok.beginLine, tok.beginColumn) ;
     jj_consume_token(GT2);
-{if ("" != null) return n;}
+{if ("" != null) return reifId;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node DataValueTerm() throws ParseException {Node n = null ; String iri ; Node s , p , o ;
+  final public Node ReifiedTripleSubject(TripleCollector acc) throws ParseException {Node s; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      s = Var();
+      break;
+      }
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
       iri = iri();
-{if ("" != null) return createNode(iri) ;}
+s = createNode(iri) ;
       break;
       }
     case STRING_LITERAL1:
     case STRING_LITERAL2:
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:{
-      n = RDFLiteral();
-{if ("" != null) return n ;}
+      s = RDFLiteral();
       break;
       }
     case INTEGER:
@@ -4603,73 +4803,372 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case INTEGER_NEGATIVE:
     case DECIMAL_NEGATIVE:
     case DOUBLE_NEGATIVE:{
-      n = NumericLiteral();
-{if ("" != null) return n ;}
+      s = NumericLiteral();
       break;
       }
     case TRUE:
     case FALSE:{
-      n = BooleanLiteral();
-{if ("" != null) return n ;}
+      s = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      s = BlankNode();
       break;
       }
     case LT2:{
-      n = QuotedTripleData();
-{if ("" != null) return n ;}
+      s = ReifiedTriple(acc);
       break;
       }
     default:
-      jj_la1[139] = jj_gen;
+      jj_la1[143] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return s;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node VarOrIri() throws ParseException {Node n = null ; String iri ;
+  final public Node ReifiedTripleObject(TripleCollector acc) throws ParseException {Node o; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
     case VAR2:{
-      n = Var();
+      o = Var();
       break;
       }
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
       iri = iri();
-n = createNode(iri) ;
-      break;
-      }
-    default:
-      jj_la1[140] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-{if ("" != null) return n ;}
-    throw new Error("Missing return statement in function");
-}
-
-  final public Node VarOrBlankNodeOrIri() throws ParseException {Node n = null ; String iri ;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case VAR1:
-    case VAR2:{
-      n = Var();
-      break;
-      }
-    case BLANK_NODE_LABEL:
-    case ANON:{
-      n = BlankNode();
+o = createNode(iri) ;
       break;
       }
-    case IRIref:
-    case PNAME_NS:
-    case PNAME_LN:{
-      iri = iri();
-n = createNode(iri) ;
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      o = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      o = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      o = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      o = BlankNode();
+      break;
+      }
+    case LT2:{
+      o = ReifiedTriple(acc);
+      break;
+      }
+    case L_TRIPLE:{
+      o = TripleTerm();
       break;
       }
     default:
-      jj_la1[141] = jj_gen;
+      jj_la1[144] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return o;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTerm() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
+    openToken = jj_consume_token(L_TRIPLE);
+    s = TripleTermSubject();
+    p = Verb();
+    o = TripleTermObject();
+n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermSubject() throws ParseException {Node n; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+      break;
+      }
+    default:
+      jj_la1[145] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermObject() throws ParseException {Node n; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+      break;
+      }
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
+      break;
+      }
+    default:
+      jj_la1[146] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermData() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
+    openToken = jj_consume_token(L_TRIPLE);
+    s = TripleTermDataSubject();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+p = createNode(iri) ;
+      break;
+      }
+    case KW_A:{
+      jj_consume_token(KW_A);
+p = nRDFtype ;
+      break;
+      }
+    default:
+      jj_la1[147] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    o = TripleTermDataObject();
+n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermDataSubject() throws ParseException {Node n = null; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    default:
+      jj_la1[148] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermDataObject() throws ParseException {Node n = null; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case L_TRIPLE:{
+      n = TripleTermData();
+      break;
+      }
+    default:
+      jj_la1[149] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node VarOrIri() throws ParseException {Node n = null ; String iri ;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    default:
+      jj_la1[150] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node VarOrBlankNodeOrIri() throws ParseException {Node n = null ; String iri ;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    default:
+      jj_la1[151] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4688,7 +5187,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[142] = jj_gen;
+      jj_la1[152] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4704,7 +5203,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr ConditionalOrExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = ConditionalAndExpression();
-    label_37:
+    label_39:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SC_OR:{
@@ -4712,8 +5211,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[143] = jj_gen;
-        break label_37;
+        jj_la1[153] = jj_gen;
+        break label_39;
       }
       jj_consume_token(SC_OR);
       expr2 = ConditionalAndExpression();
@@ -4725,7 +5224,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr ConditionalAndExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = ValueLogical();
-    label_38:
+    label_40:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SC_AND:{
@@ -4733,8 +5232,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[144] = jj_gen;
-        break label_38;
+        jj_la1[154] = jj_gen;
+        break label_40;
       }
       jj_consume_token(SC_AND);
       expr2 = ValueLogical();
@@ -4812,14 +5311,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[145] = jj_gen;
+        jj_la1[155] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[146] = jj_gen;
+      jj_la1[156] = jj_gen;
       ;
     }
 {if ("" != null) return expr1 ;}
@@ -4834,7 +5333,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr AdditiveExpression() throws ParseException {Expr expr1, expr2, expr3 ; boolean addition ; Node n ;
     expr1 = MultiplicativeExpression();
-    label_39:
+    label_41:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case INTEGER_POSITIVE:
@@ -4849,8 +5348,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[147] = jj_gen;
-        break label_39;
+        jj_la1[157] = jj_gen;
+        break label_41;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -4891,11 +5390,11 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
           break;
           }
         default:
-          jj_la1[148] = jj_gen;
+          jj_la1[158] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
-        label_40:
+        label_42:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case STAR:
@@ -4904,8 +5403,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[149] = jj_gen;
-            break label_40;
+            jj_la1[159] = jj_gen;
+            break label_42;
           }
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case STAR:{
@@ -4921,7 +5420,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[150] = jj_gen;
+            jj_la1[160] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -4933,7 +5432,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[151] = jj_gen;
+        jj_la1[161] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4944,7 +5443,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr MultiplicativeExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = UnaryExpression();
-    label_41:
+    label_43:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case MOD:
@@ -4955,8 +5454,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[152] = jj_gen;
-        break label_41;
+        jj_la1[162] = jj_gen;
+        break label_43;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case STAR:{
@@ -4984,7 +5483,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[153] = jj_gen;
+        jj_la1[163] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -5051,15 +5550,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -5115,13 +5618,13 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:
     case LPAREN:
-    case LT2:{
+    case L_TRIPLE:{
       expr = PrimaryExpression();
 {if ("" != null) return expr ;}
       break;
       }
     default:
-      jj_la1[154] = jj_gen;
+      jj_la1[164] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5168,15 +5671,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case CALL:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -5260,26 +5767,37 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return asExpr(n) ;}
       break;
       }
-    case LT2:{
-      n = ExprQuotedTriple();
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
 {if ("" != null) return asExpr(n) ;}
       break;
       }
     default:
-      jj_la1[155] = jj_gen;
+      jj_la1[165] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
 }
 
-  final public Node ExprVarOrTerm() throws ParseException {Node n; String s;
+  final public Node ExprTripleTerm() throws ParseException {Token t ; Node s,p,o,n;
+    t = jj_consume_token(L_TRIPLE);
+    s = ExprTripleTermSubject();
+    p = Verb();
+    o = ExprTripleTermObject();
+n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ExprTripleTermSubject() throws ParseException {Node n; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
-      s = iri();
-n = createNode(s);
+      iri = iri();
+n = createNode(iri);
       break;
       }
     case STRING_LITERAL1:
@@ -5311,12 +5829,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       n = Var();
       break;
       }
-    case LT2:{
-      n = ExprQuotedTriple();
-      break;
-      }
     default:
-      jj_la1[156] = jj_gen;
+      jj_la1[166] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5324,13 +5838,53 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     throw new Error("Missing return statement in function");
 }
 
-  final public Node ExprQuotedTriple() throws ParseException {Token t ; Node s,p,o,n;
-    t = jj_consume_token(LT2);
-    s = ExprVarOrTerm();
-    p = Verb();
-    o = ExprVarOrTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    jj_consume_token(GT2);
+  final public Node ExprTripleTermObject() throws ParseException {Node n; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri);
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
+      break;
+      }
+    default:
+      jj_la1[167] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
 {if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
@@ -5394,6 +5948,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_LangMatches(expr1, expr2) ;}
       break;
       }
+    case LANGDIR:{
+      jj_consume_token(LANGDIR);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_LangDir(expr) ;}
+      break;
+      }
     case DTYPE:{
       jj_consume_token(DTYPE);
       jj_consume_token(LPAREN);
@@ -5421,7 +5983,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[157] = jj_gen;
+        jj_la1[168] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -5439,7 +6001,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[158] = jj_gen;
+        jj_la1[169] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -5462,7 +6024,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[159] = jj_gen;
+        jj_la1[170] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -5699,7 +6261,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[160] = jj_gen;
+        jj_la1[171] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -5782,7 +6344,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       jj_consume_token(LPAREN);
       expr = Expression();
 a.add(expr) ;
-      label_42:
+      label_44:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA:{
@@ -5790,8 +6352,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
           break;
           }
         default:
-          jj_la1[161] = jj_gen;
-          break label_42;
+          jj_la1[172] = jj_gen;
+          break label_44;
         }
         jj_consume_token(COMMA);
         expr = Expression();
@@ -5823,6 +6385,18 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_StrLang(expr1, expr2) ;}
       break;
       }
+    case STRLANGDIR:{
+      jj_consume_token(STRLANGDIR);
+      jj_consume_token(LPAREN);
+      expr1 = Expression();
+      jj_consume_token(COMMA);
+      expr2 = Expression();
+      jj_consume_token(COMMA);
+      expr3 = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_StrLangDir(expr1, expr2, expr3) ;}
+      break;
+      }
     case STRDT:{
       jj_consume_token(STRDT);
       jj_consume_token(LPAREN);
@@ -5883,6 +6457,22 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_IsNumeric(expr) ;}
       break;
       }
+    case HAS_LANG:{
+      jj_consume_token(HAS_LANG);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_HasLang(expr) ;}
+      break;
+      }
+    case HAS_LANGDIR:{
+      jj_consume_token(HAS_LANGDIR);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_HasLangDir(expr) ;}
+      break;
+      }
     case REGEX:{
       expr = RegexExpression();
 {if ("" != null) return expr ;}
@@ -5943,7 +6533,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[162] = jj_gen;
+      jj_la1[173] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5963,7 +6553,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[163] = jj_gen;
+      jj_la1[174] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -5984,7 +6574,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[164] = jj_gen;
+      jj_la1[175] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -6007,7 +6597,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[165] = jj_gen;
+      jj_la1[176] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -6047,7 +6637,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[166] = jj_gen;
+        jj_la1[177] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6093,15 +6683,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       case CALL:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -6157,7 +6751,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       case STRING_LITERAL_LONG1:
       case STRING_LITERAL_LONG2:
       case LPAREN:
-      case LT2:
+      case L_TRIPLE:
       case BANG:
       case PLUS:
       case MINUS:{
@@ -6165,7 +6759,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[167] = jj_gen;
+        jj_la1[178] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6184,7 +6778,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[168] = jj_gen;
+        jj_la1[179] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6202,7 +6796,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[169] = jj_gen;
+        jj_la1[180] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6220,7 +6814,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[170] = jj_gen;
+        jj_la1[181] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6238,7 +6832,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[171] = jj_gen;
+        jj_la1[182] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6256,7 +6850,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[172] = jj_gen;
+        jj_la1[183] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6274,7 +6868,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[173] = jj_gen;
+        jj_la1[184] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6292,7 +6886,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[174] = jj_gen;
+        jj_la1[185] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6310,7 +6904,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[175] = jj_gen;
+        jj_la1[186] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6331,7 +6925,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[176] = jj_gen;
+            jj_la1[187] = jj_gen;
             ;
           }
         } else {
@@ -6345,7 +6939,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[177] = jj_gen;
+            jj_la1[188] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -6353,7 +6947,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[178] = jj_gen;
+        jj_la1[189] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -6370,7 +6964,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[179] = jj_gen;
+        jj_la1[190] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6388,7 +6982,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[180] = jj_gen;
+        jj_la1[191] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6406,7 +7000,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[181] = jj_gen;
+        jj_la1[192] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6424,7 +7018,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[182] = jj_gen;
+        jj_la1[193] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6442,7 +7036,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[183] = jj_gen;
+        jj_la1[194] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6460,7 +7054,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[184] = jj_gen;
+        jj_la1[195] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6480,7 +7074,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[185] = jj_gen;
+        jj_la1[196] = jj_gen;
         ;
       }
       expr = Expression();
@@ -6491,14 +7085,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[186] = jj_gen;
+        jj_la1[197] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case ORDER:{
         jj_consume_token(ORDER);
         jj_consume_token(BY);
-        label_43:
+        label_45:
         while (true) {
           sc = OrderConditionForAggregationFunction();
 if ( scs == null )
@@ -6545,15 +7139,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
           case CALL:
           case STR:
           case STRLANG:
+          case STRLANGDIR:
           case STRDT:
           case DTYPE:
           case LANG:
           case LANGMATCHES:
+          case LANGDIR:
           case IS_URI:
           case IS_IRI:
           case IS_BLANK:
           case IS_LITERAL:
           case IS_NUMERIC:
+          case HAS_LANG:
+          case HAS_LANGDIR:
           case REGEX:
           case SAME_TERM:
           case RAND:
@@ -6598,14 +7196,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[187] = jj_gen;
-            break label_43;
+            jj_la1[198] = jj_gen;
+            break label_45;
           }
         }
         break;
         }
       default:
-        jj_la1[188] = jj_gen;
+        jj_la1[199] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -6622,7 +7220,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[189] = jj_gen;
+      jj_la1[200] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6645,14 +7243,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[190] = jj_gen;
+      jj_la1[201] = jj_gen;
       ;
     }
 if ( a == null )
        {if ("" != null) return asExpr(createNode(iri)) ;}
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if ("" != null) return exprAgg ;}
@@ -6661,35 +7259,35 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     throw new Error("Missing return statement in function");
 }
 
-  final public Node RDFLiteral() throws ParseException {Token t ; String lex = null ;
+  final public Node RDFLiteral() throws ParseException {Token t ; String lex = null ; String uri = null ;
     lex = String();
-String lang = null ; String uri = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LANGTAG:
+    case LANG_DIR:
     case DATATYPE:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LANGTAG:{
-        t = jj_consume_token(LANGTAG);
-lang = stripChars(t.image, 1) ;
+      case LANG_DIR:{
+        t = jj_consume_token(LANG_DIR);
+{if ("" != null) return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn);}
         break;
         }
       case DATATYPE:{
         jj_consume_token(DATATYPE);
         uri = iri();
+{if ("" != null) return createLiteralDT(lex, uri, token.beginLine, token.beginColumn);}
         break;
         }
       default:
-        jj_la1[191] = jj_gen;
+        jj_la1[202] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[192] = jj_gen;
+      jj_la1[203] = jj_gen;
       ;
     }
-{if ("" != null) return createLiteral(lex, lang, uri) ;}
+{if ("" != null) return createLiteralString(lex, token.beginLine, token.beginColumn) ;}
     throw new Error("Missing return statement in function");
 }
 
@@ -6714,7 +7312,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[193] = jj_gen;
+      jj_la1[204] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6740,7 +7338,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[194] = jj_gen;
+      jj_la1[205] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6765,7 +7363,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[195] = jj_gen;
+      jj_la1[206] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6790,7 +7388,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[196] = jj_gen;
+      jj_la1[207] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6810,7 +7408,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[197] = jj_gen;
+      jj_la1[208] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6840,7 +7438,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[198] = jj_gen;
+      jj_la1[209] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6864,7 +7462,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[199] = jj_gen;
+      jj_la1[210] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6884,7 +7482,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[200] = jj_gen;
+      jj_la1[211] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6904,7 +7502,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[201] = jj_gen;
+      jj_la1[212] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6957,664 +7555,421 @@ private boolean jj_2_5(int xla)
     finally { jj_save(4, xla); }
   }
 
-  private boolean jj_3R_BuiltInCall_1525_5_101()
+  private boolean jj_3R_String_1909_5_190()
  {
-    if (jj_scan_token(IS_BLANK)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL2)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1523_5_100()
+  private boolean jj_3R_String_1908_5_189()
  {
-    if (jj_scan_token(IS_URI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL1)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1521_5_99()
+  private boolean jj_3R_String_1908_3_180()
  {
-    if (jj_scan_token(IS_IRI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_String_1908_5_189()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_1909_5_190()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_1910_5_191()) {
+    jj_scanpos = xsp;
+    if (jj_3R_String_1911_5_192()) return true;
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1519_5_98()
+  private boolean jj_3R_BooleanLiteral_1904_3_185()
  {
-    if (jj_scan_token(SAME_TERM)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(FALSE)) return true;
     return false;
   }
 
   private boolean jj_3_2()
  {
     if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_3R_Prologue_72_3_45()) return true;
+    if (jj_3R_Prologue_72_3_47()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(149)) {
+    if (jj_scan_token(155)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(150)) {
+    if (jj_scan_token(156)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(157)) {
+    if (jj_scan_token(163)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(152)) {
+    if (jj_scan_token(158)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(153)) {
+    if (jj_scan_token(159)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(154)) {
+    if (jj_scan_token(160)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(151)) {
+    if (jj_scan_token(157)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(162)) {
+    if (jj_scan_token(168)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(145)) {
+    if (jj_scan_token(151)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(144)) {
+    if (jj_scan_token(150)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(163)) {
+    if (jj_scan_token(169)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(146)) {
+    if (jj_scan_token(152)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(147)) {
+    if (jj_scan_token(153)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(148)) return true;
-    }
-    }
-    }
+    if (jj_scan_token(154)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     }
     }
     }
     }
     }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1517_5_97()
- {
-    if (jj_scan_token(STRDT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1515_5_96()
- {
-    if (jj_scan_token(STRLANG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1511_5_95()
- {
-    if (jj_scan_token(IF)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BlankNodePropertyList_1125_3_168()
- {
-    if (jj_scan_token(LBRACKET)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1504_5_94()
- {
-    if (jj_scan_token(CALL)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_TriplesNode_1121_3_158()
- {
-    if (jj_3R_BlankNodePropertyList_1125_3_168()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1502_5_93()
- {
-    if (jj_scan_token(COALESCE)) return true;
-    if (jj_3R_ExpressionList_866_3_118()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1501_5_92()
- {
-    if (jj_scan_token(VERSION)) return true;
-    if (jj_scan_token(NIL)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_TriplesNode_1119_3_127()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_TriplesNode_1119_3_157()) {
-    jj_scanpos = xsp;
-    if (jj_3R_TriplesNode_1121_3_158()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_TriplesNode_1119_3_157()
- {
-    if (jj_3R_Collection_1148_3_167()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1500_5_91()
- {
-    if (jj_scan_token(SHA512)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1499_5_90()
- {
-    if (jj_scan_token(SHA384)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1498_5_89()
- {
-    if (jj_scan_token(SHA256)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1497_5_88()
- {
-    if (jj_scan_token(SHA1)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1496_5_87()
- {
-    if (jj_scan_token(MD5)) return true;
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1495_5_86()
- {
-    if (jj_scan_token(STRUUID)) return true;
-    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1494_5_85()
+  private boolean jj_3R_BooleanLiteral_1902_3_184()
  {
-    if (jj_scan_token(UUID)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(TRUE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1493_5_84()
+  private boolean jj_3R_BooleanLiteral_1902_3_173()
  {
-    if (jj_scan_token(NOW)) return true;
-    if (jj_scan_token(NIL)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BooleanLiteral_1902_3_184()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BooleanLiteral_1904_3_185()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1490_5_83()
+  private boolean jj_3R_NumericLiteralNegative_1898_3_206()
  {
-    if (jj_scan_token(ADJUST)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1489_5_82()
+  private boolean jj_3R_NumericLiteralNegative_1897_3_205()
  {
-    if (jj_scan_token(TZ)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1488_5_81()
+  private boolean jj_3R_NumericLiteralNegative_1896_3_204()
  {
-    if (jj_scan_token(TIMEZONE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1487_5_80()
+  private boolean jj_3R_NumericLiteralNegative_1896_3_195()
  {
-    if (jj_scan_token(SECONDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralNegative_1896_3_204()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_1897_3_205()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralNegative_1898_3_206()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1486_5_79()
+  private boolean jj_3R_NumericLiteralPositive_1892_3_203()
  {
-    if (jj_scan_token(MINUTES)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1485_5_78()
+  private boolean jj_3R_NumericLiteralPositive_1891_3_202()
  {
-    if (jj_scan_token(HOURS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1484_5_77()
+  private boolean jj_3R_NumericLiteralPositive_1890_3_201()
  {
-    if (jj_scan_token(DAY)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(INTEGER_POSITIVE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1483_5_76()
+  private boolean jj_3R_NumericLiteralPositive_1890_3_194()
  {
-    if (jj_scan_token(MONTH)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralPositive_1890_3_201()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralPositive_1891_3_202()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralPositive_1892_3_203()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1482_5_75()
+  private boolean jj_3R_NumericLiteralUnsigned_1886_3_200()
  {
-    if (jj_scan_token(YEAR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DOUBLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1480_5_74()
+  private boolean jj_3R_NumericLiteralUnsigned_1885_3_199()
  {
-    if (jj_scan_token(STRAFTER)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(DECIMAL)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1478_5_73()
+  private boolean jj_3R_NumericLiteralUnsigned_1884_3_198()
  {
-    if (jj_scan_token(STRBEFORE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(INTEGER)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1476_5_72()
+  private boolean jj_3R_NumericLiteralUnsigned_1884_3_193()
  {
-    if (jj_scan_token(STRENDS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteralUnsigned_1884_3_198()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralUnsigned_1885_3_199()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteralUnsigned_1886_3_200()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1474_5_71()
+  private boolean jj_3R_NumericLiteral_1878_5_183()
  {
-    if (jj_scan_token(STRSTARTS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteralNegative_1896_3_195()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1472_5_70()
+  private boolean jj_3R_NumericLiteral_1877_5_182()
  {
-    if (jj_scan_token(CONTAINS)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteralPositive_1890_3_194()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1471_5_69()
+  private boolean jj_3R_NumericLiteral_1876_5_181()
  {
-    if (jj_scan_token(ENCODE_FOR_URI)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_NumericLiteralUnsigned_1884_3_193()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1470_5_68()
+  private boolean jj_3R_NumericLiteral_1875_3_172()
  {
-    if (jj_scan_token(LCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_NumericLiteral_1876_5_181()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteral_1877_5_182()) {
+    jj_scanpos = xsp;
+    if (jj_3R_NumericLiteral_1878_5_183()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1469_5_67()
+  private boolean jj_3R_RDFLiteral_1863_3_171()
  {
-    if (jj_scan_token(UCASE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_String_1908_3_180()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1468_5_66()
+  private boolean jj_3R_Aggregate_1828_5_152()
  {
-    if (jj_3R_StrReplaceExpression_1573_3_120()) return true;
+    if (jj_scan_token(AGG)) return true;
+    if (jj_3R_iri_1920_3_168()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1467_5_65()
+  private boolean jj_3R_Aggregate_1808_5_151()
  {
-    if (jj_scan_token(STRLEN)) return true;
+    if (jj_scan_token(FOLD)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1466_5_64()
- {
-    if (jj_3R_SubstringExpression_1561_5_119()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1465_5_63()
+  private boolean jj_3R_Aggregate_1806_5_150()
  {
-    if (jj_scan_token(CONCAT)) return true;
-    if (jj_3R_ExpressionList_866_3_118()) return true;
+    if (jj_scan_token(VAR_POP)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1464_5_62()
+  private boolean jj_3R_Aggregate_1804_5_149()
  {
-    if (jj_scan_token(IDIV)) return true;
+    if (jj_scan_token(VAR_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1463_5_61()
+  private boolean jj_3R_Aggregate_1802_5_148()
  {
-    if (jj_scan_token(MOD)) return true;
+    if (jj_scan_token(VARIANCE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1462_5_60()
+  private boolean jj_3R_Var_1418_5_170()
  {
-    if (jj_scan_token(ROUND)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(14)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(15)) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1461_5_59()
+  private boolean jj_3R_Aggregate_1800_5_147()
  {
-    if (jj_scan_token(FLOOR)) return true;
+    if (jj_scan_token(STDEV_POP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1460_5_58()
+  private boolean jj_3R_Aggregate_1798_5_146()
  {
-    if (jj_scan_token(CEIL)) return true;
+    if (jj_scan_token(STDEV_SAMP)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1459_5_57()
+  private boolean jj_3R_Aggregate_1796_5_145()
  {
-    if (jj_scan_token(ABS)) return true;
+    if (jj_scan_token(STDEV)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1458_5_56()
+  private boolean jj_3_5()
  {
-    if (jj_scan_token(RAND)) return true;
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_scan_token(SEPARATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1456_7_117()
+  private boolean jj_3R_Aggregate_1783_5_144()
  {
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(GROUP_CONCAT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1453_7_116()
+  private boolean jj_3R_Aggregate_1781_5_143()
  {
+    if (jj_scan_token(SAMPLE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1452_5_55()
+  private boolean jj_3R_ReifiedTripleBlock_633_3_135()
  {
-    if (jj_scan_token(BNODE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1453_7_116()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1456_7_117()) return true;
-    }
+    if (jj_3R_ReifiedTriple_1310_3_167()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1450_5_54()
+  private boolean jj_3R_Aggregate_1779_5_142()
  {
-    if (jj_scan_token(URI)) return true;
+    if (jj_scan_token(MODE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1448_5_53()
+  private boolean jj_3R_Aggregate_1777_5_141()
  {
-    if (jj_scan_token(IRI)) return true;
+    if (jj_scan_token(MEDIAN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1446_5_52()
+  private boolean jj_3R_Aggregate_1775_5_140()
  {
-    if (jj_scan_token(BOUND)) return true;
+    if (jj_scan_token(AVG)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1444_5_51()
+  private boolean jj_3R_Aggregate_1773_5_139()
  {
-    if (jj_scan_token(DTYPE)) return true;
+    if (jj_scan_token(MAX)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1441_5_50()
+  private boolean jj_3R_Aggregate_1771_5_138()
  {
-    if (jj_scan_token(LANGMATCHES)) return true;
+    if (jj_scan_token(MIN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1439_5_49()
+  private boolean jj_3R_Aggregate_1769_5_137()
  {
-    if (jj_scan_token(LANG)) return true;
+    if (jj_scan_token(SUM)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1437_5_48()
+  private boolean jj_3R_Aggregate_1762_5_136()
  {
-    if (jj_scan_token(STR)) return true;
+    if (jj_scan_token(COUNT)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1435_5_47()
- {
-    if (jj_3R_Aggregate_1600_3_115()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_BuiltInCall_1435_5_44()
+  private boolean jj_3R_Aggregate_1761_3_122()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_BuiltInCall_1435_5_47()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1437_5_48()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1439_5_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1441_5_50()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1444_5_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1446_5_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1448_5_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1450_5_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1452_5_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1458_5_56()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1459_5_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1460_5_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1461_5_59()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1462_5_60()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1463_5_61()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1464_5_62()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1465_5_63()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1466_5_64()) {
+    if (jj_3R_Aggregate_1762_5_136()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1467_5_65()) {
+    if (jj_3R_Aggregate_1769_5_137()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1468_5_66()) {
+    if (jj_3R_Aggregate_1771_5_138()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1469_5_67()) {
+    if (jj_3R_Aggregate_1773_5_139()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1470_5_68()) {
+    if (jj_3R_Aggregate_1775_5_140()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1471_5_69()) {
+    if (jj_3R_Aggregate_1777_5_141()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1472_5_70()) {
+    if (jj_3R_Aggregate_1779_5_142()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1474_5_71()) {
+    if (jj_3R_Aggregate_1781_5_143()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1476_5_72()) {
+    if (jj_3R_Aggregate_1783_5_144()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1478_5_73()) {
+    if (jj_3R_Aggregate_1796_5_145()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1480_5_74()) {
+    if (jj_3R_Aggregate_1798_5_146()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1482_5_75()) {
+    if (jj_3R_Aggregate_1800_5_147()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1483_5_76()) {
+    if (jj_3R_Aggregate_1802_5_148()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1484_5_77()) {
+    if (jj_3R_Aggregate_1804_5_149()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1485_5_78()) {
+    if (jj_3R_Aggregate_1806_5_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1486_5_79()) {
+    if (jj_3R_Aggregate_1808_5_151()) {
     jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1487_5_80()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1488_5_81()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1489_5_82()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1490_5_83()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1493_5_84()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1494_5_85()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1495_5_86()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1496_5_87()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1497_5_88()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1498_5_89()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1499_5_90()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1500_5_91()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1501_5_92()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1502_5_93()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1504_5_94()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1511_5_95()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1515_5_96()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1517_5_97()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1519_5_98()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1521_5_99()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1523_5_100()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1525_5_101()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1527_5_102()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1529_5_103()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1532_5_104()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1533_5_105()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1534_5_106()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1535_3_107()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1537_5_108()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1539_5_109()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1541_5_110()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BuiltInCall_1543_5_111()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_Aggregate_1828_5_152()) return true;
     }
     }
     }
@@ -7634,650 +7989,940 @@ private boolean jj_3R_BuiltInCall_1435_5_44()
     return false;
   }
 
-  private boolean jj_3R_IRIREF_1780_3_160()
+  private boolean jj_3R_NotExistsFunc_1751_4_130()
+ {
+    if (jj_scan_token(NOT)) return true;
+    if (jj_scan_token(EXISTS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_ExistsFunc_1745_4_129()
+ {
+    if (jj_scan_token(EXISTS)) return true;
+    if (jj_3R_GroupGraphPattern_584_3_154()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_StrReplaceExpression_1734_3_127()
+ {
+    if (jj_scan_token(REPLACE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_GroupGraphPattern_584_3_154()
  {
-    if (jj_scan_token(IRIref)) return true;
+    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1776_3_178()
+  private boolean jj_3_3()
  {
-    if (jj_scan_token(ANON)) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_TriplesSameSubject_931_3_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1773_3_165()
+  private boolean jj_3R_TripleTerm_1346_5_175()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BlankNode_1773_3_177()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BlankNode_1776_3_178()) return true;
-    }
+    if (jj_scan_token(L_TRIPLE)) return true;
     return false;
   }
 
-  private boolean jj_3R_BlankNode_1773_3_177()
+  private boolean jj_3R_SubstringExpression_1722_5_126()
  {
-    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
+    if (jj_scan_token(SUBSTR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1767_5_188()
+  private boolean jj_3R_RegexExpression_1710_5_128()
  {
-    if (jj_scan_token(PNAME_NS)) return true;
+    if (jj_scan_token(REGEX)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1764_5_187()
+  private boolean jj_3R_BuiltInCall_1704_5_117()
  {
-    if (jj_scan_token(PNAME_LN)) return true;
+    if (jj_scan_token(OBJECT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_PrefixedName_1764_3_179()
+  private boolean jj_3R_TriplesSameSubject_939_3_121()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_PrefixedName_1764_5_187()) {
-    jj_scanpos = xsp;
-    if (jj_3R_PrefixedName_1767_5_188()) return true;
-    }
+    if (jj_3R_ReifiedTripleBlock_633_3_135()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1702_5_116()
+ {
+    if (jj_scan_token(PREDICATE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1700_5_115()
+ {
+    if (jj_scan_token(SUBJECT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_TriplesSameSubject_934_3_120()
+ {
+    if (jj_3R_TriplesNode_1160_4_134()) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_1760_3_170()
+  private boolean jj_3R_BuiltInCall_1696_5_114()
  {
-    if (jj_3R_PrefixedName_1764_3_179()) return true;
+    if (jj_scan_token(TRIPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_iri_1758_3_159()
+  private boolean jj_3R_TriplesSameSubject_931_3_48()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_iri_1758_3_169()) {
+    if (jj_3R_TriplesSameSubject_931_3_119()) {
     jj_scanpos = xsp;
-    if (jj_3R_iri_1760_3_170()) return true;
+    if (jj_3R_TriplesSameSubject_934_3_120()) {
+    jj_scanpos = xsp;
+    if (jj_3R_TriplesSameSubject_939_3_121()) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_iri_1758_3_169()
+  private boolean jj_3R_TriplesSameSubject_931_3_119()
  {
-    if (jj_3R_IRIREF_1780_3_160()) return true;
+    if (jj_3R_VarOrTerm_1297_3_133()) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1749_5_183()
+  private boolean jj_3R_BuiltInCall_1694_5_113()
  {
-    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
+    if (jj_scan_token(IS_TRIPLE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1748_5_182()
+  private boolean jj_3_4()
  {
-    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_TriplesSameSubject_931_3_48()) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1747_5_181()
+  private boolean jj_3R_BuiltInCall_1693_5_112()
  {
-    if (jj_scan_token(STRING_LITERAL2)) return true;
+    if (jj_3R_NotExistsFunc_1751_4_130()) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1746_5_180()
+  private boolean jj_3R_BuiltInCall_1692_5_111()
  {
-    if (jj_scan_token(STRING_LITERAL1)) return true;
+    if (jj_3R_ExistsFunc_1745_4_129()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_ReifiedTriple_1310_3_167()
+ {
+    if (jj_scan_token(LT2)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1691_5_110()
+ {
+    if (jj_3R_RegexExpression_1710_5_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1688_5_109()
+ {
+    if (jj_scan_token(HAS_LANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_String_1746_3_171()
+  private boolean jj_3R_VarOrTerm_1304_5_164()
+ {
+    if (jj_3R_TripleTerm_1346_5_175()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1303_5_163()
+ {
+    if (jj_scan_token(NIL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1686_5_108()
+ {
+    if (jj_scan_token(HAS_LANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1302_5_162()
+ {
+    if (jj_3R_BlankNode_1935_3_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1301_5_161()
+ {
+    if (jj_3R_BooleanLiteral_1902_3_173()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1684_5_107()
+ {
+    if (jj_scan_token(IS_NUMERIC)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1300_5_160()
+ {
+    if (jj_3R_NumericLiteral_1875_3_172()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1299_5_159()
+ {
+    if (jj_3R_RDFLiteral_1863_3_171()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1682_5_106()
+ {
+    if (jj_scan_token(IS_LITERAL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1298_5_158()
+ {
+    if (jj_3R_iri_1920_3_168()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1297_5_157()
+ {
+    if (jj_3R_Var_1418_5_170()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1680_5_105()
+ {
+    if (jj_scan_token(IS_BLANK)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_VarOrTerm_1297_3_133()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_String_1746_5_180()) {
+    if (jj_3R_VarOrTerm_1297_5_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1747_5_181()) {
+    if (jj_3R_VarOrTerm_1298_5_158()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1748_5_182()) {
+    if (jj_3R_VarOrTerm_1299_5_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_String_1749_5_183()) return true;
+    if (jj_3R_VarOrTerm_1300_5_160()) {
+    jj_scanpos = xsp;
+    if (jj_3R_VarOrTerm_1301_5_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_VarOrTerm_1302_5_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_VarOrTerm_1303_5_163()) {
+    jj_scanpos = xsp;
+    if (jj_3R_VarOrTerm_1304_5_164()) return true;
+    }
+    }
+    }
+    }
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1742_3_176()
+  private boolean jj_3R_BuiltInCall_1678_5_104()
  {
-    if (jj_scan_token(FALSE)) return true;
+    if (jj_scan_token(IS_URI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1740_3_164()
+  private boolean jj_3R_BuiltInCall_1676_5_103()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_BooleanLiteral_1740_3_175()) {
-    jj_scanpos = xsp;
-    if (jj_3R_BooleanLiteral_1742_3_176()) return true;
-    }
+    if (jj_scan_token(IS_IRI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BooleanLiteral_1740_3_175()
+  private boolean jj_3R_BuiltInCall_1674_5_102()
  {
-    if (jj_scan_token(TRUE)) return true;
+    if (jj_scan_token(SAME_TERM)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1736_3_197()
+  private boolean jj_3R_ExpressionList_906_5_153()
  {
-    if (jj_scan_token(DOUBLE_NEGATIVE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1735_3_196()
+  private boolean jj_3R_BuiltInCall_1672_5_101()
  {
-    if (jj_scan_token(DECIMAL_NEGATIVE)) return true;
+    if (jj_scan_token(STRDT)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1734_3_195()
+  private boolean jj_3R_BuiltInCall_1668_5_100()
  {
-    if (jj_scan_token(INTEGER_NEGATIVE)) return true;
+    if (jj_scan_token(STRLANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralNegative_1734_3_186()
+  private boolean jj_3R_ExpressionList_903_3_125()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralNegative_1734_3_195()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1735_3_196()) {
+    if (jj_scan_token(193)) {
     jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralNegative_1736_3_197()) return true;
-    }
+    if (jj_3R_ExpressionList_906_5_153()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_GroupGraphPattern_584_3_146()
+  private boolean jj_3R_BuiltInCall_1666_5_99()
  {
-    if (jj_scan_token(LBRACE)) return true;
+    if (jj_scan_token(STRLANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_BuiltInCall_1662_5_98()
  {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_TriplesSameSubject_894_3_46()) return true;
+    if (jj_scan_token(IF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1730_3_194()
+  private boolean jj_3R_BuiltInCall_1655_5_97()
  {
-    if (jj_scan_token(DOUBLE_POSITIVE)) return true;
+    if (jj_scan_token(CALL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1729_3_193()
+  private boolean jj_3R_BuiltInCall_1653_5_96()
  {
-    if (jj_scan_token(DECIMAL_POSITIVE)) return true;
+    if (jj_scan_token(COALESCE)) return true;
+    if (jj_3R_ExpressionList_903_3_125()) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1728_3_192()
+  private boolean jj_3R_BuiltInCall_1652_5_95()
  {
-    if (jj_scan_token(INTEGER_POSITIVE)) return true;
+    if (jj_scan_token(VERSION)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralPositive_1728_3_185()
+  private boolean jj_3R_BuiltInCall_1651_5_94()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralPositive_1728_3_192()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1729_3_193()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralPositive_1730_3_194()) return true;
-    }
-    }
+    if (jj_scan_token(SHA512)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1724_3_191()
+  private boolean jj_3R_BuiltInCall_1650_5_93()
  {
-    if (jj_scan_token(DOUBLE)) return true;
+    if (jj_scan_token(SHA384)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1723_3_190()
+  private boolean jj_3R_BuiltInCall_1649_5_92()
  {
-    if (jj_scan_token(DECIMAL)) return true;
+    if (jj_scan_token(SHA256)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1722_3_189()
+  private boolean jj_3R_BuiltInCall_1648_5_91()
  {
-    if (jj_scan_token(INTEGER)) return true;
+    if (jj_scan_token(SHA1)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteralUnsigned_1722_3_184()
+  private boolean jj_3_1()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteralUnsigned_1722_3_189()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1723_3_190()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteralUnsigned_1724_3_191()) return true;
-    }
-    }
+    if (jj_3R_BuiltInCall_1584_5_46()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1647_5_90()
+ {
+    if (jj_scan_token(MD5)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1716_5_174()
+  private boolean jj_3R_BuiltInCall_1646_5_89()
  {
-    if (jj_3R_NumericLiteralNegative_1734_3_186()) return true;
+    if (jj_scan_token(STRUUID)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1715_5_173()
+  private boolean jj_3R_BuiltInCall_1645_5_88()
  {
-    if (jj_3R_NumericLiteralPositive_1728_3_185()) return true;
+    if (jj_scan_token(UUID)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1714_5_172()
+  private boolean jj_3R_BuiltInCall_1644_5_87()
  {
-    if (jj_3R_NumericLiteralUnsigned_1722_3_184()) return true;
+    if (jj_scan_token(NOW)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_NumericLiteral_1713_3_163()
+  private boolean jj_3R_BuiltInCall_1641_5_86()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_NumericLiteral_1714_5_172()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1715_5_173()) {
-    jj_scanpos = xsp;
-    if (jj_3R_NumericLiteral_1716_5_174()) return true;
-    }
-    }
+    if (jj_scan_token(ADJUST)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_RDFLiteral_1702_3_162()
+  private boolean jj_3R_BuiltInCall_1640_5_85()
  {
-    if (jj_3R_String_1746_3_171()) return true;
+    if (jj_scan_token(TZ)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1667_5_144()
+  private boolean jj_3R_BuiltInCall_1639_5_84()
  {
-    if (jj_scan_token(AGG)) return true;
-    if (jj_3R_iri_1758_3_159()) return true;
+    if (jj_scan_token(TIMEZONE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Var_1280_5_161()
+  private boolean jj_3R_BuiltInCall_1638_5_83()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(14)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(15)) return true;
-    }
+    if (jj_scan_token(SECONDS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_897_3_114()
+  private boolean jj_3R_BuiltInCall_1637_5_82()
  {
-    if (jj_3R_TriplesNode_1119_3_127()) return true;
+    if (jj_scan_token(MINUTES)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_894_3_46()
+  private boolean jj_3R_BuiltInCall_1636_5_81()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_TriplesSameSubject_894_3_113()) {
-    jj_scanpos = xsp;
-    if (jj_3R_TriplesSameSubject_897_3_114()) return true;
-    }
+    if (jj_scan_token(HOURS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_TriplesSameSubject_894_3_113()
+  private boolean jj_3R_BuiltInCall_1635_5_80()
  {
-    if (jj_3R_VarOrTerm_1229_3_126()) return true;
+    if (jj_scan_token(DAY)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_4()
+  private boolean jj_3R_BuiltInCall_1634_5_79()
  {
-    if (jj_scan_token(DOT)) return true;
-    if (jj_3R_TriplesSameSubject_894_3_46()) return true;
+    if (jj_scan_token(MONTH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3_1()
+  private boolean jj_3R_BuiltInCall_1633_5_78()
  {
-    if (jj_3R_BuiltInCall_1435_5_44()) return true;
+    if (jj_scan_token(YEAR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1647_5_143()
+  private boolean jj_3R_BuiltInCall_1631_5_77()
  {
-    if (jj_scan_token(FOLD)) return true;
+    if (jj_scan_token(STRAFTER)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1645_5_142()
+  private boolean jj_3R_BuiltInCall_1629_5_76()
  {
-    if (jj_scan_token(VAR_POP)) return true;
+    if (jj_scan_token(STRBEFORE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1643_5_141()
+  private boolean jj_3R_BuiltInCall_1627_5_75()
  {
-    if (jj_scan_token(VAR_SAMP)) return true;
+    if (jj_scan_token(STRENDS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1625_5_74()
+ {
+    if (jj_scan_token(STRSTARTS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_BuiltInCall_1623_5_73()
+ {
+    if (jj_scan_token(CONTAINS)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1641_5_140()
+  private boolean jj_3R_BuiltInCall_1622_5_72()
  {
-    if (jj_scan_token(VARIANCE)) return true;
+    if (jj_scan_token(ENCODE_FOR_URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1639_5_139()
+  private boolean jj_3R_BuiltInCall_1621_5_71()
  {
-    if (jj_scan_token(STDEV_POP)) return true;
+    if (jj_scan_token(LCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1637_5_138()
+  private boolean jj_3R_BuiltInCall_1620_5_70()
  {
-    if (jj_scan_token(STDEV_SAMP)) return true;
+    if (jj_scan_token(UCASE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExpressionList_869_5_145()
+  private boolean jj_3R_BuiltInCall_1619_5_69()
  {
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_StrReplaceExpression_1734_3_127()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1635_5_137()
+  private boolean jj_3R_BuiltInCall_1618_5_68()
  {
-    if (jj_scan_token(STDEV)) return true;
+    if (jj_scan_token(STRLEN)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExpressionList_866_3_118()
+  private boolean jj_3R_Prologue_72_18_132()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(187)) {
-    jj_scanpos = xsp;
-    if (jj_3R_ExpressionList_869_5_145()) return true;
-    }
+    if (jj_3R_PrefixDecl_81_5_156()) return true;
     return false;
   }
 
-  private boolean jj_3_5()
+  private boolean jj_3R_BuiltInCall_1617_5_67()
  {
-    if (jj_scan_token(SEMICOLON)) return true;
-    if (jj_scan_token(SEPARATOR)) return true;
+    if (jj_3R_SubstringExpression_1722_5_126()) return true;
     return false;
   }
 
-  private boolean jj_3R_QuotedTriple_1242_3_166()
+  private boolean jj_3R_BuiltInCall_1616_5_66()
  {
-    if (jj_scan_token(LT2)) return true;
+    if (jj_scan_token(CONCAT)) return true;
+    if (jj_3R_ExpressionList_903_3_125()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1622_5_136()
+  private boolean jj_3R_BuiltInCall_1615_5_65()
  {
-    if (jj_scan_token(GROUP_CONCAT)) return true;
+    if (jj_scan_token(IDIV)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1620_5_135()
+  private boolean jj_3R_BuiltInCall_1614_5_64()
  {
-    if (jj_scan_token(SAMPLE)) return true;
+    if (jj_scan_token(MOD)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1236_5_156()
+  private boolean jj_3R_PrefixDecl_81_5_156()
  {
-    if (jj_3R_QuotedTriple_1242_3_166()) return true;
+    if (jj_scan_token(PREFIX)) return true;
+    if (jj_scan_token(PNAME_NS)) return true;
+    if (jj_3R_IRIREF_1942_3_169()) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1235_5_155()
+  private boolean jj_3R_BuiltInCall_1613_5_63()
  {
-    if (jj_scan_token(NIL)) return true;
+    if (jj_scan_token(ROUND)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1618_5_134()
+  private boolean jj_3R_BuiltInCall_1612_5_62()
  {
-    if (jj_scan_token(MODE)) return true;
+    if (jj_scan_token(FLOOR)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_18_125()
+  private boolean jj_3R_BuiltInCall_1611_5_61()
  {
-    if (jj_3R_PrefixDecl_81_5_148()) return true;
+    if (jj_scan_token(CEIL)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1234_5_154()
+  private boolean jj_3R_BuiltInCall_1610_5_60()
  {
-    if (jj_3R_BlankNode_1773_3_165()) return true;
+    if (jj_scan_token(ABS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1233_5_153()
+  private boolean jj_3R_BuiltInCall_1609_5_59()
  {
-    if (jj_3R_BooleanLiteral_1740_3_164()) return true;
+    if (jj_scan_token(RAND)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1616_5_133()
+  private boolean jj_3R_BuiltInCall_1607_7_124()
  {
-    if (jj_scan_token(MEDIAN)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(NIL)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1232_5_152()
+  private boolean jj_3R_BaseDecl_76_3_155()
  {
-    if (jj_3R_NumericLiteral_1713_3_163()) return true;
+    if (jj_scan_token(BASE)) return true;
+    if (jj_3R_IRIREF_1942_3_169()) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1231_5_151()
+  private boolean jj_3R_BuiltInCall_1604_7_123()
  {
-    if (jj_3R_RDFLiteral_1702_3_162()) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1614_5_132()
+  private boolean jj_3R_Prologue_72_5_118()
  {
-    if (jj_scan_token(AVG)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_Prologue_72_5_131()) {
+    jj_scanpos = xsp;
+    if (jj_3R_Prologue_72_18_132()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_PrefixDecl_81_5_148()
+  private boolean jj_3R_Prologue_72_5_131()
  {
-    if (jj_scan_token(PREFIX)) return true;
-    if (jj_scan_token(PNAME_NS)) return true;
-    if (jj_3R_IRIREF_1780_3_160()) return true;
+    if (jj_3R_BaseDecl_76_3_155()) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1230_5_150()
+  private boolean jj_3R_BuiltInCall_1603_5_58()
  {
-    if (jj_3R_iri_1758_3_159()) return true;
+    if (jj_scan_token(BNODE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BuiltInCall_1604_7_123()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1607_7_124()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1229_5_149()
+  private boolean jj_3R_Prologue_72_3_47()
  {
-    if (jj_3R_Var_1280_5_161()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_Prologue_72_5_118()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1612_5_131()
+  private boolean jj_3R_BuiltInCall_1601_5_57()
  {
-    if (jj_scan_token(MAX)) return true;
+    if (jj_scan_token(URI)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_VarOrTerm_1229_3_126()
+  private boolean jj_3R_BuiltInCall_1599_5_56()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_VarOrTerm_1229_5_149()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1230_5_150()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1231_5_151()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1232_5_152()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1233_5_153()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1234_5_154()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1235_5_155()) {
-    jj_scanpos = xsp;
-    if (jj_3R_VarOrTerm_1236_5_156()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(IRI)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1610_5_130()
+  private boolean jj_3R_BuiltInCall_1597_5_55()
  {
-    if (jj_scan_token(MIN)) return true;
+    if (jj_scan_token(BOUND)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1608_5_129()
+  private boolean jj_3R_BuiltInCall_1595_5_54()
  {
-    if (jj_scan_token(SUM)) return true;
+    if (jj_scan_token(DTYPE)) return true;
     if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BaseDecl_76_3_147()
+  private boolean jj_3R_BuiltInCall_1593_5_53()
  {
-    if (jj_scan_token(BASE)) return true;
-    if (jj_3R_IRIREF_1780_3_160()) return true;
+    if (jj_scan_token(LANGDIR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_5_112()
+  private boolean jj_3R_BuiltInCall_1590_5_52()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_Prologue_72_5_124()) {
-    jj_scanpos = xsp;
-    if (jj_3R_Prologue_72_18_125()) return true;
-    }
+    if (jj_scan_token(LANGMATCHES)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_5_124()
+  private boolean jj_3R_BuiltInCall_1588_5_51()
  {
-    if (jj_3R_BaseDecl_76_3_147()) return true;
+    if (jj_scan_token(LANG)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Prologue_72_3_45()
+  private boolean jj_3R_BuiltInCall_1586_5_50()
  {
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_Prologue_72_5_112()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_scan_token(STR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1601_5_128()
+  private boolean jj_3R_BuiltInCall_1584_5_49()
  {
-    if (jj_scan_token(COUNT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_Aggregate_1761_3_122()) return true;
     return false;
   }
 
-  private boolean jj_3R_Aggregate_1600_3_115()
+  private boolean jj_3R_BuiltInCall_1584_5_46()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_Aggregate_1601_5_128()) {
+    if (jj_3R_BuiltInCall_1584_5_49()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1586_5_50()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1588_5_51()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1590_5_52()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1593_5_53()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1595_5_54()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1597_5_55()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1599_5_56()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1601_5_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1603_5_58()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1609_5_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1610_5_60()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1611_5_61()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1612_5_62()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1613_5_63()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1614_5_64()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1615_5_65()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1616_5_66()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1617_5_67()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1618_5_68()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1619_5_69()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1620_5_70()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1621_5_71()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1622_5_72()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1623_5_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1625_5_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1627_5_75()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1629_5_76()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1631_5_77()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1633_5_78()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1608_5_129()) {
+    if (jj_3R_BuiltInCall_1634_5_79()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1610_5_130()) {
+    if (jj_3R_BuiltInCall_1635_5_80()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1612_5_131()) {
+    if (jj_3R_BuiltInCall_1636_5_81()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1614_5_132()) {
+    if (jj_3R_BuiltInCall_1637_5_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1616_5_133()) {
+    if (jj_3R_BuiltInCall_1638_5_83()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1618_5_134()) {
+    if (jj_3R_BuiltInCall_1639_5_84()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1620_5_135()) {
+    if (jj_3R_BuiltInCall_1640_5_85()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1622_5_136()) {
+    if (jj_3R_BuiltInCall_1641_5_86()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1635_5_137()) {
+    if (jj_3R_BuiltInCall_1644_5_87()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1637_5_138()) {
+    if (jj_3R_BuiltInCall_1645_5_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1639_5_139()) {
+    if (jj_3R_BuiltInCall_1646_5_89()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1641_5_140()) {
+    if (jj_3R_BuiltInCall_1647_5_90()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1643_5_141()) {
+    if (jj_3R_BuiltInCall_1648_5_91()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1645_5_142()) {
+    if (jj_3R_BuiltInCall_1649_5_92()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1647_5_143()) {
+    if (jj_3R_BuiltInCall_1650_5_93()) {
     jj_scanpos = xsp;
-    if (jj_3R_Aggregate_1667_5_144()) return true;
+    if (jj_3R_BuiltInCall_1651_5_94()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1652_5_95()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1653_5_96()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1655_5_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1662_5_98()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1666_5_99()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1668_5_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1672_5_101()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1674_5_102()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1676_5_103()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1678_5_104()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1680_5_105()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1682_5_106()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1684_5_107()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1686_5_108()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1688_5_109()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1691_5_110()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1692_5_111()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1693_5_112()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1694_5_113()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1696_5_114()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1700_5_115()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1702_5_116()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BuiltInCall_1704_5_117()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
     }
     }
     }
@@ -8297,111 +8942,125 @@ private boolean jj_3R_Aggregate_1600_3_115()
     return false;
   }
 
-  private boolean jj_3R_NotExistsFunc_1590_4_123()
+  private boolean jj_3R_Collection_1189_3_176()
  {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_scan_token(EXISTS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
     return false;
   }
 
-  private boolean jj_3R_ExistsFunc_1584_4_122()
+  private boolean jj_3R_IRIREF_1942_3_169()
  {
-    if (jj_scan_token(EXISTS)) return true;
-    if (jj_3R_GroupGraphPattern_584_3_146()) return true;
+    if (jj_scan_token(IRIref)) return true;
     return false;
   }
 
-  private boolean jj_3R_StrReplaceExpression_1573_3_120()
+  private boolean jj_3R_BlankNode_1938_3_187()
  {
-    if (jj_scan_token(REPLACE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(ANON)) return true;
     return false;
   }
 
-  private boolean jj_3R_SubstringExpression_1561_5_119()
+  private boolean jj_3R_BlankNode_1935_3_186()
  {
-    if (jj_scan_token(SUBSTR)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(BLANK_NODE_LABEL)) return true;
     return false;
   }
 
-  private boolean jj_3R_RegexExpression_1549_5_121()
+  private boolean jj_3R_BlankNode_1935_3_174()
  {
-    if (jj_scan_token(REGEX)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_BlankNode_1935_3_186()) {
+    jj_scanpos = xsp;
+    if (jj_3R_BlankNode_1938_3_187()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1543_5_111()
+  private boolean jj_3R_BlankNodePropertyList_1166_3_177()
  {
-    if (jj_scan_token(OBJECT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(LBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1541_5_110()
+  private boolean jj_3R_PrefixedName_1929_5_197()
  {
-    if (jj_scan_token(PREDICATE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(PNAME_NS)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1539_5_109()
+  private boolean jj_3R_TriplesNode_1162_4_166()
  {
-    if (jj_scan_token(SUBJECT)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_BlankNodePropertyList_1166_3_177()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1537_5_108()
+  private boolean jj_3R_PrefixedName_1926_5_196()
  {
-    if (jj_scan_token(TRIPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(PNAME_LN)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1534_5_106()
+  private boolean jj_3R_TriplesNode_1160_4_134()
  {
-    if (jj_3R_NotExistsFunc_1590_4_123()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_TriplesNode_1160_4_165()) {
+    jj_scanpos = xsp;
+    if (jj_3R_TriplesNode_1162_4_166()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1535_3_107()
+  private boolean jj_3R_TriplesNode_1160_4_165()
  {
-    if (jj_scan_token(IS_TRIPLE)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_Collection_1189_3_176()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_PrefixedName_1926_3_188()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_PrefixedName_1926_5_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_PrefixedName_1929_5_197()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1533_5_105()
+  private boolean jj_3R_iri_1922_3_179()
  {
-    if (jj_3R_ExistsFunc_1584_4_122()) return true;
+    if (jj_3R_PrefixedName_1926_3_188()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1532_5_104()
+  private boolean jj_3R_iri_1920_3_168()
  {
-    if (jj_3R_RegexExpression_1549_5_121()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_iri_1920_3_178()) {
+    jj_scanpos = xsp;
+    if (jj_3R_iri_1922_3_179()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_Collection_1148_3_167()
+  private boolean jj_3R_iri_1920_3_178()
  {
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_IRIREF_1942_3_169()) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1529_5_103()
+  private boolean jj_3R_String_1911_5_192()
  {
-    if (jj_scan_token(IS_NUMERIC)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL_LONG2)) return true;
     return false;
   }
 
-  private boolean jj_3R_BuiltInCall_1527_5_102()
+  private boolean jj_3R_String_1910_5_191()
  {
-    if (jj_scan_token(IS_LITERAL)) return true;
-    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(STRING_LITERAL_LONG1)) return true;
     return false;
   }
 
@@ -8416,7 +9075,7 @@ private boolean jj_3R_BuiltInCall_1527_5_102()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[202];
+  final private int[] jj_la1 = new int[213];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -8436,28 +9095,28 @@ private boolean jj_3R_BuiltInCall_1527_5_102()
 	   jj_la1_init_7();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x1e400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0xc000,0x1c00,0x0,0x0,0x0,0x80000000,0x60000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x0,0xdc00,0xdc00,0x40000000,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x1c00,0xc000,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x81c00,0x1c00,0xdc00,0xfc00,0xc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0xdc00,0x80000000,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
+	   jj_la1_0 = new int[] {0x1e400000,0x200,0x300000,0x300000,0x0,0x1800000,0x1800000,0x1c00,0x0,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0xc000,0x1c00,0x0,0x0,0x0,0x80000000,0x60000000,0xdc00,0x0,0xdc00,0x1c00,0xdc00,0x0,0xdc00,0xdc00,0x0,0xdc00,0xdc00,0x40000000,0x20000000,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x0,0x1c00,0x0,0xfc00,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0x0,0xfc00,0x0,0xfc00,0x0,0x400000,0xfc00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0xc000,0x1c00,0xc000,0x0,0x0,0x1c00,0x0,0x1c00,0xfc00,0xfc00,0x0,0x0,0x1c00,0x800000,0x0,0x0,0x0,0x0,0x0,0xfc00,0x8dc00,0x0,0x8dc00,0x8dc00,0x0,0xfc00,0x88dc00,0x88dc00,0x0,0x88dc00,0x88dc00,0x0,0x0,0x0,0x0,0x0,0x881c00,0x0,0x0,0x0,0x0,0x881c00,0x0,0x81c00,0x81c00,0x81c00,0x81c00,0x0,0x0,0xfc00,0xfc00,0x0,0x0,0x0,0x0,0xfc00,0xfc00,0xfc00,0x0,0xfc00,0xfc00,0xfc00,0xfc00,0x81c00,0x1c00,0x1c00,0xdc00,0xfc00,0xc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdc00,0xdc00,0xdc00,0xdc00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0xdc00,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0xdc00,0x80000000,0x0,0x0,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x1c00,0x1800,0x2000,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x2000000,0xe1fc0000,0xe1fc0000,0xe1fc0000,0x40,0x40,0xc0,0x0,0x0,0x40,0x80,0x40,0x40,0x0,0x0,0x20,0x80,0x4000000,0x8000000,0x0,0x0,0xe1fc0000,0x2000000,0xe1fc0000,0xe1fc0000,0xe1fc0018,0x18,0xe1fc0000,0xe1fc0018,0x18,0xe1fc0000,0xe1fc0018,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x200,0x200,0x220,0x0,0x200,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x183f602,0x0,0x0,0x0,0x0,0x183f602,0x0,0x0,0x4,0x0,0x0,0x0,0x4,0x0,0x4,0x0,0x800,0xe1fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe1fc0000,0xe1fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0xe1fc0000,0x0,0x0,0x0,0x0,0xe1fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe1fc0018,0x0,0xe0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x8000000,0x87f00000,0x87f00000,0x87f00000,0x40,0x40,0xc0,0x0,0x0,0x40,0x80,0x40,0x40,0x0,0x0,0x20,0x80,0x10000000,0x20000000,0x0,0x0,0x87f00000,0x8000000,0x87f00000,0x87f00000,0x87f00018,0x18,0x87f00000,0x87f00018,0x18,0x87f00000,0x87f00018,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x200,0x200,0x220,0x0,0x200,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x60ff602,0x0,0x0,0x0,0x0,0x60ff602,0x0,0x0,0x4,0x0,0x0,0x0,0x4,0x0,0x4,0x0,0x0,0x0,0x800,0x87f00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000000,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87f00000,0x87f00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87f00000,0x0,0x0,0x0,0x0,0x87f00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x87f00018,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0xfcbdbfff,0xfcbdbfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0x0,0xfcbdbfff,0xfcbdbfff,0xfcbdbfff,0x0,0xfcbdbfff,0xfcbdbfff,0x0,0xfcbdbfff,0xfcbdbfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3000000,0x3000000,0x0,0x3000000,0x3000000,0x0,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,0x3000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0xfcbdbfff,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0x0,0x0,0x0,0x0,0xfcbdbfff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfcbdbfff,0x0,0x3fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0xf2f6ffff,0xf2f6ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0x0,0xf2f6ffff,0xf2f6ffff,0xf2f6ffff,0x0,0xf2f6ffff,0xf2f6ffff,0x0,0xf2f6ffff,0xf2f6ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc000000,0xc000000,0x0,0xc000000,0xc000000,0x0,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0xf2f6ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0x0,0x0,0x0,0x0,0xf2f6ffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf2f6ffff,0x0,0xffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_3() {
-	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3000,0x3000,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0xffffffff,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0xc0000,0xffffffff,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xffffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_4() {
-	   jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x7dff,0x7dff,0x7dff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x1dff,0x0,0x1dff,0x1dff,0x1dff,0x0,0x1dff,0x1dff,0x0,0x1dff,0x1dff,0x0,0x0,0x0,0x0,0x0,0x27ff0000,0x27ff0000,0x10000000,0x40000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x0,0x10000,0x30000,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x6000,0x6000,0x6000,0x0,0x0,0x6000,0x0,0x6000,0x0,0x0,0x6000,0x0,0x0,0x6000,0x6000,0x0,0x0,0x10000000,0x0,0x6000,0x0,0x0,0x0,0x6000,0x0,0x6000,0x0,0x0,0x1dff,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x6000,0x0,0x0,0x6000,0x6000,0x6000,0x0,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7dff,0x7dff,0x6000,0x0,0x0,0x0,0x0,0x0,0x1dff,0x0,0x0,0x0,0x0,0x7dff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000,0x0,0x0,0x0,0x0,};
+	   jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x1f7fff,0x1f7fff,0x1f7fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x77fff,0x0,0x77fff,0x77fff,0x77fff,0x0,0x77fff,0x77fff,0x0,0x77fff,0x77fff,0x0,0x0,0x0,0x0,0x0,0xffc00000,0xffc00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0xc00000,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x180000,0x180000,0x180000,0x0,0x0,0x180000,0x0,0x180000,0x0,0x0,0x180000,0x0,0x0,0x180000,0x180000,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x180000,0x0,0x180000,0x0,0x0,0x0,0x0,0x77fff,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x180000,0x0,0x0,0x0,0x0,0x180000,0x180000,0x180000,0x0,0x180000,0x180000,0x180000,0x180000,0x0,0x180000,0x180000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1f7fff,0x1f7fff,0x180000,0x180000,0x0,0x0,0x0,0x0,0x0,0x77fff,0x0,0x0,0x0,0x0,0x1f7fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x77fff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180000,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_5() {
-	   jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e03fe0,0x0,0x3e03fe0,0x3e03fe0,0x3e03fe0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x1e03fe0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x2000000,0x2000000,0x2000000,0x0,0x2000000,0x2000000,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x8,0x0,0x0,0x1,0x3,0x4be03fe0,0x0,0x0,0x4be03fe0,0x4be03fe0,0x4be03fe0,0x10000000,0x0,0x4be03fe0,0x0,0x4be03fe0,0x0,0x0,0x4be03fe0,0x10000000,0x0,0x4be03fe0,0x4be03fe0,0x0,0x10000000,0x0,0xa000000,0x1e03fe0,0x0,0xa000000,0xa000000,0x1e03fe0,0xa000000,0x1e03fe0,0x0,0x0,0x2000000,0x0,0x0,0xa000000,0x0,0xa000000,0x0,0x4be03fe0,0x0,0x0,0x0,0x0,0x0,0x4be03fe0,0x2000000,0x2000000,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x10000000,0x2000000,0x20000020,0x20000000,0x20,0x10000000,0x2000000,0x0,0x0,0x2000000,0x0,0x0,0x42000000,0x42000000,0x4be03fe0,0x4be03fe0,0x0,0x0,0x4be03fe0,0x4be03fe0,0x9e03fe0,0x0,0x1e03fe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f00,0x3f00,0x0,0x0,0x3f00,0x0,0x0,0x3e03fe0,0x3e03fe0,0x1e03fe0,0x0,0x0,0xa000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e03fe0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0xa000000,0x0,0x0,0x3fe0,0xe0,0x700,0x3800,0x0,0x1e00000,0x0,0x0,0x0,};
+	   jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x780ff800,0x0,0xf80ff800,0xf80ff800,0xf80ff800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x780ff800,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x80000000,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x109,0x109,0x4,0x10,0x4,0x4,0x4,0x4,0x4,0x4,0x100,0x0,0x0,0x200,0x0,0x0,0x40,0xc0,0xf80ff800,0x0,0x0,0xf80ff800,0xf80ff800,0xf80ff800,0x0,0x0,0xf80ff800,0x0,0xf80ff800,0x0,0x0,0xf80ff800,0x0,0x0,0xf80ff800,0xf80ff800,0x0,0x0,0x4,0x80000000,0x780ff800,0x0,0x80000000,0x80000000,0x780ff800,0x80000000,0x780ff800,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x80000000,0x0,0xf80ff800,0x0,0x0,0x0,0x0,0x0,0xf80ff800,0x80000000,0x80000000,0x0,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x80000000,0x800,0x0,0x800,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x80000000,0xf80ff800,0xf80ff800,0x0,0x0,0x0,0x0,0xf80ff800,0xf80ff800,0x780ff800,0x0,0x780ff800,0x780ff800,0x780ff800,0x780ff800,0x0,0x780ff800,0x780ff800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfc000,0xfc000,0x0,0x0,0xfc000,0x0,0x0,0xf80ff800,0xf80ff800,0x780ff800,0x780ff800,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf80ff800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x80000000,0x0,0x0,0xff800,0x3800,0x1c000,0xe0000,0x0,0x78000000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_6() {
-	   jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x801,0x0,0x8,0x801,0x801,0x801,0x0,0x8,0x801,0x0,0x801,0x8,0x0,0x801,0x0,0x8,0x801,0x801,0x8,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x800,0x0,0x800,0x4,0x0,0x0,0x0,0x4,0x0,0x4,0x0,0x8,0x801,0x0,0x2,0x0,0x0,0x4,0x801,0x8004000,0x8004000,0x2,0x8004000,0x8004000,0x4,0x4000000,0x8400000,0x8400000,0x40280000,0x8004000,0x0,0x4,0x280004,0x40280000,0x4000,0x4000000,0x8000000,0x8000000,0x0,0x8000000,0x0,0x0,0x801,0x801,0x1000,0x1000,0x801,0x801,0x801,0x0,0x800,0x0,0x1,0x0,0x20000,0x40000,0x3f0,0x3f0,0x180000,0x0,0x600000,0x600000,0x180000,0x600000,0x600000,0x184800,0x800,0x800,0x4,0x4,0x0,0x4,0x4,0x0,0x4,0x4,0x4,0x0,0x384800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,};
+	   jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x4,0x0,0x20000000,0x0,0x4,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50052,0x0,0x200,0x50052,0x50052,0x50052,0x4,0x200,0x50052,0x0,0x50052,0x200,0x0,0x50052,0x4,0x200,0x50052,0x50052,0x200,0x4,0x0,0x2,0x10000,0x0,0x2,0x2,0x10000,0x2,0x10000,0x40,0x40,0x100,0x0,0x0,0x0,0x100,0x2,0x100,0x2,0x200,0x50052,0x0,0x80,0x0,0x0,0x100,0x50052,0x800000,0x800000,0x80,0x800000,0x800000,0x100,0x0,0x40000000,0x40000000,0x28000004,0x800000,0x8,0x108,0x28000100,0x28000004,0x800000,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x50052,0x50052,0x500000,0x500000,0x500000,0x500000,0x50052,0x50052,0x10042,0x400000,0x40040,0x50040,0x40,0x10040,0x0,0x0,0x10000,0x0,0x40,0x0,0x2000000,0x4000000,0xfc00,0xfc00,0x18000000,0x0,0x60000000,0x60000000,0x18000000,0x60000000,0x60000000,0x18810000,0x10000,0x0,0x10000,0x100,0x100,0x2,0x100,0x100,0x0,0x100,0x100,0x100,0x0,0x38810000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x2,0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,};
 	}
 	private static void jj_la1_init_7() {
-	   jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_7 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x8,0x0,0x8,0x8,0x0,0x4,0x8,0x8,0x40,0x8,0x0,0x0,0x0,0x40,0x0,0x4,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
   final private JJCalls[] jj_2_rtns = new JJCalls[5];
   private boolean jj_rescan = false;
@@ -8474,7 +9133,7 @@ public ARQParser(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8489,7 +9148,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8500,7 +9159,7 @@ public ARQParser(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8519,7 +9178,7 @@ public void ReInit(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8529,7 +9188,7 @@ public ARQParser(ARQParserTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8539,7 +9198,7 @@ public void ReInit(ARQParserTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 202; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 213; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -8670,12 +9329,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[235];
+	 boolean[] la1tokens = new boolean[243];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 202; i++) {
+	 for (int i = 0; i < 213; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -8705,7 +9364,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 235; i++) {
+	 for (int i = 0; i < 243; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java
index b641a580b6a..a33a37ffe2d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserBase.java
@@ -101,7 +101,7 @@ protected ElementGroup createQueryPattern(Template t){
     protected ParserProfile parserProfileForCDTs = null;
 
     @Override
-    protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
+    protected Node createLiteralDT(String lexicalForm, String datatypeURI, int line, int column) {
         // CDT literals need to be handled in a special way because their
         // lexical forms may contain blank node identifiers, and the same
         // blank node identifier in different CDT literals within the same
@@ -118,14 +118,14 @@ else if ( CompositeDatatypeMap.uri.equals(datatypeURI) )
         if ( cdtDatatype != null ) {
             ensureParserProfileForCDTs();
             try {
-                return parserProfileForCDTs.createTypedLiteral(lexicalForm, cdtDatatype, 0L, 0L);
+                return parserProfileForCDTs.createTypedLiteral(lexicalForm, cdtDatatype, line, column);
             }
             catch ( DatatypeFormatException ex ) {
                 return createIllformedLiteral(lexicalForm, cdtDatatype);
             }
         }
 
-        return super.createLiteral(lexicalForm, langTag, datatypeURI);
+        return super.createLiteralDT(lexicalForm, datatypeURI, line, column);
     }
 
     protected void ensureParserProfileForCDTs() {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
index d5ef5ce7333..320b7e4c21c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserConstants.java
@@ -31,7 +31,7 @@ public interface ARQParserConstants {
   /** RegularExpression Id. */
   int VAR2 = 15;
   /** RegularExpression Id. */
-  int LANGTAG = 16;
+  int LANG_DIR = 16;
   /** RegularExpression Id. */
   int A2Z = 17;
   /** RegularExpression Id. */
@@ -97,377 +97,393 @@ public interface ARQParserConstants {
   /** RegularExpression Id. */
   int LATERAL = 48;
   /** RegularExpression Id. */
-  int UNFOLD = 49;
+  int SEMIJOIN = 49;
   /** RegularExpression Id. */
-  int TRIPLE = 50;
+  int ANTIJOIN = 50;
   /** RegularExpression Id. */
-  int IS_TRIPLE = 51;
+  int UNFOLD = 51;
   /** RegularExpression Id. */
-  int SUBJECT = 52;
+  int TRIPLE = 52;
   /** RegularExpression Id. */
-  int PREDICATE = 53;
+  int IS_TRIPLE = 53;
   /** RegularExpression Id. */
-  int OBJECT = 54;
+  int SUBJECT = 54;
   /** RegularExpression Id. */
-  int EXISTS = 55;
+  int PREDICATE = 55;
   /** RegularExpression Id. */
-  int NOT = 56;
+  int OBJECT = 56;
   /** RegularExpression Id. */
-  int AS = 57;
+  int EXISTS = 57;
   /** RegularExpression Id. */
-  int GROUP = 58;
+  int NOT = 58;
   /** RegularExpression Id. */
-  int HAVING = 59;
+  int AS = 59;
   /** RegularExpression Id. */
-  int SEPARATOR = 60;
+  int GROUP = 60;
   /** RegularExpression Id. */
-  int AGG = 61;
+  int HAVING = 61;
   /** RegularExpression Id. */
-  int COUNT = 62;
+  int SEPARATOR = 62;
   /** RegularExpression Id. */
-  int MIN = 63;
+  int AGG = 63;
   /** RegularExpression Id. */
-  int MAX = 64;
+  int COUNT = 64;
   /** RegularExpression Id. */
-  int SUM = 65;
+  int MIN = 65;
   /** RegularExpression Id. */
-  int AVG = 66;
+  int MAX = 66;
   /** RegularExpression Id. */
-  int MEDIAN = 67;
+  int SUM = 67;
   /** RegularExpression Id. */
-  int MODE = 68;
+  int AVG = 68;
   /** RegularExpression Id. */
-  int STDEV = 69;
+  int MEDIAN = 69;
   /** RegularExpression Id. */
-  int STDEV_SAMP = 70;
+  int MODE = 70;
   /** RegularExpression Id. */
-  int STDEV_POP = 71;
+  int STDEV = 71;
   /** RegularExpression Id. */
-  int VARIANCE = 72;
+  int STDEV_SAMP = 72;
   /** RegularExpression Id. */
-  int VAR_SAMP = 73;
+  int STDEV_POP = 73;
   /** RegularExpression Id. */
-  int VAR_POP = 74;
+  int VARIANCE = 74;
   /** RegularExpression Id. */
-  int FOLD = 75;
+  int VAR_SAMP = 75;
   /** RegularExpression Id. */
-  int SAMPLE = 76;
+  int VAR_POP = 76;
   /** RegularExpression Id. */
-  int GROUP_CONCAT = 77;
+  int FOLD = 77;
   /** RegularExpression Id. */
-  int FILTER = 78;
+  int SAMPLE = 78;
   /** RegularExpression Id. */
-  int BOUND = 79;
+  int GROUP_CONCAT = 79;
   /** RegularExpression Id. */
-  int COALESCE = 80;
+  int FILTER = 80;
   /** RegularExpression Id. */
-  int IN = 81;
+  int BOUND = 81;
   /** RegularExpression Id. */
-  int IF = 82;
+  int COALESCE = 82;
   /** RegularExpression Id. */
-  int BNODE = 83;
+  int IN = 83;
   /** RegularExpression Id. */
-  int IRI = 84;
+  int IF = 84;
   /** RegularExpression Id. */
-  int URI = 85;
+  int BNODE = 85;
   /** RegularExpression Id. */
-  int CAST = 86;
+  int IRI = 86;
   /** RegularExpression Id. */
-  int CALL = 87;
+  int URI = 87;
   /** RegularExpression Id. */
-  int MULTI = 88;
+  int CAST = 88;
   /** RegularExpression Id. */
-  int SHORTEST = 89;
+  int CALL = 89;
   /** RegularExpression Id. */
-  int STR = 90;
+  int MULTI = 90;
   /** RegularExpression Id. */
-  int STRLANG = 91;
+  int SHORTEST = 91;
   /** RegularExpression Id. */
-  int STRDT = 92;
+  int STR = 92;
   /** RegularExpression Id. */
-  int DTYPE = 93;
+  int STRLANG = 93;
   /** RegularExpression Id. */
-  int LANG = 94;
+  int STRLANGDIR = 94;
   /** RegularExpression Id. */
-  int LANGMATCHES = 95;
+  int STRDT = 95;
   /** RegularExpression Id. */
-  int IS_URI = 96;
+  int DTYPE = 96;
   /** RegularExpression Id. */
-  int IS_IRI = 97;
+  int LANG = 97;
   /** RegularExpression Id. */
-  int IS_BLANK = 98;
+  int LANGMATCHES = 98;
   /** RegularExpression Id. */
-  int IS_LITERAL = 99;
+  int LANGDIR = 99;
   /** RegularExpression Id. */
-  int IS_NUMERIC = 100;
+  int IS_URI = 100;
   /** RegularExpression Id. */
-  int REGEX = 101;
+  int IS_IRI = 101;
   /** RegularExpression Id. */
-  int SAME_TERM = 102;
+  int IS_BLANK = 102;
   /** RegularExpression Id. */
-  int RAND = 103;
+  int IS_LITERAL = 103;
   /** RegularExpression Id. */
-  int ABS = 104;
+  int IS_NUMERIC = 104;
   /** RegularExpression Id. */
-  int CEIL = 105;
+  int HAS_LANG = 105;
   /** RegularExpression Id. */
-  int FLOOR = 106;
+  int HAS_LANGDIR = 106;
   /** RegularExpression Id. */
-  int ROUND = 107;
+  int REGEX = 107;
   /** RegularExpression Id. */
-  int MOD = 108;
+  int SAME_TERM = 108;
   /** RegularExpression Id. */
-  int IDIV = 109;
+  int RAND = 109;
   /** RegularExpression Id. */
-  int CONCAT = 110;
+  int ABS = 110;
   /** RegularExpression Id. */
-  int SUBSTR = 111;
+  int CEIL = 111;
   /** RegularExpression Id. */
-  int STRLEN = 112;
+  int FLOOR = 112;
   /** RegularExpression Id. */
-  int REPLACE = 113;
+  int ROUND = 113;
   /** RegularExpression Id. */
-  int UCASE = 114;
+  int MOD = 114;
   /** RegularExpression Id. */
-  int LCASE = 115;
+  int IDIV = 115;
   /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 116;
+  int CONCAT = 116;
   /** RegularExpression Id. */
-  int CONTAINS = 117;
+  int SUBSTR = 117;
   /** RegularExpression Id. */
-  int STRSTARTS = 118;
+  int STRLEN = 118;
   /** RegularExpression Id. */
-  int STRENDS = 119;
+  int REPLACE = 119;
   /** RegularExpression Id. */
-  int STRBEFORE = 120;
+  int UCASE = 120;
   /** RegularExpression Id. */
-  int STRAFTER = 121;
+  int LCASE = 121;
   /** RegularExpression Id. */
-  int YEAR = 122;
+  int ENCODE_FOR_URI = 122;
   /** RegularExpression Id. */
-  int MONTH = 123;
+  int CONTAINS = 123;
   /** RegularExpression Id. */
-  int DAY = 124;
+  int STRSTARTS = 124;
   /** RegularExpression Id. */
-  int HOURS = 125;
+  int STRENDS = 125;
   /** RegularExpression Id. */
-  int MINUTES = 126;
+  int STRBEFORE = 126;
   /** RegularExpression Id. */
-  int SECONDS = 127;
+  int STRAFTER = 127;
   /** RegularExpression Id. */
-  int TIMEZONE = 128;
+  int YEAR = 128;
   /** RegularExpression Id. */
-  int TZ = 129;
+  int MONTH = 129;
   /** RegularExpression Id. */
-  int ADJUST = 130;
+  int DAY = 130;
   /** RegularExpression Id. */
-  int NOW = 131;
+  int HOURS = 131;
   /** RegularExpression Id. */
-  int UUID = 132;
+  int MINUTES = 132;
   /** RegularExpression Id. */
-  int STRUUID = 133;
+  int SECONDS = 133;
   /** RegularExpression Id. */
-  int VERSION = 134;
+  int TIMEZONE = 134;
   /** RegularExpression Id. */
-  int MD5 = 135;
+  int TZ = 135;
   /** RegularExpression Id. */
-  int SHA1 = 136;
+  int ADJUST = 136;
   /** RegularExpression Id. */
-  int SHA224 = 137;
+  int NOW = 137;
   /** RegularExpression Id. */
-  int SHA256 = 138;
+  int UUID = 138;
   /** RegularExpression Id. */
-  int SHA384 = 139;
+  int STRUUID = 139;
   /** RegularExpression Id. */
-  int SHA512 = 140;
+  int VERSION = 140;
   /** RegularExpression Id. */
-  int TRUE = 141;
+  int MD5 = 141;
   /** RegularExpression Id. */
-  int FALSE = 142;
+  int SHA1 = 142;
   /** RegularExpression Id. */
-  int DATA = 143;
+  int SHA224 = 143;
   /** RegularExpression Id. */
-  int INSERT = 144;
+  int SHA256 = 144;
   /** RegularExpression Id. */
-  int DELETE = 145;
+  int SHA384 = 145;
   /** RegularExpression Id. */
-  int INSERT_DATA = 146;
+  int SHA512 = 146;
   /** RegularExpression Id. */
-  int DELETE_DATA = 147;
+  int TRUE = 147;
   /** RegularExpression Id. */
-  int DELETE_WHERE = 148;
+  int FALSE = 148;
   /** RegularExpression Id. */
-  int LOAD = 149;
+  int DATA = 149;
   /** RegularExpression Id. */
-  int CLEAR = 150;
+  int INSERT = 150;
   /** RegularExpression Id. */
-  int CREATE = 151;
+  int DELETE = 151;
   /** RegularExpression Id. */
-  int ADD = 152;
+  int INSERT_DATA = 152;
   /** RegularExpression Id. */
-  int MOVE = 153;
+  int DELETE_DATA = 153;
   /** RegularExpression Id. */
-  int COPY = 154;
+  int DELETE_WHERE = 154;
   /** RegularExpression Id. */
-  int META = 155;
+  int LOAD = 155;
   /** RegularExpression Id. */
-  int SILENT = 156;
+  int CLEAR = 156;
   /** RegularExpression Id. */
-  int DROP = 157;
+  int CREATE = 157;
   /** RegularExpression Id. */
-  int INTO = 158;
+  int ADD = 158;
   /** RegularExpression Id. */
-  int TO = 159;
+  int MOVE = 159;
   /** RegularExpression Id. */
-  int DFT = 160;
+  int COPY = 160;
   /** RegularExpression Id. */
-  int ALL = 161;
+  int META = 161;
   /** RegularExpression Id. */
-  int WITH = 162;
+  int SILENT = 162;
   /** RegularExpression Id. */
-  int USING = 163;
+  int DROP = 163;
   /** RegularExpression Id. */
-  int DIGITS = 164;
+  int INTO = 164;
   /** RegularExpression Id. */
-  int INTEGER = 165;
+  int TO = 165;
   /** RegularExpression Id. */
-  int DECIMAL = 166;
+  int DFT = 166;
   /** RegularExpression Id. */
-  int DOUBLE = 167;
+  int ALL = 167;
   /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 168;
+  int WITH = 168;
   /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 169;
+  int USING = 169;
   /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 170;
+  int DIGITS = 170;
   /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 171;
+  int INTEGER = 171;
   /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 172;
+  int DECIMAL = 172;
   /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 173;
+  int DOUBLE = 173;
   /** RegularExpression Id. */
-  int EXPONENT = 174;
+  int INTEGER_POSITIVE = 174;
   /** RegularExpression Id. */
-  int QUOTE_3D = 175;
+  int DECIMAL_POSITIVE = 175;
   /** RegularExpression Id. */
-  int QUOTE_3S = 176;
+  int DOUBLE_POSITIVE = 176;
   /** RegularExpression Id. */
-  int ECHAR = 177;
+  int INTEGER_NEGATIVE = 177;
   /** RegularExpression Id. */
-  int UCHAR = 178;
+  int DECIMAL_NEGATIVE = 178;
   /** RegularExpression Id. */
-  int UCHAR4 = 179;
+  int DOUBLE_NEGATIVE = 179;
   /** RegularExpression Id. */
-  int UCHAR8 = 180;
+  int EXPONENT = 180;
   /** RegularExpression Id. */
-  int STRING_LITERAL1 = 181;
+  int QUOTE_3D = 181;
   /** RegularExpression Id. */
-  int STRING_LITERAL2 = 182;
+  int QUOTE_3S = 182;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 183;
+  int ECHAR = 183;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 184;
+  int UCHAR = 184;
   /** RegularExpression Id. */
-  int LPAREN = 185;
+  int UCHAR4 = 185;
   /** RegularExpression Id. */
-  int RPAREN = 186;
+  int UCHAR8 = 186;
   /** RegularExpression Id. */
-  int NIL = 187;
+  int STRING_LITERAL1 = 187;
   /** RegularExpression Id. */
-  int LBRACE = 188;
+  int STRING_LITERAL2 = 188;
   /** RegularExpression Id. */
-  int RBRACE = 189;
+  int STRING_LITERAL_LONG1 = 189;
   /** RegularExpression Id. */
-  int LBRACKET = 190;
+  int STRING_LITERAL_LONG2 = 190;
   /** RegularExpression Id. */
-  int RBRACKET = 191;
+  int LPAREN = 191;
   /** RegularExpression Id. */
-  int ANON = 192;
+  int RPAREN = 192;
   /** RegularExpression Id. */
-  int SEMICOLON = 193;
+  int NIL = 193;
   /** RegularExpression Id. */
-  int COMMA = 194;
+  int LBRACE = 194;
   /** RegularExpression Id. */
-  int DOT = 195;
+  int RBRACE = 195;
   /** RegularExpression Id. */
-  int EQ = 196;
+  int LBRACKET = 196;
   /** RegularExpression Id. */
-  int NE = 197;
+  int RBRACKET = 197;
   /** RegularExpression Id. */
-  int GT = 198;
+  int ANON = 198;
   /** RegularExpression Id. */
-  int LT = 199;
+  int SEMICOLON = 199;
   /** RegularExpression Id. */
-  int LE = 200;
+  int COMMA = 200;
   /** RegularExpression Id. */
-  int GE = 201;
+  int DOT = 201;
   /** RegularExpression Id. */
-  int GT2 = 202;
+  int EQ = 202;
   /** RegularExpression Id. */
-  int LT2 = 203;
+  int NE = 203;
   /** RegularExpression Id. */
-  int L_ANN = 204;
+  int GT = 204;
   /** RegularExpression Id. */
-  int R_ANN = 205;
+  int LT = 205;
   /** RegularExpression Id. */
-  int BANG = 206;
+  int LE = 206;
   /** RegularExpression Id. */
-  int TILDE = 207;
+  int GE = 207;
   /** RegularExpression Id. */
-  int COLON = 208;
+  int L_TRIPLE = 208;
   /** RegularExpression Id. */
-  int SC_OR = 209;
+  int R_TRIPLE = 209;
   /** RegularExpression Id. */
-  int SC_AND = 210;
+  int LT2 = 210;
   /** RegularExpression Id. */
-  int PLUS = 211;
+  int GT2 = 211;
   /** RegularExpression Id. */
-  int MINUS = 212;
+  int L_ANN = 212;
   /** RegularExpression Id. */
-  int STAR = 213;
+  int R_ANN = 213;
   /** RegularExpression Id. */
-  int SLASH = 214;
+  int TILDE = 214;
   /** RegularExpression Id. */
-  int DATATYPE = 215;
+  int BANG = 215;
   /** RegularExpression Id. */
-  int AT = 216;
+  int COLON = 216;
   /** RegularExpression Id. */
-  int ASSIGN = 217;
+  int SC_OR = 217;
   /** RegularExpression Id. */
-  int VBAR = 218;
+  int SC_AND = 218;
   /** RegularExpression Id. */
-  int CARAT = 219;
+  int PLUS = 219;
   /** RegularExpression Id. */
-  int FPATH = 220;
+  int MINUS = 220;
   /** RegularExpression Id. */
-  int RPATH = 221;
+  int STAR = 221;
   /** RegularExpression Id. */
-  int QMARK = 222;
+  int SLASH = 222;
   /** RegularExpression Id. */
-  int SURROGATE_PAIR = 223;
+  int DATATYPE = 223;
   /** RegularExpression Id. */
-  int PN_CHARS_BASE = 224;
+  int AT = 224;
   /** RegularExpression Id. */
-  int PN_CHARS_U = 225;
+  int ASSIGN = 225;
   /** RegularExpression Id. */
-  int PN_CHARS = 226;
+  int VBAR = 226;
   /** RegularExpression Id. */
-  int PN_PREFIX = 227;
+  int CARAT = 227;
   /** RegularExpression Id. */
-  int PN_LOCAL = 228;
+  int FPATH = 228;
   /** RegularExpression Id. */
-  int VARNAME = 229;
+  int RPATH = 229;
   /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 230;
+  int QMARK = 230;
   /** RegularExpression Id. */
-  int PLX = 231;
+  int SURROGATE_PAIR = 231;
   /** RegularExpression Id. */
-  int HEX = 232;
+  int PN_CHARS_BASE = 232;
   /** RegularExpression Id. */
-  int PERCENT = 233;
+  int PN_CHARS_U = 233;
   /** RegularExpression Id. */
-  int UNKNOWN = 234;
+  int PN_CHARS = 234;
+  /** RegularExpression Id. */
+  int PN_PREFIX = 235;
+  /** RegularExpression Id. */
+  int PN_LOCAL = 236;
+  /** RegularExpression Id. */
+  int VARNAME = 237;
+  /** RegularExpression Id. */
+  int PN_LOCAL_ESC = 238;
+  /** RegularExpression Id. */
+  int PLX = 239;
+  /** RegularExpression Id. */
+  int HEX = 240;
+  /** RegularExpression Id. */
+  int PERCENT = 241;
+  /** RegularExpression Id. */
+  int UNKNOWN = 242;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -490,7 +506,7 @@ public interface ARQParserConstants {
     "<BLANK_NODE_LABEL>",
     "<VAR1>",
     "<VAR2>",
-    "<LANGTAG>",
+    "<LANG_DIR>",
     "<A2Z>",
     "<A2ZN>",
     "\"a\"",
@@ -522,7 +538,9 @@ public interface ARQParserConstants {
     "\"bind\"",
     "\"service\"",
     "\"LET\"",
-    "\"LATERAL\"",
+    "\"lateral\"",
+    "\"semijoin\"",
+    "\"antijoin\"",
     "\"unfold\"",
     "\"TRIPLE\"",
     "\"isTRIPLE\"",
@@ -566,15 +584,19 @@ public interface ARQParserConstants {
     "\"shortest\"",
     "\"str\"",
     "\"strlang\"",
+    "\"strlangdir\"",
     "\"strdt\"",
     "\"datatype\"",
     "\"lang\"",
     "\"langmatches\"",
+    "\"langdir\"",
     "\"isURI\"",
     "\"isIRI\"",
     "\"isBlank\"",
     "\"isLiteral\"",
     "\"isNumeric\"",
+    "\"hasLang\"",
+    "\"hasLangDir\"",
     "\"regex\"",
     "\"sameTerm\"",
     "\"RAND\"",
@@ -676,12 +698,14 @@ public interface ARQParserConstants {
     "\"<\"",
     "\"<=\"",
     "\">=\"",
-    "\">>\"",
+    "\"<<(\"",
+    "\")>>\"",
     "\"<<\"",
+    "\">>\"",
     "\"{|\"",
     "\"|}\"",
-    "\"!\"",
     "\"~\"",
+    "\"!\"",
     "\":\"",
     "\"||\"",
     "\"&&\"",
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
index f5eb534acb4..c291510a484 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
@@ -48,164 +48,164 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 1;
          return jjMoveNfa_0(0, 0);
       case 33:
-         jjmatchedKind = 206;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x20L);
+         jjmatchedKind = 215;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x800L);
       case 38:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x40000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4000000L);
       case 40:
-         jjmatchedKind = 185;
+         jjmatchedKind = 191;
          return jjMoveNfa_0(0, 0);
       case 41:
-         jjmatchedKind = 186;
-         return jjMoveNfa_0(0, 0);
+         jjmatchedKind = 192;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x20000L);
       case 42:
-         jjmatchedKind = 213;
+         jjmatchedKind = 221;
          return jjMoveNfa_0(0, 0);
       case 43:
-         jjmatchedKind = 211;
+         jjmatchedKind = 219;
          return jjMoveNfa_0(0, 0);
       case 44:
-         jjmatchedKind = 194;
+         jjmatchedKind = 200;
          return jjMoveNfa_0(0, 0);
       case 45:
-         jjmatchedKind = 212;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x10000000L);
+         jjmatchedKind = 220;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x1000000000L);
       case 46:
-         jjmatchedKind = 195;
+         jjmatchedKind = 201;
          return jjMoveNfa_0(0, 0);
       case 47:
-         jjmatchedKind = 214;
+         jjmatchedKind = 222;
          return jjMoveNfa_0(0, 0);
       case 58:
-         jjmatchedKind = 208;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2000000L);
+         jjmatchedKind = 216;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x200000000L);
       case 59:
-         jjmatchedKind = 193;
+         jjmatchedKind = 199;
          return jjMoveNfa_0(0, 0);
       case 60:
-         jjmatchedKind = 199;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x20000900L);
+         jjmatchedKind = 205;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2000054000L);
       case 61:
-         jjmatchedKind = 196;
+         jjmatchedKind = 202;
          return jjMoveNfa_0(0, 0);
       case 62:
-         jjmatchedKind = 198;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x600L);
+         jjmatchedKind = 204;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x88000L);
       case 63:
-         jjmatchedKind = 222;
+         jjmatchedKind = 230;
          return jjMoveNfa_0(0, 0);
       case 64:
-         jjmatchedKind = 216;
+         jjmatchedKind = 224;
          return jjMoveNfa_0(0, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x2200010810000000L, 0x10000000004L, 0x201000004L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8804010810000000L, 0x400000000010L, 0x8040000100L, 0x0L);
       case 66:
-         return jjMoveStringLiteralDfa1_0(0x200100100000L, 0x88000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200100100000L, 0x220000L, 0x0L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x4000000008000000L, 0x20420000c10000L, 0x4c00000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x810800003040001L, 0x130000000L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x1004800000L, 0x1000000020000000L, 0x120028000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1004800000L, 0x100000000L, 0x4800a00004L, 0x0L);
       case 69:
-         return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x10000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000000L, 0x400000000000000L, 0x0L, 0x0L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x40000004800L, 0x4000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x1000000012000L, 0x100000L, 0x0L);
       case 71:
-         return jjMoveStringLiteralDfa1_0(0x400020000000000L, 0x2000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000020000000000L, 0x8000L, 0x0L, 0x0L);
       case 72:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x2000000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x60000000000L, 0x8L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x201f00160000L, 0x40010000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20000000000000L, 0x801f000580000L, 0x1000400000L, 0x0L);
       case 74:
          return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L, 0x0L, 0x0L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x1800020000000L, 0x80000c0000000L, 0x200000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1800020000000L, 0x200000e00000000L, 0x8000000L, 0x0L);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0x8000100000000000L, 0x4800100001000019L, 0xa000080L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000L, 0x4000004000066L, 0x280002012L, 0x0L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x100002000000000L, 0x0L, 0x8L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400002000000000L, 0x0L, 0x200L, 0x0L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x400400c0000000L, 0x0L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000400c0000000L, 0x0L, 0x0L, 0x0L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x20000000200000L, 0x0L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000200000L, 0x0L, 0x0L, 0x0L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x208a000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x82280000000000L, 0x0L, 0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x1010400000400000L, 0x83c180401e0010e2L, 0x10001f20L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4042400000400000L, 0xf0601000f8004388L, 0x40007c820L, 0x0L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x0L, 0x80002003L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x0L, 0x20000800c0L, 0x0L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x2080400000000L, 0x4000000200000L, 0x800000010L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8080400000000L, 0x100000000800000L, 0x20000000400L, 0x0L);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x700L, 0x40L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x1c00L, 0x1000L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L, 0x400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L, 0x10000000000L, 0x0L);
       case 89:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1L, 0x0L);
       case 91:
-         jjmatchedKind = 190;
+         jjmatchedKind = 196;
          return jjMoveNfa_0(0, 0);
       case 93:
-         jjmatchedKind = 191;
+         jjmatchedKind = 197;
          return jjMoveNfa_0(0, 0);
       case 94:
-         jjmatchedKind = 219;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x800000L);
+         jjmatchedKind = 227;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x80000000L);
       case 97:
          jjmatchedKind = 19;
-         return jjMoveStringLiteralDfa1_0(0x2200010810000000L, 0x10000000004L, 0x201000004L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8804010810000000L, 0x400000000010L, 0x8040000100L, 0x0L);
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x200100100000L, 0x88000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200100100000L, 0x220000L, 0x0L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x4000000008000000L, 0x20420000c10000L, 0x4c00000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x810800003040001L, 0x130000000L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x1004800000L, 0x1000000020000000L, 0x120028000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1004800000L, 0x100000000L, 0x4800a00004L, 0x0L);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x80000000000000L, 0x10000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000000L, 0x400000000000000L, 0x0L, 0x0L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x40000004800L, 0x4000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x1000000012000L, 0x100000L, 0x0L);
       case 103:
-         return jjMoveStringLiteralDfa1_0(0x400020000000000L, 0x2000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000020000000000L, 0x8000L, 0x0L, 0x0L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x2000000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L, 0x60000000000L, 0x8L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x201f00160000L, 0x40010000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20000000000000L, 0x801f000580000L, 0x1000400000L, 0x0L);
       case 106:
          return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L, 0x0L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x1800020000000L, 0x80000c0000000L, 0x200000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1800020000000L, 0x200000e00000000L, 0x8000000L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0x8000100000000000L, 0x4800100001000019L, 0xa000080L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000L, 0x4000004000066L, 0x280002012L, 0x0L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x100002000000000L, 0x0L, 0x8L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400002000000000L, 0x0L, 0x200L, 0x0L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x400400c0000000L, 0x0L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000400c0000000L, 0x0L, 0x0L, 0x0L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x20000000200000L, 0x0L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x80000000200000L, 0x0L, 0x0L, 0x0L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x208a000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x82280000000000L, 0x0L, 0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x1010400000400000L, 0x83c180401e0010e2L, 0x10001f20L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4042400000400000L, 0xf0601000f8004388L, 0x40007c820L, 0x0L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x0L, 0x80002003L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x0L, 0x20000800c0L, 0x0L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x2080400000000L, 0x4000000200000L, 0x800000010L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8080400000000L, 0x100000000800000L, 0x20000000400L, 0x0L);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x700L, 0x40L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x1c00L, 0x1000L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L, 0x400000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L, 0x10000000000L, 0x0L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1L, 0x0L);
       case 123:
-         jjmatchedKind = 188;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x1000L);
+         jjmatchedKind = 194;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x100000L);
       case 124:
-         jjmatchedKind = 218;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x22000L);
+         jjmatchedKind = 226;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2200000L);
       case 125:
-         jjmatchedKind = 189;
+         jjmatchedKind = 195;
          return jjMoveNfa_0(0, 0);
       case 126:
-         jjmatchedKind = 207;
+         jjmatchedKind = 214;
          return jjMoveNfa_0(0, 0);
       case 65279:
          jjmatchedKind = 9;
@@ -222,118 +222,118 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
    switch(curChar)
    {
       case 38:
-         if ((active3 & 0x40000L) != 0L)
+         if ((active3 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 210;
+            jjmatchedKind = 218;
             jjmatchedPos = 1;
          }
          break;
       case 45:
-         if ((active3 & 0x20000000L) != 0L)
+         if ((active3 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 221;
+            jjmatchedKind = 229;
             jjmatchedPos = 1;
          }
          break;
       case 60:
-         if ((active3 & 0x800L) != 0L)
+         if ((active3 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 203;
+            jjmatchedKind = 210;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0L, active3, 0x10000L);
       case 61:
-         if ((active3 & 0x20L) != 0L)
+         if ((active3 & 0x800L) != 0L)
          {
-            jjmatchedKind = 197;
+            jjmatchedKind = 203;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x100L) != 0L)
+         else if ((active3 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 200;
+            jjmatchedKind = 206;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x200L) != 0L)
+         else if ((active3 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 201;
+            jjmatchedKind = 207;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x2000000L) != 0L)
+         else if ((active3 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 217;
+            jjmatchedKind = 225;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active3 & 0x400L) != 0L)
+         if ((active3 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 202;
+            jjmatchedKind = 211;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x10000000L) != 0L)
+         else if ((active3 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 220;
+            jjmatchedKind = 228;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0L, active3, 0x20000L);
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x801002200100000L, active1, 0x100000c0e0c01701L, active2, 0xc000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2001002200100000L, active1, 0x360f03005c04L, active2, 0x300004L, active3, 0L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0x10000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x400000000000L, active2, 0L, active3, 0L);
       case 67:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc000000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000000000L, active2, 0L, active3, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000000L, active2, 0x1000084L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000000000000L, active2, 0x40002100L, active3, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000c01005400000L, active1, 0x8402022000000008L, active2, 0x108020040L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4002c01005400000L, active1, 0x80880000000020L, active2, 0x4200801021L, active3, 0L);
       case 70:
-         if ((active1 & 0x40000L) != 0L)
+         if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 84;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L, active2, 0L, active3, 0L);
       case 71:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L, active1, 0x2000000L, active2, 0x1f00L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L, active1, 0x8000000L, active2, 0x7c000L, active3, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000300020800000L, active1, 0x4000000000004000L, active2, 0x410000001L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x300020800000L, active1, 0x10002L, active2, 0x10400000050L, active3, 0L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000000L, active2, 0x200400000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000000L, active2, 0x8010000000L, active3, 0L);
       case 78:
-         if ((active1 & 0x20000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 83;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2090400000000L, active1, 0x10000000080000L, active2, 0x40010000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc090400000000L, active1, 0x400000000200000L, active2, 0x1000400000L, active3, 0L);
       case 79:
-         if ((active2 & 0x80000000L) != 0L)
+         if ((active2 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 159;
+            jjmatchedKind = 165;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4100000008000000L, active1, 0x2820580000018810L, active2, 0x6200008L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000008000000L, active1, 0x816000000062041L, active2, 0x18800020aL, active3, 0L);
       case 80:
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x424024080200000L, active1, 0x302000L, active2, 0x20802000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1090024080200000L, active1, 0xc08000L, active2, 0x820080000L, active3, 0L);
       case 83:
-         if ((active0 & 0x200000000000000L) != 0L)
+         if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 59;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000812000000L, active1, 0x1f00000000L, active2, 0x800000000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000812000000L, active1, 0x1f000000000L, active2, 0x20000000000L, active3, 0L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3c100001c0000e0L, active2, 0x20L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xf0400000f0000380L, active2, 0x800L, active3, 0L);
       case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0x800001000002L, active2, 0x10L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0x20000004000008L, active2, 0x400L, active3, 0L);
       case 86:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10L, active2, 0L, active3, 0L);
       case 88:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 89:
          if ((active0 & 0x100000000L) != 0L)
          {
@@ -342,77 +342,77 @@ else if ((active3 & 0x10000000L) != 0L)
          }
          break;
       case 90:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 135;
             jjmatchedPos = 1;
          }
          break;
       case 94:
-         if ((active3 & 0x800000L) != 0L)
+         if ((active3 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 215;
+            jjmatchedKind = 223;
             jjmatchedPos = 1;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x801002200100000L, active1, 0x100000c0e0c01701L, active2, 0xc000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2001002200100000L, active1, 0x360f03005c04L, active2, 0x300004L, active3, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0x10000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0x400000000000L, active2, 0L, active3, 0L);
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xc000000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x300000000000000L, active2, 0L, active3, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000000L, active2, 0x1000084L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000000000000L, active2, 0x40002100L, active3, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000c01005400000L, active1, 0x8402022000000008L, active2, 0x108020040L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4002c01005400000L, active1, 0x80880000000020L, active2, 0x4200801021L, active3, 0L);
       case 102:
-         if ((active1 & 0x40000L) != 0L)
+         if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 84;
             jjmatchedPos = 1;
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L, active2, 0L, active3, 0L);
       case 103:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L, active1, 0x2000000L, active2, 0x1f00L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L, active1, 0x8000000L, active2, 0x7c000L, active3, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000300020800000L, active1, 0x4000000000004000L, active2, 0x410000001L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x300020800000L, active1, 0x10002L, active2, 0x10400000050L, active3, 0L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000000L, active2, 0x200400000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000000000000L, active2, 0x8010000000L, active3, 0L);
       case 110:
-         if ((active1 & 0x20000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 83;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2090400000000L, active1, 0x10000000080000L, active2, 0x40010000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc090400000000L, active1, 0x400000000200000L, active2, 0x1000400000L, active3, 0L);
       case 111:
-         if ((active2 & 0x80000000L) != 0L)
+         if ((active2 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 159;
+            jjmatchedKind = 165;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4100000008000000L, active1, 0x2820580000018810L, active2, 0x6200008L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000008000000L, active1, 0x816000000062041L, active2, 0x18800020aL, active3, 0L);
       case 112:
          return jjMoveStringLiteralDfa2_0(active0, 0x40000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x424024080200000L, active1, 0x302000L, active2, 0x20802000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1090024080200000L, active1, 0xc08000L, active2, 0x820080000L, active3, 0L);
       case 115:
-         if ((active0 & 0x200000000000000L) != 0L)
+         if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 57;
+            jjmatchedKind = 59;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000812000000L, active1, 0x1f00000000L, active2, 0x800000000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000812000000L, active1, 0x1f000000000L, active2, 0x20000000000L, active3, 0L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3c100001c0000e0L, active2, 0x20L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xf0400000f0000380L, active2, 0x800L, active3, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000000L, active1, 0x800001000002L, active2, 0x10L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0x20000004000008L, active2, 0x400L, active3, 0L);
       case 118:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10L, active2, 0L, active3, 0L);
       case 120:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000000000L, active1, 0L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 121:
          if ((active0 & 0x100000000L) != 0L)
          {
@@ -421,28 +421,28 @@ else if ((active3 & 0x10000000L) != 0L)
          }
          break;
       case 122:
-         if ((active2 & 0x2L) != 0L)
+         if ((active2 & 0x80L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 135;
             jjmatchedPos = 1;
          }
          break;
       case 124:
-         if ((active3 & 0x1000L) != 0L)
+         if ((active3 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 204;
+            jjmatchedKind = 212;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x20000L) != 0L)
+         else if ((active3 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 209;
+            jjmatchedKind = 217;
             jjmatchedPos = 1;
          }
          break;
       case 125:
-         if ((active3 & 0x2000L) != 0L)
+         if ((active3 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 205;
+            jjmatchedKind = 213;
             jjmatchedPos = 1;
          }
          break;
@@ -460,71 +460,85 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
    }
    switch(curChar)
    {
+      case 40:
+         if ((active3 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 208;
+            jjmatchedPos = 2;
+         }
+         break;
       case 53:
-         if ((active2 & 0x80L) != 0L)
+         if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 141;
+            jjmatchedPos = 2;
+         }
+         break;
+      case 62:
+         if ((active3 & 0x20000L) != 0L)
+         {
+            jjmatchedKind = 209;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40c000000010000L, active2, 0x201f00L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x300000000040000L, active2, 0x807c001L, active3, 0L);
       case 66:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x800400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x20004000000000L, active2, 0L, active3, 0L);
       case 67:
          if ((active0 & 0x800000000L) != 0L)
          {
             jjmatchedKind = 35;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8010000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400000000000000L, active2, 0x20L, active3, 0L);
       case 68:
          if ((active0 & 0x10000000000L) != 0L)
          {
             jjmatchedKind = 40;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x100000000000L) != 0L)
+         else if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 114;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x1000000L) != 0L)
+         else if ((active2 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 152;
+            jjmatchedKind = 158;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x481000000L, active1, 0xf8L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x481000000L, active1, 0x3e0L, active2, 0L, active3, 0L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20008000200000L, active1, 0L, active2, 0xc00000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80008000200000L, active1, 0L, active2, 0x30000000L, active3, 0L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000040000000L, active1, 0L, active2, 0x100000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000040000000L, active1, 0L, active2, 0x4000000000L, active3, 0L);
       case 71:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 63;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000000L, active2, 0L, active3, 0L);
       case 73:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 86;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 87;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x84080000000000L, active1, 0x220200000000L, active2, 0x800000010L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x210080000000000L, active1, 0x8802000000000L, active2, 0x20000000400L, active3, 0L);
       case 74:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x4L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0L, active2, 0x100L, active3, 0L);
       case 75:
          if ((active0 & 0x10000000L) != 0L)
          {
@@ -533,139 +547,139 @@ else if ((active1 & 0x200000L) != 0L)
          }
          break;
       case 76:
-         if ((active2 & 0x200000000L) != 0L)
+         if ((active2 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 161;
+            jjmatchedKind = 167;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200400000L, active1, 0x801804800L, active2, 0x10024000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200400000L, active1, 0x8006012000L, active2, 0x400900000L, active3, 0L);
       case 77:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2020000000L, active1, 0x4000001000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2002020000000L, active1, 0x100000004000L, active2, 0x40L, active3, 0L);
       case 78:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 65;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x300008000000L, active1, 0x48204090c0000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x300008000000L, active1, 0x810210e00000000L, active2, 0x12L, active3, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400004002000000L, active1, 0x40002082000L, active2, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000004002000000L, active1, 0x1000008208000L, active2, 0x800000000L, active3, 0L);
       case 80:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0x2000000000000L, active2, 0x4000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0x80000000000000L, active2, 0x100000000L, active3, 0L);
       case 82:
-         if ((active1 & 0x4000000L) != 0L)
+         if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 92;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0x3c1000018000700L, active2, 0x60L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0xf0400000e0001c00L, active2, 0x1800L, active3, 0L);
       case 83:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 110;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1004900000L, active1, 0x400000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1004900000L, active1, 0x60001000000L, active2, 0x400000L, active3, 0L);
       case 84:
          if ((active0 & 0x800000000000L) != 0L)
          {
             jjmatchedKind = 47;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x100000000000000L) != 0L)
+         else if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x9040000000000L, active1, 0x20000000L, active2, 0x448008000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x25040000000000L, active1, 0x100000000L, active2, 0x11200200000L, active3, 0L);
       case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0x2000080100008000L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2001000020001L, active2, 0x80008L, active3, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0L, active2, 0x2000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0L, active2, 0x80000000L, active3, 0L);
       case 87:
-         if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 137;
             jjmatchedPos = 2;
          }
          break;
       case 88:
-         if ((active1 & 0x1L) != 0L)
+         if ((active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 66;
             jjmatchedPos = 2;
          }
          break;
       case 89:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 130;
             jjmatchedPos = 2;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x40c000000010000L, active2, 0x201f00L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000000000L, active1, 0x300000000040000L, active2, 0x807c001L, active3, 0L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000000L, active1, 0x800400000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x20004000000000L, active2, 0L, active3, 0L);
       case 99:
          if ((active0 & 0x800000000L) != 0L)
          {
             jjmatchedKind = 35;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8010000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400000000000000L, active2, 0x20L, active3, 0L);
       case 100:
          if ((active0 & 0x10000000000L) != 0L)
          {
             jjmatchedKind = 40;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x100000000000L) != 0L)
+         else if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 114;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x1000000L) != 0L)
+         else if ((active2 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 152;
+            jjmatchedKind = 158;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x481000000L, active1, 0xf8L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x481000000L, active1, 0x3e0L, active2, 0L, active3, 0L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20008000200000L, active1, 0L, active2, 0xc00000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80008000200000L, active1, 0L, active2, 0x30000000L, active3, 0L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000040000000L, active1, 0L, active2, 0x100000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000040000000L, active1, 0L, active2, 0x4000000000L, active3, 0L);
       case 103:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 63;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x4L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 66;
+            jjmatchedKind = 68;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000000L, active2, 0L, active3, 0L);
       case 105:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 86;
             jjmatchedPos = 2;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 87;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x84080000000000L, active1, 0x220200000000L, active2, 0x800000010L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x210080000000000L, active1, 0x8802000000000L, active2, 0x20000000400L, active3, 0L);
       case 106:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x4L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0L, active2, 0x100L, active3, 0L);
       case 107:
          if ((active0 & 0x10000000L) != 0L)
          {
@@ -674,78 +688,78 @@ else if ((active1 & 0x200000L) != 0L)
          }
          break;
       case 108:
-         if ((active2 & 0x200000000L) != 0L)
+         if ((active2 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 161;
+            jjmatchedKind = 167;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x200400000L, active1, 0x801804800L, active2, 0x10024000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200400000L, active1, 0x8006012000L, active2, 0x400900000L, active3, 0L);
       case 109:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 67;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2020000000L, active1, 0x4000001000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2002020000000L, active1, 0x100000004000L, active2, 0x40L, active3, 0L);
       case 110:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 65;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x300008000000L, active1, 0x48204090c0000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x300008000000L, active1, 0x810210e00000000L, active2, 0x12L, active3, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400004002000000L, active1, 0x40002082000L, active2, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000004002000000L, active1, 0x1000008208000L, active2, 0x800000000L, active3, 0L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L, active1, 0x2000000000000L, active2, 0x4000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0x80000000000000L, active2, 0x100000000L, active3, 0L);
       case 114:
-         if ((active1 & 0x4000000L) != 0L)
+         if ((active1 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 92;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0x3c1000018000700L, active2, 0x60L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000000000L, active1, 0xf0400000e0001c00L, active2, 0x1800L, active3, 0L);
       case 115:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 110;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1004900000L, active1, 0x400000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1004900000L, active1, 0x60001000000L, active2, 0x400000L, active3, 0L);
       case 116:
          if ((active0 & 0x800000000000L) != 0L)
          {
             jjmatchedKind = 47;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x100000000000000L) != 0L)
+         else if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x9040000000000L, active1, 0x20000000L, active2, 0x448008000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x25040000000000L, active1, 0x100000000L, active2, 0x11200200000L, active3, 0L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0x2000080100008000L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2001000020001L, active2, 0x80008L, active3, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0L, active2, 0x2000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0L, active2, 0x80000000L, active3, 0L);
       case 119:
-         if ((active2 & 0x8L) != 0L)
+         if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 131;
+            jjmatchedKind = 137;
             jjmatchedPos = 2;
          }
          break;
       case 120:
-         if ((active1 & 0x1L) != 0L)
+         if ((active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 64;
+            jjmatchedKind = 66;
             jjmatchedPos = 2;
          }
          break;
       case 121:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 130;
             jjmatchedPos = 2;
          }
          break;
@@ -754,8 +768,8 @@ else if ((active0 & 0x100000000000000L) != 0L)
    }
    return jjMoveNfa_0(0, 2);
 }
-private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2){
-   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2, long old3, long active3){
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2) | (active3 &= old3)) == 0L)
       return jjMoveNfa_0(0, 2);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -764,120 +778,120 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         if ((active2 & 0x100L) != 0L)
+         if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 142;
             jjmatchedPos = 3;
          }
          break;
       case 50:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x600L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x18000L);
       case 51:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x800L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x20000L);
       case 53:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x40000L);
       case 65:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 149;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x8000000L) != 0L)
+         else if ((active2 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 155;
+            jjmatchedKind = 161;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000000L, active1, 0x200000020000000L, active2, 0x100c00000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x8000000100000000L, active2, 0x4030000000L);
       case 66:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 67:
          if ((active0 & 0x1000000000L) != 0L)
          {
             jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000L, active1, 0x400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000L, active1, 0x10000000000000L, active2, 0L);
       case 68:
          if ((active0 & 0x200000000000L) != 0L)
          {
             jjmatchedKind = 45;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x800L) != 0L)
+         else if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 77;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x8000000000L) != 0L)
+         else if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 109;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 138;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x200000L) != 0L)
+         else if ((active2 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 149;
+            jjmatchedKind = 155;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0x10080000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x80200000L, active2, 0L);
       case 69:
          if ((active0 & 0x100000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 70;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x2000L) != 0L)
+         else if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 141;
+            jjmatchedKind = 147;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x2000000L) != 0L)
+         else if ((active2 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 153;
+            jjmatchedKind = 159;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x41002480400000L, active1, 0x800060000000e0L, active2, 0x10030001L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x101002480400000L, active1, 0x2000180000000380L, active2, 0x400c00040L);
       case 70:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
       case 71:
-         if ((active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00000000L, active2, 0L);
       case 72:
-         if ((active2 & 0x400000000L) != 0L)
+         if ((active2 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 162;
+            jjmatchedKind = 168;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800040020000000L, active1, 0x800000108L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2006040020000000L, active1, 0x8000000420L, active2, 0L);
       case 74:
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L, active2, 0L);
       case 76:
-         if ((active1 & 0x800000L) != 0L)
+         if ((active1 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 89;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20000000000L) != 0L)
+         else if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 111;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x3000408010000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0064060040000L, active2, 0L);
       case 77:
          if ((active0 & 0x4000000000L) != 0L)
          {
@@ -891,157 +905,157 @@ else if ((active1 & 0x20000000000L) != 0L)
             jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x80000008000L, active2, 0x800000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000000020001L, active2, 0x20000000000L);
       case 79:
-         if ((active2 & 0x40000000L) != 0L)
+         if ((active2 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 158;
+            jjmatchedKind = 164;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2080000000000L, active1, 0x8010040000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8080000000000L, active1, 0x401000000000000L, active2, 0x20L);
       case 80:
-         if ((active2 & 0x20000000L) != 0L)
+         if ((active2 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 157;
+            jjmatchedKind = 163;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000L, active1, 0x1000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10020000000000L, active1, 0x4000L, active2, 0L);
       case 82:
-         if ((active1 & 0x400000000000000L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8008000000000L, active1, 0x2000000302000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20008000000000L, active1, 0x3008000000L, active2, 0x8L);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000048000000L, active1, 0x4c800000000000L, active2, 0x4040L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000048000000L, active1, 0x1320000000000000L, active2, 0x101000L);
       case 84:
-         if ((active1 & 0x400000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 88;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x820000001004000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x800000004010000L, active2, 0x2L);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400100201000000L, active1, 0x4000001000002000L, active2, 0x24L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000100201000000L, active1, 0x10000008000L, active2, 0x910L);
       case 86:
-         if ((active1 & 0x200000000000L) != 0L)
+         if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 115;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
       case 89:
-         if ((active2 & 0x4000000L) != 0L)
+         if ((active2 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 154;
+            jjmatchedKind = 160;
             jjmatchedPos = 3;
          }
          break;
       case 95:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x600L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1800L, active2, 0L);
       case 97:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 149;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x8000000L) != 0L)
+         else if ((active2 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 155;
+            jjmatchedKind = 161;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000000L, active1, 0x200000020000000L, active2, 0x100c00000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x8000000100000000L, active2, 0x4030000000L);
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 99:
          if ((active0 & 0x1000000000L) != 0L)
          {
             jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000L, active1, 0x400000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000L, active1, 0x10000000000000L, active2, 0L);
       case 100:
          if ((active0 & 0x200000000000L) != 0L)
          {
             jjmatchedKind = 45;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x800L) != 0L)
+         else if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 77;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x8000000000L) != 0L)
+         else if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 109;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x10L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 132;
+            jjmatchedKind = 138;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x200000L) != 0L)
+         else if ((active2 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 149;
+            jjmatchedKind = 155;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0x10080000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x80200000L, active2, 0L);
       case 101:
          if ((active0 & 0x100000L) != 0L)
          {
             jjmatchedKind = 20;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 70;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x2000L) != 0L)
+         else if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 141;
+            jjmatchedKind = 147;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x2000000L) != 0L)
+         else if ((active2 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 153;
+            jjmatchedKind = 159;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x41002480400000L, active1, 0x800060000000e0L, active2, 0x10030001L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x101002480400000L, active1, 0x2000180000000380L, active2, 0x400c00040L);
       case 102:
          return jjMoveStringLiteralDfa4_0(active0, 0x200000L, active1, 0L, active2, 0L);
       case 103:
-         if ((active1 & 0x40000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00000000L, active2, 0L);
       case 104:
-         if ((active2 & 0x400000000L) != 0L)
+         if ((active2 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 162;
+            jjmatchedKind = 168;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x800040020000000L, active1, 0x800000108L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2006040020000000L, active1, 0x8000000420L, active2, 0L);
       case 106:
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L, active2, 0L);
       case 108:
-         if ((active1 & 0x800000L) != 0L)
+         if ((active1 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 89;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20000000000L) != 0L)
+         else if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 111;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x3000408010000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc0064060040000L, active2, 0L);
       case 109:
          if ((active0 & 0x4000000000L) != 0L)
          {
@@ -1055,50 +1069,50 @@ else if ((active1 & 0x20000000000L) != 0L)
             jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0x80000008000L, active2, 0x800000000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2000000020001L, active2, 0x20000000000L);
       case 111:
-         if ((active2 & 0x40000000L) != 0L)
+         if ((active2 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 158;
+            jjmatchedKind = 164;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2080000000000L, active1, 0x8010040000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8080000000000L, active1, 0x401000000000000L, active2, 0x20L);
       case 112:
-         if ((active2 & 0x20000000L) != 0L)
+         if ((active2 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 157;
+            jjmatchedKind = 163;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x4020000000000L, active1, 0x1000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10020000000000L, active1, 0x4000L, active2, 0L);
       case 114:
-         if ((active1 & 0x400000000000000L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 128;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8008000000000L, active1, 0x2000000302000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20008000000000L, active1, 0x3008000000L, active2, 0x8L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000048000000L, active1, 0x4c800000000000L, active2, 0x4040L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000048000000L, active1, 0x1320000000000000L, active2, 0x101000L);
       case 116:
-         if ((active1 & 0x400000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 88;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x820000001004000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000L, active1, 0x800000004010000L, active2, 0x2L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400100201000000L, active1, 0x4000001000002000L, active2, 0x24L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000100201000000L, active1, 0x10000008000L, active2, 0x910L);
       case 118:
-         if ((active1 & 0x200000000000L) != 0L)
+         if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 115;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
       case 121:
-         if ((active2 & 0x4000000L) != 0L)
+         if ((active2 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 154;
+            jjmatchedKind = 160;
             jjmatchedPos = 3;
          }
          break;
@@ -1117,72 +1131,72 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x40000L);
       case 50:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x8000L);
       case 53:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x400L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x10000L);
       case 56:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x800L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x20000L);
       case 65:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x22400408000108L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890064060000420L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000001400000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000001400000L, active1, 0L, active2, 0L);
       case 68:
          if ((active0 & 0x2000000000L) != 0L)
          {
             jjmatchedKind = 37;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 79;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000800000000L, active2, 0L);
       case 69:
          if ((active0 & 0x8000000000L) != 0L)
          {
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 120;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 121;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x4000L) != 0L)
+         else if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 148;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000240000000L, active1, 0x101000000014000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000240000000L, active1, 0x4040000000050000L, active2, 0L);
       case 70:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 71:
-         if ((active2 & 0x800000000L) != 0L)
+         if ((active2 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 163;
+            jjmatchedKind = 169;
             jjmatchedPos = 4;
          }
          break;
@@ -1192,172 +1206,174 @@ else if ((active2 & 0x4000L) != 0L)
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 129;
             jjmatchedPos = 4;
          }
          break;
       case 73:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 100;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x28400000a00000L, active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa5_0(active0, 0xa0400000a00000L, active1, 0L, active2, 0x1000L);
+      case 74:
+         return jjMoveStringLiteralDfa5_0(active0, 0x6000000000000L, active1, 0L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa5_0(active0, 0x6000000000000L, active1, 0x1000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x18000000000000L, active1, 0x4000L, active2, 0L);
       case 77:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1080000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10400000000L, active2, 0L);
       case 78:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0x8080000000000000L, active2, 0x10000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0x2000000000000000L, active2, 0x400000020L);
       case 79:
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L, active2, 0L);
       case 80:
-         if ((active0 & 0x400000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 60;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2400L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x9000L, active2, 0L);
       case 82:
          if ((active0 & 0x80000000L) != 0L)
          {
             jjmatchedKind = 31;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 112;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x400000L) != 0L)
+         else if ((active2 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 150;
+            jjmatchedKind = 156;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1001000004000000L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4001000004000000L, active1, 0L, active2, 0x400000L);
       case 83:
          if ((active0 & 0x100000000000L) != 0L)
          {
             jjmatchedKind = 44;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 131;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200L, active2, 0x4L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800L, active2, 0x100L);
       case 84:
          if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000000000L) != 0L)
+         else if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000008000000L, active1, 0x4040804822000000L, active2, 0x820000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000008000000L, active1, 0x1020108108000000L, active2, 0x20800010L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x100000020L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x4000000800L);
       case 86:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 71;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0xc0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x300L, active2, 0L);
       case 88:
-         if ((active1 & 0x2000000000L) != 0L)
+         if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 107;
             jjmatchedPos = 4;
          }
          break;
       case 90:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x40L);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x22400408000108L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x890064060000420L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000001400000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000001400000L, active1, 0L, active2, 0L);
       case 100:
          if ((active0 & 0x2000000000L) != 0L)
          {
             jjmatchedKind = 37;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 79;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000800000000L, active2, 0L);
       case 101:
          if ((active0 & 0x8000000000L) != 0L)
          {
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000L) != 0L)
+         else if ((active1 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 85;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 120;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x8000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 121;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x4000L) != 0L)
+         else if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 148;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000240000000L, active1, 0x101000000014000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000240000000L, active1, 0x4040000000050000L, active2, 0L);
       case 102:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 103:
-         if ((active2 & 0x800000000L) != 0L)
+         if ((active2 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 163;
+            jjmatchedKind = 169;
             jjmatchedPos = 4;
          }
          break;
@@ -1367,113 +1383,115 @@ else if ((active2 & 0x4000L) != 0L)
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 129;
             jjmatchedPos = 4;
          }
          break;
       case 105:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 90;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 100;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 101;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x28400000a00000L, active1, 0L, active2, 0x40L);
+         return jjMoveStringLiteralDfa5_0(active0, 0xa0400000a00000L, active1, 0L, active2, 0x1000L);
+      case 106:
+         return jjMoveStringLiteralDfa5_0(active0, 0x6000000000000L, active1, 0L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa5_0(active0, 0x6000000000000L, active1, 0x1000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x18000000000000L, active1, 0x4000L, active2, 0L);
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1080000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10400000000L, active2, 0L);
       case 110:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0x8080000000000000L, active2, 0x10000000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000000L, active1, 0x2000000000000000L, active2, 0x400000020L);
       case 111:
          return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L, active2, 0L);
       case 112:
-         if ((active0 & 0x400000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 60;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2400L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x9000L, active2, 0L);
       case 114:
          if ((active0 & 0x80000000L) != 0L)
          {
             jjmatchedKind = 31;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000000L) != 0L)
+         else if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 112;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x400000L) != 0L)
+         else if ((active2 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 150;
+            jjmatchedKind = 156;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1001000004000000L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4001000004000000L, active1, 0L, active2, 0x400000L);
       case 115:
          if ((active0 & 0x100000000000L) != 0L)
          {
             jjmatchedKind = 44;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 131;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200L, active2, 0x4L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800L, active2, 0x100L);
       case 116:
          if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000000000L) != 0L)
+         else if ((active1 & 0x1L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 64;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000008000000L, active1, 0x4040804822000000L, active2, 0x820000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200000008000000L, active1, 0x1020108108000000L, active2, 0x20800010L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x100000020L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x4000000800L);
       case 118:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 71;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0xc0L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x300L, active2, 0L);
       case 120:
-         if ((active1 & 0x2000000000L) != 0L)
+         if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 107;
             jjmatchedPos = 4;
          }
          break;
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x40L);
       default :
          break;
    }
@@ -1489,102 +1507,102 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 50:
-         if ((active2 & 0x1000L) != 0L)
+         if ((active2 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 146;
             jjmatchedPos = 5;
          }
          break;
       case 52:
-         if ((active2 & 0x200L) != 0L)
+         if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 143;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x800L) != 0L)
+         else if ((active2 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 139;
+            jjmatchedKind = 145;
             jjmatchedPos = 5;
          }
          break;
       case 54:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 144;
             jjmatchedPos = 5;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1001000000000000L, active1, 0x40000080000200L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4001000000000000L, active1, 0x1000000400000800L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0x30400000000000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0xc0400000000000L, active1, 0x80000000000000L, active2, 0L);
       case 68:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 51;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8080000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000000000L, active2, 0x20L);
       case 69:
-         if ((active0 & 0x4000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 52;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 78;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x20000L) != 0L)
+         else if ((active2 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 145;
+            jjmatchedKind = 151;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x800000L) != 0L)
+         else if ((active2 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 151;
+            jjmatchedKind = 157;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x4010005802000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x400118008000000L, active2, 0x10L);
       case 70:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 71:
-         if ((active0 & 0x800000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 61;
             jjmatchedPos = 5;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0x20000000000000L, active2, 0x20L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0x800000800000000L, active2, 0x800L);
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x100000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x4000000000L);
       case 78:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 69;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 118;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000800000L, active1, 0x408000100L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000800000L, active1, 0x64060000400L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400L, active2, 0x41L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x6000000000000L, active1, 0x1000L, active2, 0x1040L);
       case 80:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 82:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 80;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 117;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L, active2, 0L);
@@ -1594,12 +1612,12 @@ else if ((active1 & 0x800000000000L) != 0L)
             jjmatchedKind = 33;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x80000000000000L) != 0L)
+         else if ((active0 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 57;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 84:
          if ((active0 & 0x400000L) != 0L)
          {
@@ -1611,32 +1629,32 @@ else if ((active0 & 0x40000000L) != 0L)
             jjmatchedKind = 30;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x40000000000000L) != 0L)
+         else if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 56;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x400000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 116;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 136;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10000L) != 0L)
+         else if ((active2 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 150;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10000000L) != 0L)
+         else if ((active2 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 156;
+            jjmatchedKind = 162;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 88:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1645,80 +1663,80 @@ else if ((active2 & 0x10000000L) != 0L)
          }
          break;
       case 89:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       case 95:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20c0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8300L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1001000000000000L, active1, 0x40000080000200L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4001000000000000L, active1, 0x1000000400000800L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x30400000000000L, active1, 0x2000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0xc0400000000000L, active1, 0x80000000000000L, active2, 0L);
       case 100:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 51;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8080000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2000000000000000L, active2, 0x20L);
       case 101:
-         if ((active0 & 0x4000000000000L) != 0L)
+         if ((active0 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 50;
+            jjmatchedKind = 52;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000L) != 0L)
+         else if ((active1 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 78;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x20000L) != 0L)
+         else if ((active2 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 145;
+            jjmatchedKind = 151;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x800000L) != 0L)
+         else if ((active2 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 151;
+            jjmatchedKind = 157;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x4010005802000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x400118008000000L, active2, 0x10L);
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 103:
-         if ((active0 & 0x800000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 61;
             jjmatchedPos = 5;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0x20000000000000L, active2, 0x20L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0x800000800000000L, active2, 0x800L);
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x100000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x4000000000L);
       case 110:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 69;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x1000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 118;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000800000L, active1, 0x408000100L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x40000800000L, active1, 0x64060000400L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400L, active2, 0x41L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x6000000000000L, active1, 0x1000L, active2, 0x1040L);
       case 112:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 114:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 80;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 117;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L, active2, 0L);
@@ -1728,12 +1746,12 @@ else if ((active1 & 0x800000000000L) != 0L)
             jjmatchedKind = 33;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x80000000000000L) != 0L)
+         else if ((active0 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 57;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 116:
          if ((active0 & 0x400000L) != 0L)
          {
@@ -1745,32 +1763,32 @@ else if ((active0 & 0x40000000L) != 0L)
             jjmatchedKind = 30;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x40000000000000L) != 0L)
+         else if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 56;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x400000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 116;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x4L) != 0L)
+         else if ((active2 & 0x100L) != 0L)
          {
-            jjmatchedKind = 130;
+            jjmatchedKind = 136;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10000L) != 0L)
+         else if ((active2 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 150;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x10000000L) != 0L)
+         else if ((active2 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 156;
+            jjmatchedKind = 162;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 120:
          if ((active0 & 0x200000L) != 0L)
          {
@@ -1779,7 +1797,7 @@ else if ((active2 & 0x10000000L) != 0L)
          }
          break;
       case 121:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L, active2, 0L);
       default :
          break;
    }
@@ -1795,20 +1813,20 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20040000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80040000000000L, active1, 0L, active2, 0L);
       case 66:
          return jjMoveStringLiteralDfa7_0(active0, 0x4000000L, active1, 0L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x12100L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x48400L, active2, 0L);
       case 68:
          if ((active0 & 0x1000000L) != 0L)
          {
             jjmatchedKind = 24;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 139;
             jjmatchedPos = 6;
          }
          break;
@@ -1818,23 +1836,30 @@ else if ((active2 & 0x20L) != 0L)
             jjmatchedKind = 46;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 119;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 71:
-         if ((active1 & 0x8000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 93;
             jjmatchedPos = 6;
          }
-         break;
+         else if ((active1 & 0x20000000000L) != 0L)
+         {
+            jjmatchedKind = 105;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40040000000L, active2, 0L);
+      case 73:
+         return jjMoveStringLiteralDfa7_0(active0, 0x6000000000000L, active1, 0L, active2, 0L);
       case 75:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 102;
             jjmatchedPos = 6;
          }
          break;
@@ -1844,75 +1869,80 @@ else if ((active1 & 0x2000000000000L) != 0L)
             jjmatchedKind = 48;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 77:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800L, active2, 0L);
       case 78:
-         if ((active2 & 0x40L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 140;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20000000000000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000000000000L, active2, 0x40L);
       case 79:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 80:
-         if ((active1 & 0x400L) != 0L)
+         if ((active1 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 76;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20000080L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000200L, active2, 0L);
       case 82:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40005800000000L, active2, 0L);
+         if ((active1 & 0x800000000L) != 0L)
+         {
+            jjmatchedKind = 99;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000118000000000L, active2, 0L);
       case 83:
-         if ((active1 & 0x80000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 125;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 132;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x8000000000000000L) != 0L)
+         else if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 133;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000040L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000100L, active2, 0L);
       case 84:
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 54;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x100000000L) != 0L)
+         else if ((active2 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 160;
+            jjmatchedKind = 166;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000000L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000000L, active1, 0x400000000L, active2, 0L);
       case 85:
          return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L, active2, 0L);
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa7_0(active0, 0x20040000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80040000000000L, active1, 0L, active2, 0L);
       case 98:
          return jjMoveStringLiteralDfa7_0(active0, 0x4000000L, active1, 0L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x12100L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0x48400L, active2, 0L);
       case 100:
          if ((active0 & 0x1000000L) != 0L)
          {
             jjmatchedKind = 24;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 139;
             jjmatchedPos = 6;
          }
          break;
@@ -1922,23 +1952,30 @@ else if ((active2 & 0x20L) != 0L)
             jjmatchedKind = 46;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 119;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 103:
-         if ((active1 & 0x8000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 93;
             jjmatchedPos = 6;
          }
-         break;
+         else if ((active1 & 0x20000000000L) != 0L)
+         {
+            jjmatchedKind = 105;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40040000000L, active2, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa7_0(active0, 0x6000000000000L, active1, 0L, active2, 0L);
       case 107:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 102;
             jjmatchedPos = 6;
          }
          break;
@@ -1948,56 +1985,61 @@ else if ((active1 & 0x2000000000000L) != 0L)
             jjmatchedKind = 48;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000L, active1, 0L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
       case 109:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800L, active2, 0L);
       case 110:
-         if ((active2 & 0x40L) != 0L)
+         if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 140;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20000000000000L, active2, 0x1L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000000000000L, active2, 0x40L);
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 112:
-         if ((active1 & 0x400L) != 0L)
+         if ((active1 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 74;
+            jjmatchedKind = 76;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20000080L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000200L, active2, 0L);
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40005800000000L, active2, 0L);
+         if ((active1 & 0x800000000L) != 0L)
+         {
+            jjmatchedKind = 99;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000118000000000L, active2, 0L);
       case 115:
-         if ((active1 & 0x80000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 125;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 132;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x8000000000000000L) != 0L)
+         else if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 133;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000040L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8000100L, active2, 0L);
       case 116:
-         if ((active0 & 0x10000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 52;
+            jjmatchedKind = 54;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x100000000L) != 0L)
+         else if ((active2 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 160;
+            jjmatchedKind = 166;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000000000L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000000000000000L, active1, 0x400000000L, active2, 0L);
       case 117:
          return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L, active2, 0L);
       default :
@@ -2015,45 +2057,47 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800000040L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x8000000100L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0x400000000L, active2, 0L);
+      case 68:
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40040000000L, active2, 0L);
       case 69:
          if ((active0 & 0x4000000L) != 0L)
          {
             jjmatchedKind = 26;
             jjmatchedPos = 7;
          }
-         else if ((active0 & 0x8000000000000L) != 0L)
+         else if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 51;
+            jjmatchedKind = 53;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x100L) != 0L)
+         else if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 74;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x20000000L) != 0L)
+         else if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 96;
             jjmatchedPos = 7;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 134;
             jjmatchedPos = 7;
          }
          break;
       case 70:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
       case 73:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       case 76:
          if ((active0 & 0x40000000000L) != 0L)
          {
@@ -2062,32 +2106,44 @@ else if ((active2 & 0x1L) != 0L)
          }
          break;
       case 77:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 108;
+            jjmatchedPos = 7;
+         }
+         break;
+      case 78:
+         if ((active0 & 0x2000000000000L) != 0L)
+         {
+            jjmatchedKind = 49;
+            jjmatchedPos = 7;
+         }
+         else if ((active0 & 0x4000000000000L) != 0L)
+         {
+            jjmatchedKind = 50;
             jjmatchedPos = 7;
          }
          break;
       case 79:
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000000L, active1, 0x2080L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x4000000000000000L, active1, 0x8200L, active2, 0L);
       case 80:
-         if ((active1 & 0x200L) != 0L)
+         if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 75;
             jjmatchedPos = 7;
          }
          break;
       case 82:
-         if ((active1 & 0x200000000000000L) != 0L)
+         if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 127;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 83:
-         if ((active1 & 0x20000000000000L) != 0L)
+         if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 123;
             jjmatchedPos = 7;
          }
          break;
@@ -2097,52 +2153,54 @@ else if ((active2 & 0x1L) != 0L)
             jjmatchedKind = 23;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000L) != 0L)
+         else if ((active1 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 91;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L, active1, 0x40000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L, active1, 0x1000000000000000L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800000040L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x8000000100L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0x80000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0x400000000L, active2, 0L);
+      case 100:
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40040000000L, active2, 0L);
       case 101:
          if ((active0 & 0x4000000L) != 0L)
          {
             jjmatchedKind = 26;
             jjmatchedPos = 7;
          }
-         else if ((active0 & 0x8000000000000L) != 0L)
+         else if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 51;
+            jjmatchedKind = 53;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x100L) != 0L)
+         else if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 74;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x20000000L) != 0L)
+         else if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 96;
             jjmatchedPos = 7;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active2 & 0x40L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 134;
             jjmatchedPos = 7;
          }
          break;
       case 102:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
       case 105:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10000000000L, active2, 0L);
       case 108:
          if ((active0 & 0x40000000000L) != 0L)
          {
@@ -2151,32 +2209,44 @@ else if ((active2 & 0x1L) != 0L)
          }
          break;
       case 109:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 108;
+            jjmatchedPos = 7;
+         }
+         break;
+      case 110:
+         if ((active0 & 0x2000000000000L) != 0L)
+         {
+            jjmatchedKind = 49;
+            jjmatchedPos = 7;
+         }
+         else if ((active0 & 0x4000000000000L) != 0L)
+         {
+            jjmatchedKind = 50;
             jjmatchedPos = 7;
          }
          break;
       case 111:
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000000L, active1, 0x2080L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x4000000000000000L, active1, 0x8200L, active2, 0L);
       case 112:
-         if ((active1 & 0x200L) != 0L)
+         if ((active1 & 0x800L) != 0L)
          {
-            jjmatchedKind = 73;
+            jjmatchedKind = 75;
             jjmatchedPos = 7;
          }
          break;
       case 114:
-         if ((active1 & 0x200000000000000L) != 0L)
+         if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 127;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x100000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 115:
-         if ((active1 & 0x20000000000000L) != 0L)
+         if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 123;
             jjmatchedPos = 7;
          }
          break;
@@ -2186,12 +2256,12 @@ else if ((active2 & 0x1L) != 0L)
             jjmatchedKind = 23;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x2000000L) != 0L)
+         else if ((active1 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 91;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x20000000000000L, active1, 0x40000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L, active1, 0x1000000000000000L, active2, 0L);
       default :
          break;
    }
@@ -2207,57 +2277,59 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 67:
-         if ((active1 & 0x1000000000L) != 0L)
+         if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 104;
             jjmatchedPos = 8;
          }
          break;
       case 69:
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 55;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 126;
             jjmatchedPos = 8;
          }
          break;
       case 72:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x80000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000000L);
+      case 73:
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40040000000L);
       case 76:
-         if ((active1 & 0x800000000L) != 0L)
+         if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 103;
             jjmatchedPos = 8;
          }
          break;
       case 77:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100L);
       case 78:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x2000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x8000L);
       case 79:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000000000000L);
       case 80:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 73;
             jjmatchedPos = 8;
          }
          break;
       case 82:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 62;
             jjmatchedPos = 8;
          }
          break;
       case 83:
-         if ((active1 & 0x40000000000000L) != 0L)
+         if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 124;
             jjmatchedPos = 8;
          }
          break;
@@ -2269,57 +2341,59 @@ else if ((active1 & 0x100000000000000L) != 0L)
          }
          break;
       case 99:
-         if ((active1 & 0x1000000000L) != 0L)
+         if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 104;
             jjmatchedPos = 8;
          }
          break;
       case 101:
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 55;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x100000000000000L) != 0L)
+         else if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 126;
             jjmatchedPos = 8;
          }
          break;
       case 104:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x80000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000000L);
+      case 105:
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40040000000L);
       case 108:
-         if ((active1 & 0x800000000L) != 0L)
+         if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 103;
             jjmatchedPos = 8;
          }
          break;
       case 109:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100L);
       case 110:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x2000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x8000L);
       case 111:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000000000000L);
       case 112:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 73;
             jjmatchedPos = 8;
          }
          break;
       case 114:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 62;
             jjmatchedPos = 8;
          }
          break;
       case 115:
-         if ((active1 & 0x40000000000000L) != 0L)
+         if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 124;
             jjmatchedPos = 8;
          }
          break;
@@ -2345,31 +2419,51 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 67:
-         return jjMoveStringLiteralDfa10_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x8000L);
       case 69:
-         return jjMoveStringLiteralDfa10_0(active1, 0x80000000L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x400000000L);
       case 80:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 72;
             jjmatchedPos = 9;
          }
          break;
       case 82:
-         return jjMoveStringLiteralDfa10_0(active1, 0x10000000000000L);
+         if ((active1 & 0x40000000L) != 0L)
+         {
+            jjmatchedKind = 94;
+            jjmatchedPos = 9;
+         }
+         else if ((active1 & 0x40000000000L) != 0L)
+         {
+            jjmatchedKind = 106;
+            jjmatchedPos = 9;
+         }
+         return jjMoveStringLiteralDfa10_0(active1, 0x400000000000000L);
       case 99:
-         return jjMoveStringLiteralDfa10_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x8000L);
       case 101:
-         return jjMoveStringLiteralDfa10_0(active1, 0x80000000L);
+         return jjMoveStringLiteralDfa10_0(active1, 0x400000000L);
       case 112:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 72;
             jjmatchedPos = 9;
          }
          break;
       case 114:
-         return jjMoveStringLiteralDfa10_0(active1, 0x10000000000000L);
+         if ((active1 & 0x40000000L) != 0L)
+         {
+            jjmatchedKind = 94;
+            jjmatchedPos = 9;
+         }
+         else if ((active1 & 0x40000000000L) != 0L)
+         {
+            jjmatchedKind = 106;
+            jjmatchedPos = 9;
+         }
+         return jjMoveStringLiteralDfa10_0(active1, 0x400000000000000L);
       default :
          break;
    }
@@ -2385,22 +2479,22 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa11_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x8000L);
       case 83:
-         if ((active1 & 0x80000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 10;
          }
          break;
       case 95:
-         return jjMoveStringLiteralDfa11_0(active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x400000000000000L);
       case 97:
-         return jjMoveStringLiteralDfa11_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x8000L);
       case 115:
-         if ((active1 & 0x80000000L) != 0L)
+         if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 98;
             jjmatchedPos = 10;
          }
          break;
@@ -2419,23 +2513,23 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1){
    switch(curChar)
    {
       case 84:
-         if ((active1 & 0x2000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 11;
          }
          break;
       case 85:
-         return jjMoveStringLiteralDfa12_0(active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x400000000000000L);
       case 116:
-         if ((active1 & 0x2000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 79;
             jjmatchedPos = 11;
          }
          break;
       case 117:
-         return jjMoveStringLiteralDfa12_0(active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x400000000000000L);
       default :
          break;
    }
@@ -2451,9 +2545,9 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1){
    switch(curChar)
    {
       case 82:
-         return jjMoveStringLiteralDfa13_0(active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x400000000000000L);
       case 114:
-         return jjMoveStringLiteralDfa13_0(active1, 0x10000000000000L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x400000000000000L);
       default :
          break;
    }
@@ -2469,16 +2563,16 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1){
    switch(curChar)
    {
       case 73:
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 122;
             jjmatchedPos = 13;
          }
          break;
       case 105:
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 122;
             jjmatchedPos = 13;
          }
          break;
@@ -2539,7 +2633,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 298;
+   jjnewStateCnt = 301;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -2557,8 +2651,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 165)
-                        kind = 165;
+                     if (kind > 171)
+                        kind = 171;
                      { jjCheckNAddStates(0, 6); }
                   }
                   else if (curChar == 45)
@@ -2566,7 +2660,7 @@ else if (curChar == 45)
                   else if (curChar == 43)
                      { jjCheckNAddStates(12, 16); }
                   else if (curChar == 46)
-                     { jjCheckNAddTwoStates(240, 252); }
+                     { jjCheckNAddTwoStates(243, 255); }
                   else if (curChar == 58)
                   {
                      if (kind > 11)
@@ -2576,9 +2670,9 @@ else if (curChar == 58)
                   else if (curChar == 40)
                      { jjCheckNAddStates(21, 23); }
                   else if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 148;
+                     jjstateSet[jjnewStateCnt++] = 151;
                   else if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 124;
+                     jjstateSet[jjnewStateCnt++] = 127;
                   else if (curChar == 36)
                      { jjAddStates(24, 25); }
                   else if (curChar == 60)
@@ -2720,64 +2814,63 @@ else if (curChar == 39)
                      break;
                   if (kind > 16)
                      kind = 16;
-                  { jjCheckNAddTwoStates(46, 47); }
+                  { jjCheckNAddStates(45, 47); }
                   break;
-               case 49:
-                  if (curChar == 35)
-                     { jjCheckNAddStates(45, 50); }
+               case 48:
+                  if (curChar != 45)
+                     break;
+                  if (kind > 16)
+                     kind = 16;
+                  jjstateSet[jjnewStateCnt++] = 49;
                   break;
                case 50:
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 48;
+                  break;
+               case 52:
+                  if (curChar == 35)
+                     { jjCheckNAddStates(48, 53); }
+                  break;
+               case 53:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(45, 50); }
+                     { jjCheckNAddStates(48, 53); }
                   break;
-               case 51:
+               case 54:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(51, 53); }
+                     { jjCheckNAddStates(54, 56); }
                   break;
-               case 52:
+               case 55:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(51, 53); }
+                     { jjCheckNAddStates(54, 56); }
                   break;
-               case 57:
+               case 60:
                   if (curChar == 10)
-                     { jjCheckNAddStates(51, 53); }
+                     { jjCheckNAddStates(54, 56); }
                   break;
-               case 58:
+               case 61:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 57;
+                     jjstateSet[jjnewStateCnt++] = 60;
                   break;
-               case 65:
-                  if ((0x8400000000L & l) != 0L && kind > 177)
-                     kind = 177;
+               case 68:
+                  if ((0x8400000000L & l) != 0L && kind > 183)
+                     kind = 183;
                   break;
-               case 66:
+               case 69:
                   if (curChar == 39)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 67:
+               case 70:
                   if ((0xffffff7fffffdbffL & l) != 0L)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 68:
-                  if (curChar == 39 && kind > 181)
-                     kind = 181;
+               case 71:
+                  if (curChar == 39 && kind > 187)
+                     kind = 187;
                   break;
-               case 70:
+               case 73:
                   if ((0x8400000000L & l) != 0L)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 72:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 73;
-                  break;
-               case 73:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 74;
-                  break;
-               case 74:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 75;
-                  break;
                case 75:
                   if ((0x3ff000000000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 76;
@@ -2791,50 +2884,50 @@ else if (curChar == 39)
                      jjstateSet[jjnewStateCnt++] = 78;
                   break;
                case 78:
-               case 83:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(79); }
+                     jjstateSet[jjnewStateCnt++] = 79;
                   break;
                case 79:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(37, 39); }
+                     jjstateSet[jjnewStateCnt++] = 80;
+                  break;
+               case 80:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 81;
                   break;
                case 81:
+               case 86:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 82;
+                     { jjCheckNAdd(82); }
                   break;
                case 82:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 83;
+                     { jjCheckNAddStates(37, 39); }
                   break;
                case 84:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 85;
+                  break;
+               case 85:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 86;
+                  break;
+               case 87:
                   if (curChar == 34)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 85:
+               case 88:
                   if ((0xfffffffbffffdbffL & l) != 0L)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 86:
-                  if (curChar == 34 && kind > 182)
-                     kind = 182;
+               case 89:
+                  if (curChar == 34 && kind > 188)
+                     kind = 188;
                   break;
-               case 88:
+               case 91:
                   if ((0x8400000000L & l) != 0L)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 90:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 91;
-                  break;
-               case 91:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 92;
-                  break;
-               case 92:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 93;
-                  break;
                case 93:
                   if ((0x3ff000000000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 94;
@@ -2848,54 +2941,54 @@ else if (curChar == 39)
                      jjstateSet[jjnewStateCnt++] = 96;
                   break;
                case 96:
-               case 101:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(97); }
+                     jjstateSet[jjnewStateCnt++] = 97;
                   break;
                case 97:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(34, 36); }
+                     jjstateSet[jjnewStateCnt++] = 98;
+                  break;
+               case 98:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 99;
                   break;
                case 99:
+               case 104:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 100;
+                     { jjCheckNAdd(100); }
                   break;
                case 100:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 101;
+                     { jjCheckNAddStates(34, 36); }
                   break;
                case 102:
-                  if (curChar == 39)
-                     { jjCheckNAddStates(54, 57); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 103;
                   break;
                case 103:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 104;
+                  break;
+               case 105:
+                  if (curChar == 39)
+                     { jjCheckNAddStates(57, 60); }
+                  break;
                case 106:
+               case 109:
                   if (curChar == 39)
-                     { jjCheckNAddTwoStates(104, 107); }
+                     { jjCheckNAddTwoStates(107, 110); }
                   break;
-               case 104:
+               case 107:
                   if ((0xffffff7fffffffffL & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
-                  break;
-               case 105:
-                  if (curChar == 39)
-                     { jjAddStates(58, 59); }
+                     { jjCheckNAddStates(57, 60); }
                   break;
                case 108:
-                  if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
-                  break;
-               case 110:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 111;
+                  if (curChar == 39)
+                     { jjAddStates(61, 62); }
                   break;
                case 111:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 112;
-                  break;
-               case 112:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 113;
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(57, 60); }
                   break;
                case 113:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2910,70 +3003,70 @@ else if (curChar == 39)
                      jjstateSet[jjnewStateCnt++] = 116;
                   break;
                case 116:
-               case 121:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(117); }
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
                case 117:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
+                     jjstateSet[jjnewStateCnt++] = 118;
+                  break;
+               case 118:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 119;
                   break;
                case 119:
+               case 124:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 120;
+                     { jjCheckNAdd(120); }
                   break;
                case 120:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 121;
+                     { jjCheckNAddStates(57, 60); }
                   break;
                case 122:
-                  if (curChar == 39 && kind > 183)
-                     kind = 183;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 123;
                   break;
                case 123:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 124;
+                  break;
+               case 125:
+                  if (curChar == 39 && kind > 189)
+                     kind = 189;
+                  break;
+               case 126:
                   if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 122;
+                     jjstateSet[jjnewStateCnt++] = 125;
                   break;
-               case 124:
+               case 127:
                   if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 102;
+                     jjstateSet[jjnewStateCnt++] = 105;
                   break;
-               case 125:
+               case 128:
                   if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 124;
+                     jjstateSet[jjnewStateCnt++] = 127;
                   break;
-               case 126:
+               case 129:
                   if (curChar == 34)
-                     { jjCheckNAddStates(60, 63); }
+                     { jjCheckNAddStates(63, 66); }
                   break;
-               case 127:
                case 130:
+               case 133:
                   if (curChar == 34)
-                     { jjCheckNAddTwoStates(128, 131); }
+                     { jjCheckNAddTwoStates(131, 134); }
                   break;
-               case 128:
+               case 131:
                   if ((0xfffffffbffffffffL & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
-                  break;
-               case 129:
-                  if (curChar == 34)
-                     { jjAddStates(64, 65); }
+                     { jjCheckNAddStates(63, 66); }
                   break;
                case 132:
-                  if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
-                  break;
-               case 134:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 135;
+                  if (curChar == 34)
+                     { jjAddStates(67, 68); }
                   break;
                case 135:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 136;
-                  break;
-               case 136:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 137;
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(63, 66); }
                   break;
                case 137:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2988,265 +3081,262 @@ else if (curChar == 39)
                      jjstateSet[jjnewStateCnt++] = 140;
                   break;
                case 140:
-               case 145:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAdd(141); }
+                     jjstateSet[jjnewStateCnt++] = 141;
                   break;
                case 141:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
+                     jjstateSet[jjnewStateCnt++] = 142;
+                  break;
+               case 142:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 143;
                   break;
                case 143:
+               case 148:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 144;
+                     { jjCheckNAdd(144); }
                   break;
                case 144:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 145;
+                     { jjCheckNAddStates(63, 66); }
                   break;
                case 146:
-                  if (curChar == 34 && kind > 184)
-                     kind = 184;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 147;
                   break;
                case 147:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 148;
+                  break;
+               case 149:
+                  if (curChar == 34 && kind > 190)
+                     kind = 190;
+                  break;
+               case 150:
                   if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 146;
+                     jjstateSet[jjnewStateCnt++] = 149;
                   break;
-               case 148:
+               case 151:
                   if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 126;
+                     jjstateSet[jjnewStateCnt++] = 129;
                   break;
-               case 149:
+               case 152:
                   if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 148;
+                     jjstateSet[jjnewStateCnt++] = 151;
                   break;
-               case 150:
+               case 153:
                   if (curChar == 40)
                      { jjCheckNAddStates(21, 23); }
                   break;
-               case 151:
+               case 154:
                   if (curChar == 35)
-                     { jjCheckNAddStates(66, 71); }
+                     { jjCheckNAddStates(69, 74); }
                   break;
-               case 152:
+               case 155:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(66, 71); }
+                     { jjCheckNAddStates(69, 74); }
                   break;
-               case 153:
+               case 156:
                   if ((0x2400L & l) != 0L)
                      { jjCheckNAddStates(21, 23); }
                   break;
-               case 154:
+               case 157:
                   if ((0x100003600L & l) != 0L)
                      { jjCheckNAddStates(21, 23); }
                   break;
-               case 155:
-                  if (curChar == 41 && kind > 187)
-                     kind = 187;
+               case 158:
+                  if (curChar == 41 && kind > 193)
+                     kind = 193;
                   break;
-               case 156:
+               case 159:
                   if (curChar == 10)
                      { jjCheckNAddStates(21, 23); }
                   break;
-               case 157:
+               case 160:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 156;
+                     jjstateSet[jjnewStateCnt++] = 159;
                   break;
-               case 159:
+               case 162:
                   if (curChar == 35)
-                     { jjCheckNAddStates(72, 77); }
+                     { jjCheckNAddStates(75, 80); }
                   break;
-               case 160:
+               case 163:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(72, 77); }
+                     { jjCheckNAddStates(75, 80); }
                   break;
-               case 161:
+               case 164:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(78, 80); }
+                     { jjCheckNAddStates(81, 83); }
                   break;
-               case 162:
+               case 165:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(78, 80); }
+                     { jjCheckNAddStates(81, 83); }
                   break;
-               case 164:
+               case 167:
                   if (curChar == 10)
-                     { jjCheckNAddStates(78, 80); }
+                     { jjCheckNAddStates(81, 83); }
                   break;
-               case 165:
+               case 168:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 164;
+                     jjstateSet[jjnewStateCnt++] = 167;
                   break;
-               case 167:
+               case 170:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(81, 83); }
+                     { jjAddStates(84, 86); }
                   break;
-               case 168:
+               case 171:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 169;
+                     jjstateSet[jjnewStateCnt++] = 172;
                   break;
-               case 169:
+               case 172:
                   if (curChar == 58 && kind > 11)
                      kind = 11;
                   break;
-               case 173:
+               case 176:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(84, 86); }
+                     { jjAddStates(87, 89); }
                   break;
-               case 174:
+               case 177:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 175;
+                     jjstateSet[jjnewStateCnt++] = 178;
                   break;
-               case 175:
+               case 178:
                   if (curChar == 58)
                      { jjCheckNAddStates(17, 20); }
                   break;
-               case 176:
+               case 179:
                   if ((0x7ff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 177:
+               case 180:
                   if ((0x7ff600000000000L & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 178:
+               case 181:
                   if ((0x7ff200000000000L & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 182:
+               case 185:
                   if ((0xa800fffa00000000L & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 183:
+               case 186:
                   if (curChar == 37)
-                     { jjAddStates(92, 93); }
+                     { jjAddStates(95, 96); }
                   break;
-               case 184:
+               case 187:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 185;
+                     jjstateSet[jjnewStateCnt++] = 188;
                   break;
-               case 185:
+               case 188:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 186:
+               case 189:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 187;
+                     jjstateSet[jjnewStateCnt++] = 190;
                   break;
-               case 187:
+               case 190:
                   if ((0x3ff000000000000L & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 188:
+               case 191:
                   if ((0xa800fffa00000000L & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 191:
+               case 194:
                   if ((0xa800fffa00000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 192:
+               case 195:
                   if (curChar == 37)
-                     jjstateSet[jjnewStateCnt++] = 193;
+                     jjstateSet[jjnewStateCnt++] = 196;
                   break;
-               case 193:
+               case 196:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 194;
+                     jjstateSet[jjnewStateCnt++] = 197;
                   break;
-               case 194:
+               case 197:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 203:
+               case 206:
                   if (curChar != 58)
                      break;
                   if (kind > 11)
                      kind = 11;
                   { jjCheckNAddStates(17, 20); }
                   break;
-               case 206:
+               case 209:
                   if (curChar == 35)
-                     { jjCheckNAddStates(94, 99); }
+                     { jjCheckNAddStates(97, 102); }
                   break;
-               case 207:
+               case 210:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(94, 99); }
+                     { jjCheckNAddStates(97, 102); }
                   break;
-               case 208:
+               case 211:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(100, 102); }
+                     { jjCheckNAddStates(103, 105); }
                   break;
-               case 209:
+               case 212:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(100, 102); }
+                     { jjCheckNAddStates(103, 105); }
                   break;
-               case 214:
+               case 217:
                   if (curChar == 10)
-                     { jjCheckNAddStates(100, 102); }
+                     { jjCheckNAddStates(103, 105); }
                   break;
-               case 215:
+               case 218:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 214;
+                     jjstateSet[jjnewStateCnt++] = 217;
                   break;
-               case 221:
+               case 224:
                   if (curChar == 35)
-                     { jjCheckNAddStates(103, 108); }
+                     { jjCheckNAddStates(106, 111); }
                   break;
-               case 222:
+               case 225:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(103, 108); }
+                     { jjCheckNAddStates(106, 111); }
                   break;
-               case 223:
+               case 226:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(109, 111); }
+                     { jjCheckNAddStates(112, 114); }
                   break;
-               case 224:
+               case 227:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(109, 111); }
+                     { jjCheckNAddStates(112, 114); }
                   break;
-               case 230:
+               case 233:
                   if (curChar == 10)
-                     { jjCheckNAddStates(109, 111); }
+                     { jjCheckNAddStates(112, 114); }
                   break;
-               case 231:
+               case 234:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 230;
+                     jjstateSet[jjnewStateCnt++] = 233;
                   break;
-               case 236:
+               case 239:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 165)
-                     kind = 165;
+                  if (kind > 171)
+                     kind = 171;
                   { jjCheckNAddStates(0, 6); }
                   break;
-               case 237:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 165)
-                     kind = 165;
-                  { jjCheckNAdd(237); }
-                  break;
-               case 238:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(238, 239); }
-                  break;
-               case 239:
-                  if (curChar == 46)
-                     { jjCheckNAdd(240); }
-                  break;
                case 240:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 166)
-                     kind = 166;
+                  if (kind > 171)
+                     kind = 171;
                   { jjCheckNAdd(240); }
                   break;
                case 241:
@@ -3255,230 +3345,245 @@ else if (curChar == 39)
                   break;
                case 242:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(243, 244); }
+                     { jjCheckNAdd(243); }
                   break;
                case 243:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 172)
+                     kind = 172;
+                  { jjCheckNAdd(243); }
+                  break;
+               case 244:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(243, 244); }
+                     { jjCheckNAddTwoStates(244, 245); }
                   break;
                case 245:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(246); }
+                  if (curChar == 46)
+                     { jjCheckNAddTwoStates(246, 247); }
                   break;
                case 246:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(246, 247); }
+                  break;
+               case 248:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(249); }
+                  break;
+               case 249:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 167)
-                     kind = 167;
-                  { jjCheckNAdd(246); }
+                  if (kind > 173)
+                     kind = 173;
+                  { jjCheckNAdd(249); }
                   break;
-               case 247:
+               case 250:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(247, 248); }
+                     { jjCheckNAddTwoStates(250, 251); }
                   break;
-               case 249:
+               case 252:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(250); }
+                     { jjCheckNAdd(253); }
                   break;
-               case 250:
+               case 253:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 167)
-                     kind = 167;
-                  { jjCheckNAdd(250); }
+                  if (kind > 173)
+                     kind = 173;
+                  { jjCheckNAdd(253); }
                   break;
-               case 251:
+               case 254:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(240, 252); }
+                     { jjCheckNAddTwoStates(243, 255); }
                   break;
-               case 252:
+               case 255:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(252, 253); }
+                     { jjCheckNAddTwoStates(255, 256); }
                   break;
-               case 254:
+               case 257:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(255); }
+                     { jjCheckNAdd(258); }
                   break;
-               case 255:
+               case 258:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 167)
-                     kind = 167;
-                  { jjCheckNAdd(255); }
+                  if (kind > 173)
+                     kind = 173;
+                  { jjCheckNAdd(258); }
                   break;
-               case 256:
+               case 259:
                   if (curChar == 43)
                      { jjCheckNAddStates(12, 16); }
                   break;
-               case 257:
+               case 260:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 168)
-                     kind = 168;
-                  { jjCheckNAdd(257); }
+                  if (kind > 174)
+                     kind = 174;
+                  { jjCheckNAdd(260); }
                   break;
-               case 258:
+               case 261:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(258, 259); }
+                     { jjCheckNAddTwoStates(261, 262); }
                   break;
-               case 259:
+               case 262:
                   if (curChar == 46)
-                     { jjCheckNAdd(260); }
+                     { jjCheckNAdd(263); }
                   break;
-               case 260:
+               case 263:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 169)
-                     kind = 169;
-                  { jjCheckNAdd(260); }
+                  if (kind > 175)
+                     kind = 175;
+                  { jjCheckNAdd(263); }
                   break;
-               case 261:
+               case 264:
                   if (curChar == 46)
-                     { jjCheckNAdd(262); }
+                     { jjCheckNAdd(265); }
                   break;
-               case 262:
+               case 265:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(262, 263); }
+                     { jjCheckNAddTwoStates(265, 266); }
                   break;
-               case 264:
+               case 267:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(265); }
+                     { jjCheckNAdd(268); }
                   break;
-               case 265:
+               case 268:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 170)
-                     kind = 170;
-                  { jjCheckNAdd(265); }
+                  if (kind > 176)
+                     kind = 176;
+                  { jjCheckNAdd(268); }
                   break;
-               case 266:
+               case 269:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(112, 115); }
+                     { jjCheckNAddStates(115, 118); }
                   break;
-               case 267:
+               case 270:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(267, 268); }
+                     { jjCheckNAddTwoStates(270, 271); }
                   break;
-               case 268:
+               case 271:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(269, 270); }
+                     { jjCheckNAddTwoStates(272, 273); }
                   break;
-               case 269:
+               case 272:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(269, 270); }
+                     { jjCheckNAddTwoStates(272, 273); }
                   break;
-               case 271:
+               case 274:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(272); }
+                     { jjCheckNAdd(275); }
                   break;
-               case 272:
+               case 275:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 170)
-                     kind = 170;
-                  { jjCheckNAdd(272); }
+                  if (kind > 176)
+                     kind = 176;
+                  { jjCheckNAdd(275); }
                   break;
-               case 273:
+               case 276:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(273, 274); }
+                     { jjCheckNAddTwoStates(276, 277); }
                   break;
-               case 275:
+               case 278:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(276); }
+                     { jjCheckNAdd(279); }
                   break;
-               case 276:
+               case 279:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 170)
-                     kind = 170;
-                  { jjCheckNAdd(276); }
+                  if (kind > 176)
+                     kind = 176;
+                  { jjCheckNAdd(279); }
                   break;
-               case 277:
+               case 280:
                   if (curChar == 45)
                      { jjCheckNAddStates(7, 11); }
                   break;
-               case 278:
+               case 281:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 171)
-                     kind = 171;
-                  { jjCheckNAdd(278); }
+                  if (kind > 177)
+                     kind = 177;
+                  { jjCheckNAdd(281); }
                   break;
-               case 279:
+               case 282:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(279, 280); }
+                     { jjCheckNAddTwoStates(282, 283); }
                   break;
-               case 280:
+               case 283:
                   if (curChar == 46)
-                     { jjCheckNAdd(281); }
+                     { jjCheckNAdd(284); }
                   break;
-               case 281:
+               case 284:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 172)
-                     kind = 172;
-                  { jjCheckNAdd(281); }
+                  if (kind > 178)
+                     kind = 178;
+                  { jjCheckNAdd(284); }
                   break;
-               case 282:
+               case 285:
                   if (curChar == 46)
-                     { jjCheckNAdd(283); }
+                     { jjCheckNAdd(286); }
                   break;
-               case 283:
+               case 286:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(283, 284); }
+                     { jjCheckNAddTwoStates(286, 287); }
                   break;
-               case 285:
+               case 288:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(286); }
+                     { jjCheckNAdd(289); }
                   break;
-               case 286:
+               case 289:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 173)
-                     kind = 173;
-                  { jjCheckNAdd(286); }
+                  if (kind > 179)
+                     kind = 179;
+                  { jjCheckNAdd(289); }
                   break;
-               case 287:
+               case 290:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(116, 119); }
+                     { jjCheckNAddStates(119, 122); }
                   break;
-               case 288:
+               case 291:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(288, 289); }
+                     { jjCheckNAddTwoStates(291, 292); }
                   break;
-               case 289:
+               case 292:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(290, 291); }
+                     { jjCheckNAddTwoStates(293, 294); }
                   break;
-               case 290:
+               case 293:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(290, 291); }
+                     { jjCheckNAddTwoStates(293, 294); }
                   break;
-               case 292:
+               case 295:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(293); }
+                     { jjCheckNAdd(296); }
                   break;
-               case 293:
+               case 296:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 173)
-                     kind = 173;
-                  { jjCheckNAdd(293); }
+                  if (kind > 179)
+                     kind = 179;
+                  { jjCheckNAdd(296); }
                   break;
-               case 294:
+               case 297:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(294, 295); }
+                     { jjCheckNAddTwoStates(297, 298); }
                   break;
-               case 296:
+               case 299:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(297); }
+                     { jjCheckNAdd(300); }
                   break;
-               case 297:
+               case 300:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 173)
-                     kind = 173;
-                  { jjCheckNAdd(297); }
+                  if (kind > 179)
+                     kind = 179;
+                  { jjCheckNAdd(300); }
                   break;
                default : break;
             }
@@ -3493,19 +3598,19 @@ else if (curChar < 128)
             {
                case 0:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(120, 127); }
+                     { jjCheckNAddStates(123, 130); }
                   else if (curChar == 91)
-                     { jjCheckNAddStates(78, 80); }
+                     { jjCheckNAddStates(81, 83); }
                   else if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 65;
+                     jjstateSet[jjnewStateCnt++] = 68;
                   else if (curChar == 64)
                      { jjCheckNAdd(45); }
                   else if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 22;
                   if ((0x1000000010L & l) != 0L)
-                     { jjAddStates(128, 129); }
+                     { jjAddStates(131, 132); }
                   else if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 62;
+                     jjstateSet[jjnewStateCnt++] = 65;
                   break;
                case 1:
                   if (kind > 6)
@@ -3518,7 +3623,7 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 8:
                   if (curChar == 92)
-                     { jjAddStates(130, 131); }
+                     { jjAddStates(133, 134); }
                   break;
                case 9:
                   if (curChar == 85)
@@ -3613,92 +3718,87 @@ else if ((0x20000000200L & l) != 0L)
                      break;
                   if (kind > 16)
                      kind = 16;
-                  { jjCheckNAddTwoStates(45, 46); }
+                  { jjCheckNAddStates(135, 137); }
                   break;
                case 47:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
                   if (kind > 16)
                      kind = 16;
-                  { jjCheckNAddTwoStates(46, 47); }
+                  { jjCheckNAddStates(45, 47); }
                   break;
-               case 48:
-                  if ((0x10000000100000L & l) != 0L)
-                     { jjCheckNAddStates(51, 53); }
+               case 49:
+                  if ((0x7fffffe07fffffeL & l) == 0L)
+                     break;
+                  if (kind > 16)
+                     kind = 16;
+                  jjstateSet[jjnewStateCnt++] = 49;
                   break;
-               case 50:
-                  { jjCheckNAddStates(45, 50); }
+               case 51:
+                  if ((0x10000000100000L & l) != 0L)
+                     { jjCheckNAddStates(54, 56); }
                   break;
                case 53:
-                  if ((0x200000002L & l) != 0L && kind > 146)
-                     kind = 146;
+                  { jjCheckNAddStates(48, 53); }
                   break;
-               case 54:
+               case 56:
+                  if ((0x200000002L & l) != 0L && kind > 152)
+                     kind = 152;
+                  break;
+               case 57:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 53;
+                     jjstateSet[jjnewStateCnt++] = 56;
                   break;
-               case 55:
+               case 58:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 54;
+                     jjstateSet[jjnewStateCnt++] = 57;
                   break;
-               case 56:
+               case 59:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 55;
+                     jjstateSet[jjnewStateCnt++] = 58;
                   break;
-               case 59:
+               case 62:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 48;
+                     jjstateSet[jjnewStateCnt++] = 51;
                   break;
-               case 60:
+               case 63:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 59;
+                     jjstateSet[jjnewStateCnt++] = 62;
                   break;
-               case 61:
+               case 64:
                   if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 60;
+                     jjstateSet[jjnewStateCnt++] = 63;
                   break;
-               case 62:
+               case 65:
                   if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 61;
+                     jjstateSet[jjnewStateCnt++] = 64;
                   break;
-               case 63:
+               case 66:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 62;
-                  break;
-               case 64:
-                  if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 65;
                   break;
-               case 65:
-                  if ((0x14404410000000L & l) != 0L && kind > 177)
-                     kind = 177;
-                  break;
                case 67:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(37, 39); }
-                  break;
-               case 69:
                   if (curChar == 92)
-                     { jjAddStates(132, 134); }
+                     jjstateSet[jjnewStateCnt++] = 68;
+                  break;
+               case 68:
+                  if ((0x14404410000000L & l) != 0L && kind > 183)
+                     kind = 183;
                   break;
                case 70:
-                  if ((0x14404410000000L & l) != 0L)
+                  if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 71:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 72;
-                  break;
                case 72:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 73;
+                  if (curChar == 92)
+                     { jjAddStates(138, 140); }
                   break;
                case 73:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 74;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(37, 39); }
                   break;
                case 74:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 75;
                   break;
                case 75:
@@ -3714,52 +3814,52 @@ else if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 78;
                   break;
                case 78:
-               case 83:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(79); }
+                     jjstateSet[jjnewStateCnt++] = 79;
                   break;
                case 79:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(37, 39); }
+                     jjstateSet[jjnewStateCnt++] = 80;
                   break;
                case 80:
-                  if (curChar == 117)
+                  if ((0x7e0000007eL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 81;
                   break;
                case 81:
+               case 86:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 82;
+                     { jjCheckNAdd(82); }
                   break;
                case 82:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 83;
+                     { jjCheckNAddStates(37, 39); }
                   break;
-               case 85:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(34, 36); }
+               case 83:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 84;
                   break;
-               case 87:
-                  if (curChar == 92)
-                     { jjAddStates(135, 137); }
+               case 84:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 85;
+                  break;
+               case 85:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 86;
                   break;
                case 88:
-                  if ((0x14404410000000L & l) != 0L)
+                  if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 89:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 90;
-                  break;
                case 90:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 91;
+                  if (curChar == 92)
+                     { jjAddStates(141, 143); }
                   break;
                case 91:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 92;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(34, 36); }
                   break;
                case 92:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 93;
                   break;
                case 93:
@@ -3775,52 +3875,52 @@ else if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 96;
                   break;
                case 96:
-               case 101:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(97); }
+                     jjstateSet[jjnewStateCnt++] = 97;
                   break;
                case 97:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(34, 36); }
+                     jjstateSet[jjnewStateCnt++] = 98;
                   break;
                case 98:
-                  if (curChar == 117)
+                  if ((0x7e0000007eL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 99;
                   break;
                case 99:
+               case 104:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 100;
+                     { jjCheckNAdd(100); }
                   break;
                case 100:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 101;
+                     { jjCheckNAddStates(34, 36); }
                   break;
-               case 104:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
+               case 101:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 102;
                   break;
-               case 107:
-                  if (curChar == 92)
-                     { jjAddStates(138, 140); }
+               case 102:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 103;
                   break;
-               case 108:
-                  if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
+               case 103:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 104;
                   break;
-               case 109:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 110;
+               case 107:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(57, 60); }
                   break;
                case 110:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 111;
+                  if (curChar == 92)
+                     { jjAddStates(144, 146); }
                   break;
                case 111:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 112;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(57, 60); }
                   break;
                case 112:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 113;
                   break;
                case 113:
@@ -3836,52 +3936,52 @@ else if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 116;
                   break;
                case 116:
-               case 121:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(117); }
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
                case 117:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(54, 57); }
+                     jjstateSet[jjnewStateCnt++] = 118;
                   break;
                case 118:
-                  if (curChar == 117)
+                  if ((0x7e0000007eL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 119;
                   break;
                case 119:
+               case 124:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 120;
+                     { jjCheckNAdd(120); }
                   break;
                case 120:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 121;
+                     { jjCheckNAddStates(57, 60); }
                   break;
-               case 128:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
+               case 121:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 122;
                   break;
-               case 131:
-                  if (curChar == 92)
-                     { jjAddStates(141, 143); }
+               case 122:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 123;
                   break;
-               case 132:
-                  if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
+               case 123:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 124;
                   break;
-               case 133:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 134;
+               case 131:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(63, 66); }
                   break;
                case 134:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 135;
+                  if (curChar == 92)
+                     { jjAddStates(147, 149); }
                   break;
                case 135:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 136;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(63, 66); }
                   break;
                case 136:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 137;
                   break;
                case 137:
@@ -3897,247 +3997,259 @@ else if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 140;
                   break;
                case 140:
-               case 145:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAdd(141); }
+                     jjstateSet[jjnewStateCnt++] = 141;
                   break;
                case 141:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(60, 63); }
+                     jjstateSet[jjnewStateCnt++] = 142;
                   break;
                case 142:
-                  if (curChar == 117)
+                  if ((0x7e0000007eL & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 143;
                   break;
                case 143:
+               case 148:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 144;
+                     { jjCheckNAdd(144); }
                   break;
                case 144:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 145;
+                     { jjCheckNAddStates(63, 66); }
                   break;
-               case 152:
-                  { jjAddStates(66, 71); }
+               case 145:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 146;
                   break;
-               case 158:
-                  if (curChar == 91)
-                     { jjCheckNAddStates(78, 80); }
+               case 146:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 147;
                   break;
-               case 160:
-                  { jjCheckNAddStates(72, 77); }
+               case 147:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 148;
+                  break;
+               case 155:
+                  { jjAddStates(69, 74); }
+                  break;
+               case 161:
+                  if (curChar == 91)
+                     { jjCheckNAddStates(81, 83); }
                   break;
                case 163:
-                  if (curChar == 93 && kind > 192)
-                     kind = 192;
+                  { jjCheckNAddStates(75, 80); }
                   break;
                case 166:
+                  if (curChar == 93 && kind > 198)
+                     kind = 198;
+                  break;
+               case 169:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(120, 127); }
+                     { jjCheckNAddStates(123, 130); }
                   break;
-               case 167:
+               case 170:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(81, 83); }
+                     { jjCheckNAddStates(84, 86); }
                   break;
-               case 168:
+               case 171:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAdd(169); }
+                     { jjCheckNAdd(172); }
                   break;
-               case 173:
+               case 176:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(84, 86); }
+                     { jjCheckNAddStates(87, 89); }
                   break;
-               case 174:
+               case 177:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAdd(175); }
+                     { jjCheckNAdd(178); }
                   break;
-               case 176:
+               case 179:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 177:
+               case 180:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 178:
+               case 181:
                   if ((0x7fffffe87fffffeL & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 181:
+               case 184:
                   if (curChar == 92)
-                     { jjAddStates(144, 145); }
+                     { jjAddStates(150, 151); }
                   break;
-               case 182:
+               case 185:
                   if ((0x4000000080000001L & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 184:
+               case 187:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 185;
+                     jjstateSet[jjnewStateCnt++] = 188;
                   break;
-               case 185:
+               case 188:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 186:
+               case 189:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 187;
+                     jjstateSet[jjnewStateCnt++] = 190;
                   break;
-               case 187:
+               case 190:
                   if ((0x7e0000007eL & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 188:
+               case 191:
                   if ((0x4000000080000001L & l) != 0L && kind > 12)
                      kind = 12;
                   break;
-               case 190:
+               case 193:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 191;
+                     jjstateSet[jjnewStateCnt++] = 194;
                   break;
-               case 191:
+               case 194:
                   if ((0x4000000080000001L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 193:
+               case 196:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 194;
+                     jjstateSet[jjnewStateCnt++] = 197;
                   break;
-               case 194:
+               case 197:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 204:
+               case 207:
                   if ((0x1000000010L & l) != 0L)
-                     { jjAddStates(128, 129); }
+                     { jjAddStates(131, 132); }
                   break;
-               case 205:
+               case 208:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAddStates(100, 102); }
-                  break;
-               case 207:
-                  { jjCheckNAddStates(94, 99); }
+                     { jjCheckNAddStates(103, 105); }
                   break;
                case 210:
-                  if ((0x200000002L & l) != 0L && kind > 147)
-                     kind = 147;
+                  { jjCheckNAddStates(97, 102); }
                   break;
-               case 211:
+               case 213:
+                  if ((0x200000002L & l) != 0L && kind > 153)
+                     kind = 153;
+                  break;
+               case 214:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 210;
+                     jjstateSet[jjnewStateCnt++] = 213;
                   break;
-               case 212:
+               case 215:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 211;
+                     jjstateSet[jjnewStateCnt++] = 214;
                   break;
-               case 213:
+               case 216:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 212;
+                     jjstateSet[jjnewStateCnt++] = 215;
                   break;
-               case 216:
+               case 219:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 205;
+                     jjstateSet[jjnewStateCnt++] = 208;
                   break;
-               case 217:
+               case 220:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 216;
+                     jjstateSet[jjnewStateCnt++] = 219;
                   break;
-               case 218:
+               case 221:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 217;
+                     jjstateSet[jjnewStateCnt++] = 220;
                   break;
-               case 219:
+               case 222:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 218;
+                     jjstateSet[jjnewStateCnt++] = 221;
                   break;
-               case 220:
+               case 223:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAddStates(109, 111); }
-                  break;
-               case 222:
-                  { jjCheckNAddStates(103, 108); }
+                     { jjCheckNAddStates(112, 114); }
                   break;
                case 225:
-                  if ((0x2000000020L & l) != 0L && kind > 148)
-                     kind = 148;
+                  { jjCheckNAddStates(106, 111); }
                   break;
-               case 226:
+               case 228:
+                  if ((0x2000000020L & l) != 0L && kind > 154)
+                     kind = 154;
+                  break;
+               case 229:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 225;
+                     jjstateSet[jjnewStateCnt++] = 228;
                   break;
-               case 227:
+               case 230:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 226;
+                     jjstateSet[jjnewStateCnt++] = 229;
                   break;
-               case 228:
+               case 231:
                   if ((0x10000000100L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 227;
+                     jjstateSet[jjnewStateCnt++] = 230;
                   break;
-               case 229:
+               case 232:
                   if ((0x80000000800000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 228;
+                     jjstateSet[jjnewStateCnt++] = 231;
                   break;
-               case 232:
+               case 235:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 220;
+                     jjstateSet[jjnewStateCnt++] = 223;
                   break;
-               case 233:
+               case 236:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 232;
+                     jjstateSet[jjnewStateCnt++] = 235;
                   break;
-               case 234:
+               case 237:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 233;
-                  break;
-               case 235:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 234;
-                  break;
-               case 244:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(146, 147); }
-                  break;
-               case 248:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(148, 149); }
+                     jjstateSet[jjnewStateCnt++] = 236;
                   break;
-               case 253:
+               case 238:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(150, 151); }
+                     jjstateSet[jjnewStateCnt++] = 237;
                   break;
-               case 263:
+               case 247:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(152, 153); }
                   break;
-               case 270:
+               case 251:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(154, 155); }
                   break;
-               case 274:
+               case 256:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(156, 157); }
                   break;
-               case 284:
+               case 266:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(158, 159); }
                   break;
-               case 291:
+               case 273:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(160, 161); }
                   break;
-               case 295:
+               case 277:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(162, 163); }
                   break;
+               case 287:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(164, 165); }
+                  break;
+               case 294:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(166, 167); }
+                  break;
+               case 298:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(168, 169); }
+                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -4155,9 +4267,9 @@ else if ((0x20000000200L & l) != 0L)
             {
                case 0:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(120, 127); }
+                     { jjCheckNAddStates(123, 130); }
                   if (jjCanMove_25(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(164, 165); }
+                     { jjAddStates(170, 171); }
                   break;
                case 1:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -4187,7 +4299,7 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 26:
                   if (jjCanMove_3(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(166, 167); }
+                     { jjAddStates(172, 173); }
                   break;
                case 27:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
@@ -4266,135 +4378,135 @@ else if ((0x20000000200L & l) != 0L)
                   if (jjCanMove_13(hiByte, i1, i2, l1, l2))
                      { jjCheckNAdd(42); }
                   break;
-               case 50:
+               case 53:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(45, 50); }
+                     { jjAddStates(48, 53); }
                   break;
-               case 67:
+               case 70:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjAddStates(37, 39); }
                   break;
-               case 85:
+               case 88:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjAddStates(34, 36); }
                   break;
-               case 104:
+               case 107:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(54, 57); }
+                     { jjAddStates(57, 60); }
                   break;
-               case 128:
+               case 131:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(60, 63); }
+                     { jjAddStates(63, 66); }
                   break;
-               case 152:
+               case 155:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(66, 71); }
+                     { jjAddStates(69, 74); }
                   break;
-               case 160:
+               case 163:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(72, 77); }
+                     { jjAddStates(75, 80); }
                   break;
-               case 166:
+               case 169:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(120, 127); }
+                     { jjCheckNAddStates(123, 130); }
                   break;
-               case 167:
+               case 170:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(81, 83); }
+                     { jjCheckNAddStates(84, 86); }
                   break;
-               case 168:
+               case 171:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(169); }
+                     { jjCheckNAdd(172); }
                   break;
-               case 170:
+               case 173:
                   if (jjCanMove_14(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(168, 169); }
+                     { jjAddStates(174, 175); }
                   break;
-               case 171:
+               case 174:
                   if (jjCanMove_15(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(81, 83); }
+                     { jjCheckNAddStates(84, 86); }
                   break;
-               case 172:
+               case 175:
                   if (jjCanMove_16(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(169); }
+                     { jjCheckNAdd(172); }
                   break;
-               case 173:
+               case 176:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(84, 86); }
+                     { jjCheckNAddStates(87, 89); }
                   break;
-               case 174:
+               case 177:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(175); }
+                     { jjCheckNAdd(178); }
                   break;
-               case 176:
+               case 179:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 177:
+               case 180:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 178:
+               case 181:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 12)
                      kind = 12;
                   break;
-               case 179:
+               case 182:
                   if (jjCanMove_17(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(170, 171); }
+                     { jjAddStates(176, 177); }
                   break;
-               case 180:
+               case 183:
                   if (jjCanMove_18(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(87, 91); }
+                     { jjCheckNAddStates(90, 94); }
                   break;
-               case 189:
+               case 192:
                   if (jjCanMove_19(hiByte, i1, i2, l1, l2) && kind > 12)
                      kind = 12;
                   break;
-               case 195:
+               case 198:
                   if (jjCanMove_20(hiByte, i1, i2, l1, l2))
-                     jjstateSet[jjnewStateCnt++] = 196;
+                     jjstateSet[jjnewStateCnt++] = 199;
                   break;
-               case 196:
+               case 199:
                   if (!jjCanMove_21(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAddStates(87, 91); }
+                  { jjCheckNAddStates(90, 94); }
                   break;
-               case 197:
+               case 200:
                   if (jjCanMove_22(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(172, 173); }
+                     { jjAddStates(178, 179); }
                   break;
-               case 198:
+               case 201:
                   if (jjCanMove_23(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(84, 86); }
+                     { jjCheckNAddStates(87, 89); }
                   break;
-               case 199:
+               case 202:
                   if (jjCanMove_24(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(175); }
+                     { jjCheckNAdd(178); }
                   break;
-               case 200:
+               case 203:
                   if (jjCanMove_25(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(164, 165); }
+                     { jjAddStates(170, 171); }
                   break;
-               case 201:
+               case 204:
                   if (jjCanMove_26(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(174, 177); }
+                     { jjCheckNAddStates(180, 183); }
                   break;
-               case 202:
+               case 205:
                   if (jjCanMove_27(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(178, 181); }
+                     { jjCheckNAddStates(184, 187); }
                   break;
-               case 207:
+               case 210:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(94, 99); }
+                     { jjAddStates(97, 102); }
                   break;
-               case 222:
+               case 225:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(103, 108); }
+                     { jjAddStates(106, 111); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -4407,7 +4519,7 @@ else if ((0x20000000200L & l) != 0L)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 298 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 301 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -4448,11 +4560,12 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, "\50", "\51", null, "\173", "\175", "\133", "\135", null, 
-"\73", "\54", "\56", "\75", "\41\75", "\76", "\74", "\74\75", "\76\75", "\76\76", 
-"\74\74", "\173\174", "\174\175", "\41", "\176", "\72", "\174\174", "\46\46", "\53", 
-"\55", "\52", "\57", "\136\136", "\100", "\72\75", "\174", "\136", "\55\76", 
-"\74\55", "\77", null, null, null, null, null, null, null, null, null, null, null, null, };
+null, null, null, null, null, null, null, null, null, null, "\50", "\51", null, 
+"\173", "\175", "\133", "\135", null, "\73", "\54", "\56", "\75", "\41\75", "\76", 
+"\74", "\74\75", "\76\75", "\74\74\50", "\51\76\76", "\74\74", "\76\76", "\173\174", 
+"\174\175", "\176", "\41", "\72", "\174\174", "\46\46", "\53", "\55", "\52", "\57", 
+"\136\136", "\100", "\72\75", "\174", "\136", "\55\76", "\74\55", "\77", null, null, null, 
+null, null, null, null, null, null, null, null, null, };
 protected Token jjFillToken()
 {
    final Token t;
@@ -4477,18 +4590,18 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   237, 238, 239, 241, 242, 247, 248, 278, 279, 280, 282, 287, 257, 258, 259, 261, 
-   266, 176, 190, 192, 195, 151, 154, 155, 39, 43, 6, 7, 8, 1, 2, 4, 
-   33, 37, 85, 86, 87, 67, 68, 69, 23, 29, 24, 25, 26, 49, 50, 51, 
-   58, 52, 56, 49, 52, 56, 103, 104, 105, 107, 106, 123, 127, 128, 129, 131, 
-   130, 147, 151, 152, 153, 157, 154, 155, 159, 160, 161, 165, 162, 163, 159, 162, 
-   163, 167, 168, 170, 173, 174, 197, 177, 178, 179, 181, 183, 184, 186, 206, 207, 
-   208, 215, 209, 213, 206, 209, 213, 221, 222, 223, 231, 224, 229, 221, 224, 229, 
-   267, 268, 273, 274, 288, 289, 294, 295, 167, 168, 169, 173, 174, 175, 197, 170, 
-   219, 235, 9, 18, 70, 71, 80, 88, 89, 98, 108, 109, 118, 132, 133, 142, 
-   182, 188, 245, 246, 249, 250, 254, 255, 264, 265, 271, 272, 275, 276, 285, 286, 
-   292, 293, 296, 297, 201, 202, 27, 28, 171, 172, 180, 189, 198, 199, 167, 168, 
-   169, 170, 173, 174, 175, 197, 
+   240, 241, 242, 244, 245, 250, 251, 281, 282, 283, 285, 290, 260, 261, 262, 264, 
+   269, 179, 193, 195, 198, 154, 157, 158, 39, 43, 6, 7, 8, 1, 2, 4, 
+   33, 37, 88, 89, 90, 70, 71, 72, 23, 29, 24, 25, 26, 46, 47, 50, 
+   52, 53, 54, 61, 55, 59, 52, 55, 59, 106, 107, 108, 110, 109, 126, 130, 
+   131, 132, 134, 133, 150, 154, 155, 156, 160, 157, 158, 162, 163, 164, 168, 165, 
+   166, 162, 165, 166, 170, 171, 173, 176, 177, 200, 180, 181, 182, 184, 186, 187, 
+   189, 209, 210, 211, 218, 212, 216, 209, 212, 216, 224, 225, 226, 234, 227, 232, 
+   224, 227, 232, 270, 271, 276, 277, 291, 292, 297, 298, 170, 171, 172, 176, 177, 
+   178, 200, 173, 222, 238, 9, 18, 45, 46, 50, 73, 74, 83, 91, 92, 101, 
+   111, 112, 121, 135, 136, 145, 185, 191, 248, 249, 252, 253, 257, 258, 267, 268, 
+   274, 275, 278, 279, 288, 289, 295, 296, 299, 300, 204, 205, 27, 28, 174, 175, 
+   183, 192, 201, 202, 170, 171, 172, 173, 176, 177, 178, 200, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -4968,7 +5081,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 298; i-- > 0;)
+    for (i = 301; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -5006,10 +5119,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffff9fe01L, 0xffffffffffffffffL, 0xffe23fefffffffffL, 0x7fffffffL, 
+   0xfffffffffff9fe01L, 0xffffffffffffffffL, 0xf88ffbffffffffffL, 0x7fffffffffL, 
 };
 static final long[] jjtoSkip = {
    0x7eL, 0x0L, 0x0L, 0x0L, 
@@ -5022,8 +5135,8 @@ public void SwitchTo(int lexState)
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[298];
-    private final int[] jjstateSet = new int[2 * 298];
+    private final int[] jjrounds = new int[301];
+    private final int[] jjstateSet = new int[2 * 301];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
index 638f63009c7..fe43bc5f5de 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10Base.java
@@ -17,10 +17,24 @@
  */
 
 package org.apache.jena.sparql.lang.sparql_10;
+import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.TypeMapper;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.sparql.lang.SPARQLParserBase ;
 
-class SPARQLParser10Base
-        extends SPARQLParserBase
-        implements SPARQLParser10Constants
-{
+class SPARQLParser10Base extends SPARQLParserBase implements SPARQLParser10Constants {
+    // LEGACY
+    protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
+        Node n = null;
+        // Can't have type and lang tag in parsing.
+        if ( datatypeURI != null ) {
+            RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI);
+            n = NodeFactory.createLiteralDT(lexicalForm, dType);
+        } else if ( langTag != null && !langTag.isEmpty() )
+            n = NodeFactory.createLiteralLang(lexicalForm, langTag);
+        else
+            n = NodeFactory.createLiteralString(lexicalForm);
+        return n;
+    }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
index abc88a157f3..2c3b8f1fd7f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11Base.java
@@ -17,10 +17,24 @@
  */
 
 package org.apache.jena.sparql.lang.sparql_11;
+import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.TypeMapper;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.sparql.lang.SPARQLParserBase ;
 
-class SPARQLParser11Base
-        extends SPARQLParserBase
-        implements SPARQLParser11Constants
-{
+class SPARQLParser11Base extends SPARQLParserBase implements SPARQLParser11Constants {
+    // LEGACY
+    protected Node createLiteral(String lexicalForm, String langTag, String datatypeURI) {
+        Node n = null;
+        // Can't have type and lang tag in parsing.
+        if ( datatypeURI != null ) {
+            RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI);
+            n = NodeFactory.createLiteralDT(lexicalForm, dType);
+        } else if ( langTag != null && !langTag.isEmpty() )
+            n = NodeFactory.createLiteralLang(lexicalForm, langTag);
+        else
+            n = NodeFactory.createLiteralString(lexicalForm);
+        return n;
+    }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java
index cc5a7700790..e47a4e5883c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/JavaCharStream.java
@@ -13,7 +13,7 @@
 class JavaCharStream
 {
   /** Whether parser is static. */
-
+  
 @SuppressWarnings("all")
 public static final boolean staticFlag = false;
 
@@ -65,7 +65,7 @@ static final int hexval(char c) throws java.io.IOException {
   }
 
 /* Position in buffer. */
-
+  
 @SuppressWarnings("all")
 public int bufpos = -1;
   int bufsize;
@@ -90,10 +90,10 @@ static final int hexval(char c) throws java.io.IOException {
   protected int tabSize = 1;
   protected boolean trackLineColumn = true;
 
-
+  
 @SuppressWarnings("all")
 public void setTabSize(int i) { tabSize = i; }
-
+  
 @SuppressWarnings("all")
 public int getTabSize() { return tabSize; }
 
@@ -185,7 +185,7 @@ protected char ReadByte() throws java.io.IOException
   }
 
 /* @return starting character for token. */
-
+  
 @SuppressWarnings("all")
 public char BeginToken() throws java.io.IOException
   {
@@ -267,7 +267,7 @@ else if (prevCharIsCR)
   }
 
 /* Read a character. */
-
+  
 @SuppressWarnings("all")
 public char readChar() throws java.io.IOException
   {
@@ -367,7 +367,7 @@ public char readChar() throws java.io.IOException
    * @see #getEndColumn
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getColumn() {
     return bufcolumn[bufpos];
@@ -379,7 +379,7 @@ public int getColumn() {
    * @return the line number.
    */
   @Deprecated
-
+  
 @SuppressWarnings("all")
 public int getLine() {
     return bufline[bufpos];
@@ -388,7 +388,7 @@ public int getLine() {
 /** Get end column.
  * @return the end column or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndColumn() {
     return bufcolumn[bufpos];
@@ -397,7 +397,7 @@ public int getEndColumn() {
 /** Get end line.
  * @return the end line number or -1
  */
-
+  
 @SuppressWarnings("all")
 public int getEndLine() {
     return bufline[bufpos];
@@ -405,21 +405,21 @@ public int getEndLine() {
 
 /** Get the beginning column.
  * @return column of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginColumn() {
     return bufcolumn[tokenBegin];
   }
 
 /** @return line number of token start */
-
+  
 @SuppressWarnings("all")
 public int getBeginLine() {
     return bufline[tokenBegin];
   }
 
 /** Retreat. */
-
+  
 @SuppressWarnings("all")
 public void backup(int amount) {
 
@@ -434,7 +434,7 @@ public void backup(int amount) {
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -455,7 +455,7 @@ public JavaCharStream(java.io.Reader dstream,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -465,15 +465,16 @@ public JavaCharStream(java.io.Reader dstream,
 
 /** Constructor.
  * @param dstream the underlying data source.
+ * @param startline line number of the first character of the stream, mostly for error messages.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.Reader dstream)
   {
     this(dstream, 1, 1, 4096);
   }
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                  int startline, int startcolumn, int buffersize)
@@ -496,7 +497,7 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream,
                                         int startline, int startcolumn)
@@ -505,14 +506,14 @@ public void ReInit(java.io.Reader dstream,
   }
 
 /* Reinitialise. */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.Reader dstream)
   {
     ReInit(dstream, 1, 1, 4096);
   }
 /** Constructor. */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -526,7 +527,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -539,9 +540,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
                         int startcolumn) throws java.io.UnsupportedEncodingException
@@ -554,7 +555,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding, int startlin
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, int startline,
                         int startcolumn)
@@ -565,9 +566,9 @@ public JavaCharStream(java.io.InputStream dstream, int startline,
 /** Constructor.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -577,7 +578,7 @@ public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.
   /** Constructor.
    * @param dstream the underlying data source.
    */
-
+  
 @SuppressWarnings("all")
 public JavaCharStream(java.io.InputStream dstream)
   {
@@ -591,7 +592,7 @@ public JavaCharStream(java.io.InputStream dstream)
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
   int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
@@ -605,7 +606,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startcolumn column number of the first character of the stream.
  * @param buffersize size of the buffer
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
   int startcolumn, int buffersize)
@@ -617,9 +618,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
  * @param encoding the character encoding of the data stream.
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding, int startline,
                      int startcolumn) throws java.io.UnsupportedEncodingException
@@ -631,7 +632,7 @@ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
  * @param startline line number of the first character of the stream, mostly for error messages.
  * @param startcolumn column number of the first character of the stream.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, int startline,
                      int startcolumn)
@@ -641,9 +642,9 @@ public void ReInit(java.io.InputStream dstream, int startline,
 /** Reinitialise.
  * @param dstream the underlying data source.
  * @param encoding the character encoding of the data stream.
- * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported.
+ * @throws UnsupportedEncodingException encoding is invalid or unsupported.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
   {
@@ -653,7 +654,7 @@ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.
 /** Reinitialise.
  * @param dstream the underlying data source.
  */
-
+  
 @SuppressWarnings("all")
 public void ReInit(java.io.InputStream dstream)
   {
@@ -662,7 +663,7 @@ public void ReInit(java.io.InputStream dstream)
 
   /** Get the token timage.
    * @return token image as String */
-
+  
 @SuppressWarnings("all")
 public String GetImage()
   {
@@ -676,7 +677,7 @@ public String GetImage()
   /** Get the suffix as an array of characters.
    * @param len the length of the array to return.
    * @return suffix */
-
+  
 @SuppressWarnings("all")
 public char[] GetSuffix(int len)
   {
@@ -695,7 +696,7 @@ public char[] GetSuffix(int len)
   }
 
   /** Set buffers back to null when finished. */
-
+  
 @SuppressWarnings("all")
 public void Done()
   {
@@ -711,7 +712,7 @@ public void Done()
    * @param newLine the new line number.
    * @param newCol the new column number.
    */
-
+  
 @SuppressWarnings("all")
 public void adjustBeginLineColumn(int newLine, int newCol)
   {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java
index 8a40e62b08e..5bc894bc102 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12.java
@@ -279,6 +279,7 @@ final public void SubSelect() throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesTemplate(acc);
         break;
@@ -517,15 +518,19 @@ final public void GroupClause() throws ParseException {
       case URI:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -596,15 +601,19 @@ final public void GroupClause() throws ParseException {
     case URI:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -713,15 +722,19 @@ final public void HavingClause() throws ParseException {
       case URI:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -811,15 +824,19 @@ final public void OrderClause() throws ParseException {
       case URI:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -918,15 +935,19 @@ final public void OrderClause() throws ParseException {
     case URI:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -989,15 +1010,19 @@ final public void OrderClause() throws ParseException {
       case URI:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -1587,6 +1612,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -1642,6 +1668,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesTemplate(acc);
         break;
@@ -1684,6 +1711,7 @@ final public void Quads(QuadAccSink acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       TriplesTemplate(acc);
       break;
@@ -1727,6 +1755,7 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesTemplate(acc);
         break;
@@ -1792,6 +1821,7 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
 startTriplesBlock() ;
       el = TriplesBlock(null);
@@ -1858,6 +1888,7 @@ final public void TriplesTemplate(TripleCollector acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
 startTriplesBlock() ;
         el = TriplesBlock(null);
@@ -1908,6 +1939,7 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         TriplesBlock(acc);
         break;
@@ -1926,6 +1958,20 @@ final public Element TriplesBlock(ElementPathBlock acc) throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Node ReifiedTripleBlock(TripleCollector acc) throws ParseException {Node reifId ;
+    reifId = ReifiedTriple(acc);
+    PropertyList(reifId, acc);
+{if ("" != null) return reifId ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTripleBlockPath(TripleCollector acc) throws ParseException {Node reifId ;
+    reifId = ReifiedTriple(acc);
+    PropertyListPath(reifId, acc);
+{if ("" != null) return reifId ;}
+    throw new Error("Missing return statement in function");
+}
+
   final public Element GraphPatternNotTriples() throws ParseException {Element el = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LBRACE:{
@@ -2070,7 +2116,7 @@ final public void DataBlock() throws ParseException {
       case STRING_LITERAL2:
       case STRING_LITERAL_LONG1:
       case STRING_LITERAL_LONG2:
-      case LT2:{
+      case L_TRIPLE:{
         ;
         break;
         }
@@ -2157,7 +2203,7 @@ final public void DataBlock() throws ParseException {
           case STRING_LITERAL2:
           case STRING_LITERAL_LONG1:
           case STRING_LITERAL_LONG2:
-          case LT2:{
+          case L_TRIPLE:{
             ;
             break;
             }
@@ -2230,8 +2276,8 @@ final public void DataBlock() throws ParseException {
 {if ("" != null) return null ;}
       break;
       }
-    case LT2:{
-      n = QuotedTripleData();
+    case L_TRIPLE:{
+      n = TripleTermData();
 {if ("" != null) return n ;}
       break;
       }
@@ -2243,6 +2289,56 @@ final public void DataBlock() throws ParseException {
     throw new Error("Missing return statement in function");
 }
 
+  final public Node Reifier() throws ParseException {Token tok = null ; Node reifId = null ;
+    tok = jj_consume_token(TILDE);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:
+    case BLANK_NODE_LABEL:
+    case VAR1:
+    case VAR2:
+    case ANON:{
+      reifId = VarOrReifierId();
+      break;
+      }
+    default:
+      jj_la1[79] = jj_gen;
+      ;
+    }
+{if ("" != null) return reifId;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node VarOrReifierId() throws ParseException {Node n = null; String iri = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+{if ("" != null) return n;}
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+{if ("" != null) return createNode(iri) ;}
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+{if ("" != null) return n ;}
+      break;
+      }
+    default:
+      jj_la1[80] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+}
+
   final public Element MinusGraphPattern() throws ParseException {Element el ;
     jj_consume_token(MINUS_P);
     el = GroupGraphPattern();
@@ -2260,7 +2356,7 @@ final public void DataBlock() throws ParseException {
         break;
         }
       default:
-        jj_la1[79] = jj_gen;
+        jj_la1[81] = jj_gen;
         break label_19;
       }
       jj_consume_token(UNION);
@@ -2311,15 +2407,19 @@ final public void DataBlock() throws ParseException {
     case URI:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -2365,7 +2465,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[80] = jj_gen;
+      jj_la1[82] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2378,7 +2478,7 @@ final public void DataBlock() throws ParseException {
     a = ArgList();
 if ( AggregateRegistry.isRegistered(fname) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+fname, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+fname, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(fname, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if ("" != null) return exprAgg ;}
@@ -2406,7 +2506,7 @@ final public void DataBlock() throws ParseException {
         break;
         }
       default:
-        jj_la1[81] = jj_gen;
+        jj_la1[83] = jj_gen;
         ;
       }
       expr = Expression();
@@ -2419,7 +2519,7 @@ final public void DataBlock() throws ParseException {
           break;
           }
         default:
-          jj_la1[82] = jj_gen;
+          jj_la1[84] = jj_gen;
           break label_20;
         }
         jj_consume_token(COMMA);
@@ -2430,7 +2530,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[85] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2456,7 +2556,7 @@ final public void DataBlock() throws ParseException {
           break;
           }
         default:
-          jj_la1[84] = jj_gen;
+          jj_la1[86] = jj_gen;
           break label_21;
         }
         jj_consume_token(COMMA);
@@ -2467,7 +2567,7 @@ final public void DataBlock() throws ParseException {
       break;
       }
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[87] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2505,12 +2605,13 @@ final public void DataBlock() throws ParseException {
     case NIL:
     case LBRACKET:
     case ANON:
+    case L_TRIPLE:
     case LT2:{
       ConstructTriples(acc);
       break;
       }
     default:
-      jj_la1[86] = jj_gen;
+      jj_la1[88] = jj_gen;
       ;
     }
     jj_consume_token(RBRACE);
@@ -2550,18 +2651,19 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         ConstructTriples(acc);
         break;
         }
       default:
-        jj_la1[87] = jj_gen;
+        jj_la1[89] = jj_gen;
         ;
       }
       break;
       }
     default:
-      jj_la1[88] = jj_gen;
+      jj_la1[90] = jj_gen;
       ;
     }
 }
@@ -2591,7 +2693,7 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       s = VarOrTerm();
       PropertyListNotEmpty(s, acc);
       break;
@@ -2604,8 +2706,12 @@ final public void ConstructTriples(TripleCollector acc) throws ParseException {
 insert(acc, tempAcc) ;
       break;
       }
+    case LT2:{
+      ReifiedTripleBlock(acc);
+      break;
+      }
     default:
-      jj_la1[89] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2623,7 +2729,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
       break;
       }
     default:
-      jj_la1[90] = jj_gen;
+      jj_la1[92] = jj_gen;
       ;
     }
 }
@@ -2639,7 +2745,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[91] = jj_gen;
+        jj_la1[93] = jj_gen;
         break label_22;
       }
       jj_consume_token(SEMICOLON);
@@ -2655,7 +2761,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[92] = jj_gen;
+        jj_la1[94] = jj_gen;
         ;
       }
     }
@@ -2677,7 +2783,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
       break;
       }
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[95] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2695,7 +2801,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
         break;
         }
       default:
-        jj_la1[94] = jj_gen;
+        jj_la1[96] = jj_gen;
         break label_23;
       }
       jj_consume_token(COMMA);
@@ -2735,7 +2841,7 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
-    case LT2:{
+    case L_TRIPLE:{
       s = VarOrTerm();
       PropertyListPathNotEmpty(s, acc);
       break;
@@ -2748,8 +2854,12 @@ final public void PropertyList(Node s, TripleCollector acc) throws ParseExceptio
 insert(acc, tempAcc) ;
       break;
       }
+    case LT2:{
+      ReifiedTripleBlockPath(acc);
+      break;
+      }
     default:
-      jj_la1[95] = jj_gen;
+      jj_la1[97] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2770,7 +2880,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[96] = jj_gen;
+      jj_la1[98] = jj_gen;
       ;
     }
 }
@@ -2793,7 +2903,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[99] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2806,7 +2916,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[100] = jj_gen;
         break label_24;
       }
       jj_consume_token(SEMICOLON);
@@ -2838,7 +2948,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
           break;
           }
         default:
-          jj_la1[99] = jj_gen;
+          jj_la1[101] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2846,7 +2956,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[100] = jj_gen;
+        jj_la1[102] = jj_gen;
         ;
       }
     }
@@ -2874,7 +2984,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[101] = jj_gen;
+        jj_la1[103] = jj_gen;
         break label_25;
       }
       jj_consume_token(COMMA);
@@ -2905,7 +3015,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[102] = jj_gen;
+        jj_la1[104] = jj_gen;
         break label_26;
       }
       jj_consume_token(VBAR);
@@ -2926,7 +3036,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[105] = jj_gen;
         break label_27;
       }
       jj_consume_token(SLASH);
@@ -2947,7 +3057,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[106] = jj_gen;
       ;
     }
 {if ("" != null) return p ;}
@@ -2972,7 +3082,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[105] = jj_gen;
+      jj_la1[107] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2998,7 +3108,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[108] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3031,7 +3141,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[107] = jj_gen;
+      jj_la1[109] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3069,7 +3179,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
             break;
             }
           default:
-            jj_la1[108] = jj_gen;
+            jj_la1[110] = jj_gen;
             break label_28;
           }
           jj_consume_token(VBAR);
@@ -3079,14 +3189,14 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[109] = jj_gen;
+        jj_la1[111] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
       break;
       }
     default:
-      jj_la1[110] = jj_gen;
+      jj_la1[112] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3124,26 +3234,20 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
         break;
         }
       default:
-        jj_la1[111] = jj_gen;
+        jj_la1[113] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[112] = jj_gen;
+      jj_la1[114] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
 }
 
-  final public long Integer() throws ParseException {Token t ;
-    t = jj_consume_token(INTEGER);
-{if ("" != null) return integerValue(t.image) ;}
-    throw new Error("Missing return statement in function");
-}
-
   final public Node TriplesNode(TripleCollectorMark acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LPAREN:{
@@ -3157,7 +3261,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[113] = jj_gen;
+      jj_la1[115] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3186,7 +3290,7 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       break;
       }
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[116] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3242,12 +3346,13 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         ;
         break;
         }
       default:
-        jj_la1[115] = jj_gen;
+        jj_la1[117] = jj_gen;
         break label_29;
       }
     }
@@ -3298,12 +3403,13 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
       case NIL:
       case LBRACKET:
       case ANON:
+      case L_TRIPLE:
       case LT2:{
         ;
         break;
         }
       default:
-        jj_la1[116] = jj_gen;
+        jj_la1[118] = jj_gen;
         break label_30;
       }
     }
@@ -3314,39 +3420,141 @@ final public void PropertyListPath(Node s, TripleCollector acc) throws ParseExce
     throw new Error("Missing return statement in function");
 }
 
-  final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case L_ANN:{
-      jj_consume_token(L_ANN);
-Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, pAnn, o, token.beginLine, token.beginColumn);
-      PropertyListPathNotEmpty(x, acc);
-      jj_consume_token(R_ANN);
-      break;
+  final public void AnnotationPath(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
+    label_31:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case L_ANN:
+      case TILDE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[119] = jj_gen;
+        break label_31;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+        reifId = Reifier();
+reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ;
+setReifierId(reifId);
+        break;
+        }
+      case L_ANN:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+clearReifierId();
+        AnnotationBlockPath(acc, reifId);
+        break;
+        }
+      default:
+        jj_la1[120] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+clearReifierId();
+}
+
+  final public void AnnotationBlockPath(TripleCollector acc, Node reifId) throws ParseException {
+    jj_consume_token(L_ANN);
+    PropertyListPathNotEmpty(reifId, acc);
+    jj_consume_token(R_ANN);
+}
+
+  final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {Node reifId = null ;
+    label_32:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case L_ANN:
+      case TILDE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[121] = jj_gen;
+        break label_32;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+        reifId = Reifier();
+reifId = insertTripleReifier(acc, reifId, s, p, o, token.beginLine, token.beginColumn) ;
+setReifierId(reifId);
+        break;
+        }
+      case L_ANN:{
+p = preConditionReifier(s, p, path, o, token.beginLine, token.beginColumn);
+      reifId = getOrAllocReifierId(acc, s, p, o, token.beginLine, token.beginColumn);
+clearReifierId();
+        AnnotationBlock(acc, reifId);
+        break;
+        }
+      default:
+        jj_la1[122] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[117] = jj_gen;
-      ;
     }
 }
 
-  final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Node o) throws ParseException {
+  final public void AnnotationBlock(TripleCollector acc, Node reifId) throws ParseException {
+    jj_consume_token(L_ANN);
+    PropertyListNotEmpty(reifId, acc);
+    jj_consume_token(R_ANN);
+}
+
+  final public Node GraphNode(TripleCollectorMark acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case L_ANN:{
-      jj_consume_token(L_ANN);
-Node pAnn = preConditionAnnotation(s, p, path, o, token.beginLine, token.beginColumn) ;
-        Node x = createQuotedTriple(s, p, o, token.beginLine, token.beginColumn);
-      PropertyListNotEmpty(x, acc);
-      jj_consume_token(R_ANN);
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:
+    case BLANK_NODE_LABEL:
+    case VAR1:
+    case VAR2:
+    case TRUE:
+    case FALSE:
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:
+    case NIL:
+    case ANON:
+    case L_TRIPLE:{
+      n = VarOrTerm();
+{if ("" != null) return n ;}
+      break;
+      }
+    case LPAREN:
+    case LBRACKET:{
+      n = TriplesNode(acc);
+{if ("" != null) return n ;}
+      break;
+      }
+    case LT2:{
+      n = ReifiedTriple(acc);
+{if ("" != null) return n ;}
       break;
       }
     default:
-      jj_la1[118] = jj_gen;
-      ;
+      jj_la1[123] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public Node GraphNode(TripleCollectorMark acc) throws ParseException {Node n ;
+  final public Node GraphNodePath(TripleCollectorMark acc) throws ParseException {Node n ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
@@ -3371,35 +3579,260 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG2:
     case NIL:
     case ANON:
+    case L_TRIPLE:{
+      n = VarOrTerm();
+{if ("" != null) return n ;}
+      break;
+      }
+    case LPAREN:
+    case LBRACKET:{
+      n = TriplesNodePath(acc);
+{if ("" != null) return n ;}
+      break;
+      }
+    case LT2:{
+      n = ReifiedTriple(acc);
+{if ("" != null) return n ;}
+      break;
+      }
+    default:
+      jj_la1[124] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node VarOrTerm() throws ParseException {Node n = null ; String iri ;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+{if ("" != null) return createNode(iri) ;}
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
+      break;
+      }
+    case NIL:{
+      jj_consume_token(NIL);
+{if ("" != null) return nRDFnil ;}
+      break;
+      }
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
+      break;
+      }
+    default:
+      jj_la1[125] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTriple(TripleCollector acc) throws ParseException {Node reifId = null ; Token tok ; Node s; Node p ; Node o ;
+    tok = jj_consume_token(LT2);
+    s = ReifiedTripleSubject(acc);
+    p = Verb();
+    o = ReifiedTripleObject(acc);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TILDE:{
+      reifId = Reifier();
+      break;
+      }
+    default:
+      jj_la1[126] = jj_gen;
+      ;
+    }
+reifId = insertTripleReifier(acc, reifId, s, p, o, tok.beginLine, tok.beginColumn) ;
+    jj_consume_token(GT2);
+{if ("" != null) return reifId;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTripleSubject(TripleCollector acc) throws ParseException {Node s; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      s = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+s = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      s = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      s = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      s = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      s = BlankNode();
+      break;
+      }
+    case LT2:{
+      s = ReifiedTriple(acc);
+      break;
+      }
+    default:
+      jj_la1[127] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+{if ("" != null) return s;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ReifiedTripleObject(TripleCollector acc) throws ParseException {Node o; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      o = Var();
+      break;
+      }
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+o = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      o = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      o = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      o = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      o = BlankNode();
+      break;
+      }
     case LT2:{
-      n = VarOrTerm();
-{if ("" != null) return n ;}
+      o = ReifiedTriple(acc);
       break;
       }
-    case LPAREN:
-    case LBRACKET:{
-      n = TriplesNode(acc);
-{if ("" != null) return n ;}
+    case L_TRIPLE:{
+      o = TripleTerm();
       break;
       }
     default:
-      jj_la1[119] = jj_gen;
+      jj_la1[128] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return o;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node GraphNodePath(TripleCollectorMark acc) throws ParseException {Node n ;
+  final public Node TripleTerm() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
+    openToken = jj_consume_token(L_TRIPLE);
+    s = TripleTermSubject();
+    p = Verb();
+    o = TripleTermObject();
+n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermSubject() throws ParseException {Node n; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
     case IRIref:
     case PNAME_NS:
-    case PNAME_LN:
-    case BLANK_NODE_LABEL:
-    case VAR1:
-    case VAR2:
-    case TRUE:
-    case FALSE:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
     case INTEGER:
     case DECIMAL:
     case DOUBLE:
@@ -3408,33 +3841,30 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case DOUBLE_POSITIVE:
     case INTEGER_NEGATIVE:
     case DECIMAL_NEGATIVE:
-    case DOUBLE_NEGATIVE:
-    case STRING_LITERAL1:
-    case STRING_LITERAL2:
-    case STRING_LITERAL_LONG1:
-    case STRING_LITERAL_LONG2:
-    case NIL:
-    case ANON:
-    case LT2:{
-      n = VarOrTerm();
-{if ("" != null) return n ;}
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
       break;
       }
-    case LPAREN:
-    case LBRACKET:{
-      n = TriplesNodePath(acc);
-{if ("" != null) return n ;}
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case BLANK_NODE_LABEL:
+    case ANON:{
+      n = BlankNode();
       break;
       }
     default:
-      jj_la1[120] = jj_gen;
+      jj_la1[129] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node VarOrTerm() throws ParseException {Node n = null ; String iri ;
+  final public Node TripleTermObject() throws ParseException {Node n; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case VAR1:
     case VAR2:{
@@ -3445,7 +3875,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case PNAME_NS:
     case PNAME_LN:{
       iri = iri();
-{if ("" != null) return createNode(iri) ;}
+n = createNode(iri) ;
       break;
       }
     case STRING_LITERAL1:
@@ -3453,7 +3883,6 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:{
       n = RDFLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case INTEGER:
@@ -3466,53 +3895,35 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case DECIMAL_NEGATIVE:
     case DOUBLE_NEGATIVE:{
       n = NumericLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case TRUE:
     case FALSE:{
       n = BooleanLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case BLANK_NODE_LABEL:
     case ANON:{
       n = BlankNode();
-{if ("" != null) return n ;}
-      break;
-      }
-    case NIL:{
-      jj_consume_token(NIL);
-{if ("" != null) return nRDFnil ;}
       break;
       }
-    case LT2:{
-      n = QuotedTriple();
+    case L_TRIPLE:{
+      n = TripleTerm();
+{if ("" != null) return n;}
       break;
       }
     default:
-      jj_la1[121] = jj_gen;
+      jj_la1[130] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-{if ("" != null) return n ;}
-    throw new Error("Missing return statement in function");
-}
-
-  final public Node QuotedTriple() throws ParseException {Node n = null ; Token t ; Node s , p , o ;
-    t = jj_consume_token(LT2);
-    s = VarOrTerm();
-    p = Verb();
-    o = VarOrTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    jj_consume_token(GT2);
 {if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node QuotedTripleData() throws ParseException {Node n = null ; Token t ; String iri ; Node s , p , o ;
-    t = jj_consume_token(LT2);
-    s = DataValueTerm();
+  final public Node TripleTermData() throws ParseException {Node n = null ; Token openToken ; String iri ; Node s , p , o ;
+    openToken = jj_consume_token(L_TRIPLE);
+    s = TripleTermDataSubject();
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
@@ -3527,24 +3938,66 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[122] = jj_gen;
+      jj_la1[131] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    o = TripleTermDataObject();
+n = createTripleTerm(s, p, o, openToken.beginLine, openToken.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n ;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node TripleTermDataSubject() throws ParseException {Node n = null; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri) ;
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    default:
+      jj_la1[132] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
-    o = DataValueTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    jj_consume_token(GT2);
 {if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
 
-  final public Node DataValueTerm() throws ParseException {Node n = null ; String iri ; Node s , p , o ;
+  final public Node TripleTermDataObject() throws ParseException {Node n = null; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
       iri = iri();
-{if ("" != null) return createNode(iri) ;}
+n = createNode(iri) ;
       break;
       }
     case STRING_LITERAL1:
@@ -3552,7 +4005,6 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:{
       n = RDFLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case INTEGER:
@@ -3565,25 +4017,23 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case DECIMAL_NEGATIVE:
     case DOUBLE_NEGATIVE:{
       n = NumericLiteral();
-{if ("" != null) return n ;}
       break;
       }
     case TRUE:
     case FALSE:{
       n = BooleanLiteral();
-{if ("" != null) return n ;}
       break;
       }
-    case LT2:{
-      n = QuotedTripleData();
-{if ("" != null) return n ;}
+    case L_TRIPLE:{
+      n = TripleTermData();
       break;
       }
     default:
-      jj_la1[123] = jj_gen;
+      jj_la1[133] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
 
@@ -3602,7 +4052,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[124] = jj_gen;
+      jj_la1[134] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3621,7 +4071,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[125] = jj_gen;
+      jj_la1[135] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3637,7 +4087,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr ConditionalOrExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = ConditionalAndExpression();
-    label_31:
+    label_33:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SC_OR:{
@@ -3645,8 +4095,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[126] = jj_gen;
-        break label_31;
+        jj_la1[136] = jj_gen;
+        break label_33;
       }
       jj_consume_token(SC_OR);
       expr2 = ConditionalAndExpression();
@@ -3658,7 +4108,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr ConditionalAndExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = ValueLogical();
-    label_32:
+    label_34:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SC_AND:{
@@ -3666,8 +4116,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[127] = jj_gen;
-        break label_32;
+        jj_la1[137] = jj_gen;
+        break label_34;
       }
       jj_consume_token(SC_AND);
       expr2 = ValueLogical();
@@ -3745,14 +4195,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[128] = jj_gen;
+        jj_la1[138] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[129] = jj_gen;
+      jj_la1[139] = jj_gen;
       ;
     }
 {if ("" != null) return expr1 ;}
@@ -3767,7 +4217,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr AdditiveExpression() throws ParseException {Expr expr1, expr2, expr3 ; boolean addition ; Node n ;
     expr1 = MultiplicativeExpression();
-    label_33:
+    label_35:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case INTEGER_POSITIVE:
@@ -3782,8 +4232,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[130] = jj_gen;
-        break label_33;
+        jj_la1[140] = jj_gen;
+        break label_35;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case PLUS:{
@@ -3824,11 +4274,11 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
           break;
           }
         default:
-          jj_la1[131] = jj_gen;
+          jj_la1[141] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
-        label_34:
+        label_36:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case STAR:
@@ -3837,8 +4287,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[132] = jj_gen;
-            break label_34;
+            jj_la1[142] = jj_gen;
+            break label_36;
           }
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case STAR:{
@@ -3854,7 +4304,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
             break;
             }
           default:
-            jj_la1[133] = jj_gen;
+            jj_la1[143] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -3866,7 +4316,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[134] = jj_gen;
+        jj_la1[144] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3877,7 +4327,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 
   final public Expr MultiplicativeExpression() throws ParseException {Expr expr1, expr2 ;
     expr1 = UnaryExpression();
-    label_35:
+    label_37:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case STAR:
@@ -3886,8 +4336,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[135] = jj_gen;
-        break label_35;
+        jj_la1[145] = jj_gen;
+        break label_37;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case STAR:{
@@ -3903,7 +4353,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[136] = jj_gen;
+        jj_la1[146] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3959,15 +4409,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case URI:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -4019,13 +4473,13 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:
     case LPAREN:
-    case LT2:{
+    case L_TRIPLE:{
       expr = PrimaryExpression();
 {if ("" != null) return expr ;}
       break;
       }
     default:
-      jj_la1[137] = jj_gen;
+      jj_la1[147] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4061,15 +4515,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     case URI:
     case STR:
     case STRLANG:
+    case STRLANGDIR:
     case STRDT:
     case DTYPE:
     case LANG:
     case LANGMATCHES:
+    case LANGDIR:
     case IS_URI:
     case IS_IRI:
     case IS_BLANK:
     case IS_LITERAL:
     case IS_NUMERIC:
+    case HAS_LANG:
+    case HAS_LANGDIR:
     case REGEX:
     case SAME_TERM:
     case RAND:
@@ -4149,26 +4607,37 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return asExpr(n) ;}
       break;
       }
-    case LT2:{
-      n = ExprQuotedTriple();
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
 {if ("" != null) return asExpr(n) ;}
       break;
       }
     default:
-      jj_la1[138] = jj_gen;
+      jj_la1[148] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
     throw new Error("Missing return statement in function");
 }
 
-  final public Node ExprVarOrTerm() throws ParseException {Node n; String s;
+  final public Node ExprTripleTerm() throws ParseException {Token t ; Node s,p,o,n;
+    t = jj_consume_token(L_TRIPLE);
+    s = ExprTripleTermSubject();
+    p = Verb();
+    o = ExprTripleTermObject();
+n = createTripleTerm(s, p, o, t.beginLine, t.beginColumn);
+    jj_consume_token(R_TRIPLE);
+{if ("" != null) return n;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Node ExprTripleTermSubject() throws ParseException {Node n; String iri;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME_NS:
     case PNAME_LN:{
-      s = iri();
-n = createNode(s);
+      iri = iri();
+n = createNode(iri);
       break;
       }
     case STRING_LITERAL1:
@@ -4200,12 +4669,8 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       n = Var();
       break;
       }
-    case LT2:{
-      n = ExprQuotedTriple();
-      break;
-      }
     default:
-      jj_la1[139] = jj_gen;
+      jj_la1[149] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4213,13 +4678,53 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     throw new Error("Missing return statement in function");
 }
 
-  final public Node ExprQuotedTriple() throws ParseException {Token t ; Node s,p,o,n;
-    t = jj_consume_token(LT2);
-    s = ExprVarOrTerm();
-    p = Verb();
-    o = ExprVarOrTerm();
-n = createQuotedTriple(s, p, o, t.beginLine, t.beginColumn);
-    jj_consume_token(GT2);
+  final public Node ExprTripleTermObject() throws ParseException {Node n; String iri;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IRIref:
+    case PNAME_NS:
+    case PNAME_LN:{
+      iri = iri();
+n = createNode(iri);
+      break;
+      }
+    case STRING_LITERAL1:
+    case STRING_LITERAL2:
+    case STRING_LITERAL_LONG1:
+    case STRING_LITERAL_LONG2:{
+      n = RDFLiteral();
+      break;
+      }
+    case INTEGER:
+    case DECIMAL:
+    case DOUBLE:
+    case INTEGER_POSITIVE:
+    case DECIMAL_POSITIVE:
+    case DOUBLE_POSITIVE:
+    case INTEGER_NEGATIVE:
+    case DECIMAL_NEGATIVE:
+    case DOUBLE_NEGATIVE:{
+      n = NumericLiteral();
+      break;
+      }
+    case TRUE:
+    case FALSE:{
+      n = BooleanLiteral();
+      break;
+      }
+    case VAR1:
+    case VAR2:{
+      n = Var();
+      break;
+      }
+    case L_TRIPLE:{
+      n = ExprTripleTerm();
+      break;
+      }
+    default:
+      jj_la1[150] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
 {if ("" != null) return n;}
     throw new Error("Missing return statement in function");
 }
@@ -4273,6 +4778,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_LangMatches(expr1, expr2) ;}
       break;
       }
+    case LANGDIR:{
+      jj_consume_token(LANGDIR);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_LangDir(expr) ;}
+      break;
+      }
     case DTYPE:{
       jj_consume_token(DTYPE);
       jj_consume_token(LPAREN);
@@ -4321,7 +4834,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[140] = jj_gen;
+        jj_la1[151] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4613,6 +5126,18 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_StrLang(expr1, expr2) ;}
       break;
       }
+    case STRLANGDIR:{
+      jj_consume_token(STRLANGDIR);
+      jj_consume_token(LPAREN);
+      expr1 = Expression();
+      jj_consume_token(COMMA);
+      expr2 = Expression();
+      jj_consume_token(COMMA);
+      expr3 = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_StrLangDir(expr1, expr2, expr3) ;}
+      break;
+      }
     case STRDT:{
       jj_consume_token(STRDT);
       jj_consume_token(LPAREN);
@@ -4673,6 +5198,22 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
 {if ("" != null) return new E_IsNumeric(expr) ;}
       break;
       }
+    case HAS_LANG:{
+      jj_consume_token(HAS_LANG);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_HasLang(expr) ;}
+      break;
+      }
+    case HAS_LANGDIR:{
+      jj_consume_token(HAS_LANGDIR);
+      jj_consume_token(LPAREN);
+      expr = Expression();
+      jj_consume_token(RPAREN);
+{if ("" != null) return new E_HasLangDir(expr) ;}
+      break;
+      }
     case REGEX:{
       expr = RegexExpression();
 {if ("" != null) return expr ;}
@@ -4733,7 +5274,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[141] = jj_gen;
+      jj_la1[152] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4753,7 +5294,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[142] = jj_gen;
+      jj_la1[153] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4774,7 +5315,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[143] = jj_gen;
+      jj_la1[154] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4797,7 +5338,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[144] = jj_gen;
+      jj_la1[155] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -4837,7 +5378,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[145] = jj_gen;
+        jj_la1[156] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -4872,15 +5413,19 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       case URI:
       case STR:
       case STRLANG:
+      case STRLANGDIR:
       case STRDT:
       case DTYPE:
       case LANG:
       case LANGMATCHES:
+      case LANGDIR:
       case IS_URI:
       case IS_IRI:
       case IS_BLANK:
       case IS_LITERAL:
       case IS_NUMERIC:
+      case HAS_LANG:
+      case HAS_LANGDIR:
       case REGEX:
       case SAME_TERM:
       case RAND:
@@ -4932,7 +5477,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       case STRING_LITERAL_LONG1:
       case STRING_LITERAL_LONG2:
       case LPAREN:
-      case LT2:
+      case L_TRIPLE:
       case BANG:
       case PLUS:
       case MINUS:{
@@ -4940,7 +5485,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[146] = jj_gen;
+        jj_la1[157] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -4959,7 +5504,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[147] = jj_gen;
+        jj_la1[158] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4977,7 +5522,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[148] = jj_gen;
+        jj_la1[159] = jj_gen;
         ;
       }
       expr = Expression();
@@ -4995,7 +5540,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[149] = jj_gen;
+        jj_la1[160] = jj_gen;
         ;
       }
       expr = Expression();
@@ -5013,7 +5558,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[150] = jj_gen;
+        jj_la1[161] = jj_gen;
         ;
       }
       expr = Expression();
@@ -5031,7 +5576,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[151] = jj_gen;
+        jj_la1[162] = jj_gen;
         ;
       }
       expr = Expression();
@@ -5049,7 +5594,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[152] = jj_gen;
+        jj_la1[163] = jj_gen;
         ;
       }
       expr = Expression();
@@ -5062,7 +5607,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
         break;
         }
       default:
-        jj_la1[153] = jj_gen;
+        jj_la1[164] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -5070,7 +5615,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[154] = jj_gen;
+      jj_la1[165] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5093,14 +5638,14 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[155] = jj_gen;
+      jj_la1[166] = jj_gen;
       ;
     }
 if ( a == null )
        {if ("" != null) return asExpr(createNode(iri)) ;}
     if ( AggregateRegistry.isRegistered(iri) ) {
          if ( ! getAllowAggregatesInExpressions() )
-            throwParseException("Aggregate expression not legal at this point : "+iri, -1, -1) ;
+            throwParseException("Aggregate expression not legal at this point : "+iri, token.beginLine, token.beginColumn) ;
          Aggregator agg = AggregatorFactory.createCustom(iri, a) ;
          Expr exprAgg = getQuery().allocAggregate(agg) ;
          {if ("" != null) return exprAgg ;}
@@ -5109,35 +5654,35 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
     throw new Error("Missing return statement in function");
 }
 
-  final public Node RDFLiteral() throws ParseException {Token t ; String lex = null ;
+  final public Node RDFLiteral() throws ParseException {Token t ; String lex = null ; String uri = null ;
     lex = String();
-String lang = null ; String uri = null ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LANGTAG:
+    case LANG_DIR:
     case DATATYPE:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LANGTAG:{
-        t = jj_consume_token(LANGTAG);
-lang = stripChars(t.image, 1) ;
+      case LANG_DIR:{
+        t = jj_consume_token(LANG_DIR);
+{if ("" != null) return createLiteralLang(lex, t.image, token.beginLine, token.beginColumn);}
         break;
         }
       case DATATYPE:{
         jj_consume_token(DATATYPE);
         uri = iri();
+{if ("" != null) return createLiteralDT(lex, uri, token.beginLine, token.beginColumn);}
         break;
         }
       default:
-        jj_la1[156] = jj_gen;
+        jj_la1[167] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[157] = jj_gen;
+      jj_la1[168] = jj_gen;
       ;
     }
-{if ("" != null) return createLiteral(lex, lang, uri) ;}
+{if ("" != null) return createLiteralString(lex, token.beginLine, token.beginColumn) ;}
     throw new Error("Missing return statement in function");
 }
 
@@ -5162,7 +5707,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[158] = jj_gen;
+      jj_la1[169] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5188,7 +5733,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[159] = jj_gen;
+      jj_la1[170] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5213,7 +5758,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[160] = jj_gen;
+      jj_la1[171] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5238,7 +5783,7 @@ final public void Annotation(TripleCollector acc, Node s, Node p, Path path, Nod
       break;
       }
     default:
-      jj_la1[161] = jj_gen;
+      jj_la1[172] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5258,7 +5803,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[162] = jj_gen;
+      jj_la1[173] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5288,7 +5833,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[163] = jj_gen;
+      jj_la1[174] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5312,7 +5857,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[164] = jj_gen;
+      jj_la1[175] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5332,7 +5877,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[165] = jj_gen;
+      jj_la1[176] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5352,7 +5897,7 @@ final public Node BooleanLiteral() throws ParseException {
       break;
       }
     default:
-      jj_la1[166] = jj_gen;
+      jj_la1[177] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -5374,7 +5919,7 @@ final public Node BooleanLiteral() throws ParseException {
   public Token jj_nt;
   private int jj_ntk;
   private int jj_gen;
-  final private int[] jj_la1 = new int[167];
+  final private int[] jj_la1 = new int[178];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -5392,25 +5937,25 @@ final public Node BooleanLiteral() throws ParseException {
 	   jj_la1_init_6();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0xe00,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x80000000,0x0,0x7e00,0x7e00,0x0,0x80000000,0x0,0x6000,0xe00,0x6000,0x0,0x0,0xe00,0x0,0xe00,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x46e00,0x0,0x46e00,0x46e00,0x0,0x7e00,0x46e00,0x46e00,0x0,0x46e00,0x46e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x40e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x40e00,0xe00,0x6e00,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
+	   jj_la1_0 = new int[] {0x7200000,0x180000,0x180000,0x0,0xc00000,0xc00000,0x6000,0x6000,0x6000,0x0,0x0,0x7e00,0x0,0x6e00,0x6e00,0x0,0x0,0x0,0xe00,0x0,0x0,0x0,0x20000000,0x18000000,0x6e00,0x0,0x6e00,0xe00,0x6e00,0x0,0x6e00,0x6e00,0x10000000,0x8000000,0x18000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0x0,0xe00,0x0,0x7e00,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x200000,0x7e00,0x80000000,0x0,0x7e00,0x7e00,0x0,0x80000000,0x0,0x6000,0xe00,0x6000,0x0,0x0,0xe00,0x0,0xe00,0x7e00,0x7e00,0x0,0xe00,0x400000,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x0,0x7e00,0x46e00,0x0,0x46e00,0x46e00,0x0,0x7e00,0x46e00,0x46e00,0x0,0x46e00,0x46e00,0x0,0x0,0x0,0x0,0x40e00,0x0,0x40e00,0x0,0x40e00,0x40e00,0x40e00,0x40e00,0x0,0x0,0x7e00,0x7e00,0x0,0x0,0x0,0x0,0x7e00,0x7e00,0x7e00,0x0,0x7e00,0x7e00,0x7e00,0x7e00,0x40e00,0xe00,0xe00,0x6e00,0x6000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6e00,0x6e00,0x6e00,0x6e00,0x0,0x0,0x0,0x0,0x0,0x400000,0x6e00,0x400000,0x400000,0x400000,0x400000,0x400000,0x400000,0x0,0x0,0x0,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0xe00,0xc00,0x1000,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x200000,0x400000,0x0,0x0,0x3e0fe000,0x100000,0x3e0fe000,0x3e0fe000,0x3e0fe006,0x6,0x3e0fe000,0x3e0fe006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x80,0x80,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1d80,0x0,0x0,0x0,0x0,0x1d80,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x200,0x3e0fe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e0fe000,0x3e0fe000,0x0,0x0,0x3e0fe000,0x0,0x0,0x0,0x0,0x3e0fe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x0,0x30,0x0,0x0,0x10,0x20,0x10,0x8,0x20,0x200000,0x400000,0x0,0x0,0x3e0fe000,0x100000,0x3e0fe000,0x3e0fe000,0x3e0fe006,0x6,0x3e0fe000,0x3e0fe006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x80,0x80,0x88,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1d80,0x0,0x0,0x0,0x0,0x1d80,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x200,0x3e0fe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e0fe000,0x3e0fe000,0x0,0x0,0x0,0x3e0fe000,0x0,0x0,0x0,0x0,0x3e0fe000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3e000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0xfffffdb0,0xfffffdb0,0xfffffdb0,0x0,0xfffffdb0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0xfffffdb0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0xfffffdb0,0xfffffdb0,0xfffffdb0,0x0,0xfffffdb0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffffdb0,0xfffffdb0,0x0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0xfffffdb0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_3() {
-	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1dffffff,0x0,0x1dffffff,0x1dffffff,0x1dffffff,0x0,0x1dffffff,0x1dffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x60000000,0x60000000,0x60000000,0x0,0x0,0x60000000,0x0,0x0,0x60000000,0x60000000,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x60000000,0x0,0x60000000,0x0,0x1dffffff,0x0,0x0,0x0,0x0,0x0,0x60000000,0x60000000,0x0,0x60000000,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x60000000,0x0,0x0,0x60000000,0x60000000,0x60000000,0x0,0x60000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7dffffff,0x7dffffff,0x60000000,0x0,0x1dffffff,0x0,0x0,0x0,0x0,0x7dffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x60000000,0x0,0x0,0x0,0x0,};
+	   jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdfffffff,0x0,0xdfffffff,0xdfffffff,0xdfffffff,0x0,0xdfffffff,0xdfffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdfffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdfffffff,0xdfffffff,0x0,0x0,0x0,0xdfffffff,0x0,0x0,0x0,0x0,0xdfffffff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_4() {
-	   jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x427ff,0x427ff,0x1000,0x4000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x40000,0x1,0x3,0x80000,0x0,0x0,0x10000,0x30000,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x3fe00000,0x0,0x0,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x0,0x0,0x1000,0x0,0x3fe00000,0x0,0x0,0x0,0x3fe00000,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x3fe00000,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x3fe00000,0x0,0x0,0x3fe00000,0x3fe00000,0x3fe00000,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x3f000000,0x3f000000,0x0,0x0,0x3f000000,0x0,0x0,0x3fe00000,0x3fe00000,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fe00000,0xe00000,0x7000000,0x38000000,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_4 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x1,0x1,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x427ff0,0x427ff0,0x10000,0x40000,0x10000,0x10000,0x10000,0x10000,0x10000,0x10000,0x400000,0x10,0x30,0x800000,0x0,0x0,0x100000,0x300000,0xfe000006,0x0,0x0,0xfe000006,0xfe000006,0xfe000006,0x0,0x0,0xfe000006,0x0,0x0,0xfe000006,0xfe000006,0x0,0x0,0x10000,0x0,0xfe000006,0x0,0x0,0x0,0xfe000006,0x0,0xfe000006,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0xfe000006,0xfe000006,0x0,0xfe000006,0x0,0x0,0x0,0x0,0x0,0xfe000006,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000006,0xfe000006,0x0,0x0,0x0,0x0,0xfe000006,0xfe000006,0xfe000006,0x0,0xfe000006,0xfe000006,0xfe000006,0xfe000006,0x0,0xfe000006,0xfe000006,0x0,0x0,0x0,0x0,0x0,0x0,0xf0000000,0xf0000000,0x0,0x0,0xf0000000,0x0,0x0,0xfe000007,0xfe000007,0xfe000006,0xfe000006,0x0,0x1,0x0,0x0,0x0,0x0,0xfe000007,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfe000000,0xe000000,0x70000000,0x80000000,0x6,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_5() {
-	   jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x200,0x200,0x0,0x0,0x8014be0,0x1000,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x200,0x200,0x200,0x0,0x200,0x200,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8014be0,0x0,0x80000,0x8014be0,0x8014be0,0x8014be0,0x80000,0x0,0x8014be0,0x1000,0x80000,0x8014be0,0x8014be0,0x80000,0x1000,0x0,0xa00,0x80001e0,0x0,0xa00,0xa00,0x80001e0,0xa00,0x80001e0,0x0,0x200,0x0,0x40000,0xa00,0x40000,0xa00,0x8014be0,0x8014be0,0x80000,0x8014be0,0x0,0x20000,0x0,0x0,0x40000,0x8014be0,0x40000200,0x40000200,0x20000,0x40000200,0x40000200,0x40000,0x0,0x0,0x0,0x40000200,0x0,0x40000200,0x0,0x0,0x200,0x0,0x0,0x4200,0x4200,0x8014be0,0x8014be0,0x10000000,0x10000000,0x8014be0,0x8014be0,0x80109e0,0x0,0x80001e0,0x0,0x0,0x0,0x0,0x3f00000,0x3f00000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x480003e0,0x80003e0,0x80001e0,0xa00,0x0,0x40000,0x40000,0x40000,0x0,0x480003e0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0xa00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e0,0x0,0x0,0x10000,};
+	   jj_la1_5 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x2000,0x2000,0x0,0x0,0x4014be03,0x10000,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x2000,0x2000,0x0,0x2000,0x2000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4014be03,0x0,0x800000,0x4014be03,0x4014be03,0x4014be03,0x800000,0x0,0x4014be03,0x10000,0x800000,0x4014be03,0x4014be03,0x800000,0x10000,0x0,0xa000,0x40001e03,0x0,0xa000,0xa000,0x40001e03,0xa000,0x40001e03,0x100000,0x100000,0x0,0x2000,0x0,0x400000,0xa000,0x400000,0xa000,0x4014be03,0x4014be03,0x800000,0x4014be03,0x0,0x200000,0x0,0x0,0x400000,0x4014be03,0x2000,0x2000,0x200000,0x2000,0x2000,0x400000,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x2000,0x0,0x0,0x42000,0x42000,0x4014be03,0x4014be03,0x0,0x0,0x0,0x0,0x4014be03,0x4014be03,0x40109e03,0x0,0x101e03,0x40101e03,0x101e03,0x40101e03,0x0,0x1e03,0x40001e03,0x0,0x0,0x0,0x0,0x3f000000,0x3f000000,0x3,0x3,0x0,0x0,0x3,0x0,0x0,0x40003e03,0x40003e03,0x1e03,0x40001e03,0xa000,0x0,0x400000,0x400000,0x400000,0x0,0x40003e03,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0xa000,0x0,0x0,0x3,0x0,0x0,0x3,0x0,0x1e00,0x0,0x0,0x100000,};
 	}
 	private static void jj_la1_init_6() {
-	   jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x400,0x0,0x400,0x400,0x0,0x200,0x40,0x2028,0x400,0x2028,0x0,0x200,0x400,0x400,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x0,0x0,0x18,0x0,0x60,0x60,0x18,0x60,0x60,0x18,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x38,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+	   jj_la1_6 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x1,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x1,0x10020,0x10020,0x0,0x10020,0x10020,0x0,0x8000,0x1000,0x80a00,0x10020,0x80a00,0x20,0x8000,0x10000,0x10000,0x0,0x10000,0x0,0x0,0x1,0x1,0x14,0x14,0x14,0x14,0x1,0x1,0x0,0x10,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x100,0x0,0x0,0x600,0x0,0x1800,0x1800,0x600,0x1800,0x1800,0x620,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xe20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
 	}
 
   /** Constructor with InputStream. */
@@ -5424,7 +5969,7 @@ public SPARQLParser12(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -5438,7 +5983,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   /** Constructor. */
@@ -5448,7 +5993,7 @@ public SPARQLParser12(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -5466,7 +6011,7 @@ public void ReInit(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   /** Constructor with generated Token Manager. */
@@ -5475,7 +6020,7 @@ public SPARQLParser12(SPARQLParser12TokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   /** Reinitialise. */
@@ -5484,7 +6029,7 @@ public void ReInit(SPARQLParser12TokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 167; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 178; i++) jj_la1[i] = -1;
   }
 
   private Token jj_consume_token(int kind) throws ParseException {
@@ -5535,12 +6080,12 @@ private int jj_ntk_f() {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[217];
+	 boolean[] la1tokens = new boolean[223];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 167; i++) {
+	 for (int i = 0; i < 178; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -5567,7 +6112,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 217; i++) {
+	 for (int i = 0; i < 223; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser11Base.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java
similarity index 89%
rename from jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser11Base.java
rename to jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java
index 06bb067324e..8c56b8bdea9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser11Base.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Base.java
@@ -19,8 +19,4 @@
 package org.apache.jena.sparql.lang.sparql_12;
 import org.apache.jena.sparql.lang.SPARQLParserBase ;
 
-class SPARQLParser12Base
-        extends SPARQLParserBase
-        implements SPARQLParser12Constants
-{
-}
+class SPARQLParser12Base extends SPARQLParserBase implements SPARQLParser12Constants {}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java
index d3f85822c65..592241c25a1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12Constants.java
@@ -29,7 +29,7 @@ public interface SPARQLParser12Constants {
   /** RegularExpression Id. */
   int VAR2 = 14;
   /** RegularExpression Id. */
-  int LANGTAG = 15;
+  int LANG_DIR = 15;
   /** RegularExpression Id. */
   int A2Z = 16;
   /** RegularExpression Id. */
@@ -159,279 +159,291 @@ public interface SPARQLParser12Constants {
   /** RegularExpression Id. */
   int STRLANG = 79;
   /** RegularExpression Id. */
-  int STRDT = 80;
+  int STRLANGDIR = 80;
   /** RegularExpression Id. */
-  int DTYPE = 81;
+  int STRDT = 81;
   /** RegularExpression Id. */
-  int LANG = 82;
+  int DTYPE = 82;
   /** RegularExpression Id. */
-  int LANGMATCHES = 83;
+  int LANG = 83;
   /** RegularExpression Id. */
-  int IS_URI = 84;
+  int LANGMATCHES = 84;
   /** RegularExpression Id. */
-  int IS_IRI = 85;
+  int LANGDIR = 85;
   /** RegularExpression Id. */
-  int IS_BLANK = 86;
+  int IS_URI = 86;
   /** RegularExpression Id. */
-  int IS_LITERAL = 87;
+  int IS_IRI = 87;
   /** RegularExpression Id. */
-  int IS_NUMERIC = 88;
+  int IS_BLANK = 88;
   /** RegularExpression Id. */
-  int REGEX = 89;
+  int IS_LITERAL = 89;
   /** RegularExpression Id. */
-  int SAME_TERM = 90;
+  int IS_NUMERIC = 90;
   /** RegularExpression Id. */
-  int RAND = 91;
+  int HAS_LANG = 91;
   /** RegularExpression Id. */
-  int ABS = 92;
+  int HAS_LANGDIR = 92;
   /** RegularExpression Id. */
-  int CEIL = 93;
+  int REGEX = 93;
   /** RegularExpression Id. */
-  int FLOOR = 94;
+  int SAME_TERM = 94;
   /** RegularExpression Id. */
-  int ROUND = 95;
+  int RAND = 95;
   /** RegularExpression Id. */
-  int CONCAT = 96;
+  int ABS = 96;
   /** RegularExpression Id. */
-  int SUBSTR = 97;
+  int CEIL = 97;
   /** RegularExpression Id. */
-  int STRLEN = 98;
+  int FLOOR = 98;
   /** RegularExpression Id. */
-  int REPLACE = 99;
+  int ROUND = 99;
   /** RegularExpression Id. */
-  int UCASE = 100;
+  int CONCAT = 100;
   /** RegularExpression Id. */
-  int LCASE = 101;
+  int SUBSTR = 101;
   /** RegularExpression Id. */
-  int ENCODE_FOR_URI = 102;
+  int STRLEN = 102;
   /** RegularExpression Id. */
-  int CONTAINS = 103;
+  int REPLACE = 103;
   /** RegularExpression Id. */
-  int STRSTARTS = 104;
+  int UCASE = 104;
   /** RegularExpression Id. */
-  int STRENDS = 105;
+  int LCASE = 105;
   /** RegularExpression Id. */
-  int STRBEFORE = 106;
+  int ENCODE_FOR_URI = 106;
   /** RegularExpression Id. */
-  int STRAFTER = 107;
+  int CONTAINS = 107;
   /** RegularExpression Id. */
-  int YEAR = 108;
+  int STRSTARTS = 108;
   /** RegularExpression Id. */
-  int MONTH = 109;
+  int STRENDS = 109;
   /** RegularExpression Id. */
-  int DAY = 110;
+  int STRBEFORE = 110;
   /** RegularExpression Id. */
-  int HOURS = 111;
+  int STRAFTER = 111;
   /** RegularExpression Id. */
-  int MINUTES = 112;
+  int YEAR = 112;
   /** RegularExpression Id. */
-  int SECONDS = 113;
+  int MONTH = 113;
   /** RegularExpression Id. */
-  int TIMEZONE = 114;
+  int DAY = 114;
   /** RegularExpression Id. */
-  int TZ = 115;
+  int HOURS = 115;
   /** RegularExpression Id. */
-  int NOW = 116;
+  int MINUTES = 116;
   /** RegularExpression Id. */
-  int UUID = 117;
+  int SECONDS = 117;
   /** RegularExpression Id. */
-  int STRUUID = 118;
+  int TIMEZONE = 118;
   /** RegularExpression Id. */
-  int MD5 = 119;
+  int TZ = 119;
   /** RegularExpression Id. */
-  int SHA1 = 120;
+  int NOW = 120;
   /** RegularExpression Id. */
-  int SHA224 = 121;
+  int UUID = 121;
   /** RegularExpression Id. */
-  int SHA256 = 122;
+  int STRUUID = 122;
   /** RegularExpression Id. */
-  int SHA384 = 123;
+  int MD5 = 123;
   /** RegularExpression Id. */
-  int SHA512 = 124;
+  int SHA1 = 124;
   /** RegularExpression Id. */
-  int TRUE = 125;
+  int SHA224 = 125;
   /** RegularExpression Id. */
-  int FALSE = 126;
+  int SHA256 = 126;
   /** RegularExpression Id. */
-  int DATA = 127;
+  int SHA384 = 127;
   /** RegularExpression Id. */
-  int INSERT = 128;
+  int SHA512 = 128;
   /** RegularExpression Id. */
-  int DELETE = 129;
+  int TRUE = 129;
   /** RegularExpression Id. */
-  int INSERT_DATA = 130;
+  int FALSE = 130;
   /** RegularExpression Id. */
-  int DELETE_DATA = 131;
+  int DATA = 131;
   /** RegularExpression Id. */
-  int DELETE_WHERE = 132;
+  int INSERT = 132;
   /** RegularExpression Id. */
-  int LOAD = 133;
+  int DELETE = 133;
   /** RegularExpression Id. */
-  int CLEAR = 134;
+  int INSERT_DATA = 134;
   /** RegularExpression Id. */
-  int CREATE = 135;
+  int DELETE_DATA = 135;
   /** RegularExpression Id. */
-  int ADD = 136;
+  int DELETE_WHERE = 136;
   /** RegularExpression Id. */
-  int MOVE = 137;
+  int LOAD = 137;
   /** RegularExpression Id. */
-  int COPY = 138;
+  int CLEAR = 138;
   /** RegularExpression Id. */
-  int META = 139;
+  int CREATE = 139;
   /** RegularExpression Id. */
-  int SILENT = 140;
+  int ADD = 140;
   /** RegularExpression Id. */
-  int DROP = 141;
+  int MOVE = 141;
   /** RegularExpression Id. */
-  int INTO = 142;
+  int COPY = 142;
   /** RegularExpression Id. */
-  int TO = 143;
+  int META = 143;
   /** RegularExpression Id. */
-  int DFT = 144;
+  int SILENT = 144;
   /** RegularExpression Id. */
-  int ALL = 145;
+  int DROP = 145;
   /** RegularExpression Id. */
-  int WITH = 146;
+  int INTO = 146;
   /** RegularExpression Id. */
-  int USING = 147;
+  int TO = 147;
   /** RegularExpression Id. */
-  int DIGITS = 148;
+  int DFT = 148;
   /** RegularExpression Id. */
-  int INTEGER = 149;
+  int ALL = 149;
   /** RegularExpression Id. */
-  int DECIMAL = 150;
+  int WITH = 150;
   /** RegularExpression Id. */
-  int DOUBLE = 151;
+  int USING = 151;
   /** RegularExpression Id. */
-  int INTEGER_POSITIVE = 152;
+  int DIGITS = 152;
   /** RegularExpression Id. */
-  int DECIMAL_POSITIVE = 153;
+  int INTEGER = 153;
   /** RegularExpression Id. */
-  int DOUBLE_POSITIVE = 154;
+  int DECIMAL = 154;
   /** RegularExpression Id. */
-  int INTEGER_NEGATIVE = 155;
+  int DOUBLE = 155;
   /** RegularExpression Id. */
-  int DECIMAL_NEGATIVE = 156;
+  int INTEGER_POSITIVE = 156;
   /** RegularExpression Id. */
-  int DOUBLE_NEGATIVE = 157;
+  int DECIMAL_POSITIVE = 157;
   /** RegularExpression Id. */
-  int EXPONENT = 158;
+  int DOUBLE_POSITIVE = 158;
   /** RegularExpression Id. */
-  int QUOTE_3D = 159;
+  int INTEGER_NEGATIVE = 159;
   /** RegularExpression Id. */
-  int QUOTE_3S = 160;
+  int DECIMAL_NEGATIVE = 160;
   /** RegularExpression Id. */
-  int ECHAR = 161;
+  int DOUBLE_NEGATIVE = 161;
   /** RegularExpression Id. */
-  int UCHAR = 162;
+  int EXPONENT = 162;
   /** RegularExpression Id. */
-  int UCHAR4 = 163;
+  int QUOTE_3D = 163;
   /** RegularExpression Id. */
-  int UCHAR8 = 164;
+  int QUOTE_3S = 164;
   /** RegularExpression Id. */
-  int STRING_LITERAL1 = 165;
+  int ECHAR = 165;
   /** RegularExpression Id. */
-  int STRING_LITERAL2 = 166;
+  int UCHAR = 166;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG1 = 167;
+  int UCHAR4 = 167;
   /** RegularExpression Id. */
-  int STRING_LITERAL_LONG2 = 168;
+  int UCHAR8 = 168;
   /** RegularExpression Id. */
-  int LPAREN = 169;
+  int STRING_LITERAL1 = 169;
   /** RegularExpression Id. */
-  int RPAREN = 170;
+  int STRING_LITERAL2 = 170;
   /** RegularExpression Id. */
-  int NIL = 171;
+  int STRING_LITERAL_LONG1 = 171;
   /** RegularExpression Id. */
-  int LBRACE = 172;
+  int STRING_LITERAL_LONG2 = 172;
   /** RegularExpression Id. */
-  int RBRACE = 173;
+  int LPAREN = 173;
   /** RegularExpression Id. */
-  int LBRACKET = 174;
+  int RPAREN = 174;
   /** RegularExpression Id. */
-  int RBRACKET = 175;
+  int NIL = 175;
   /** RegularExpression Id. */
-  int ANON = 176;
+  int LBRACE = 176;
   /** RegularExpression Id. */
-  int SEMICOLON = 177;
+  int RBRACE = 177;
   /** RegularExpression Id. */
-  int COMMA = 178;
+  int LBRACKET = 178;
   /** RegularExpression Id. */
-  int DOT = 179;
+  int RBRACKET = 179;
   /** RegularExpression Id. */
-  int EQ = 180;
+  int ANON = 180;
   /** RegularExpression Id. */
-  int NE = 181;
+  int SEMICOLON = 181;
   /** RegularExpression Id. */
-  int GT = 182;
+  int COMMA = 182;
   /** RegularExpression Id. */
-  int LT = 183;
+  int DOT = 183;
   /** RegularExpression Id. */
-  int LE = 184;
+  int EQ = 184;
   /** RegularExpression Id. */
-  int GE = 185;
+  int NE = 185;
   /** RegularExpression Id. */
-  int GT2 = 186;
+  int GT = 186;
   /** RegularExpression Id. */
-  int LT2 = 187;
+  int LT = 187;
   /** RegularExpression Id. */
-  int L_ANN = 188;
+  int LE = 188;
   /** RegularExpression Id. */
-  int R_ANN = 189;
+  int GE = 189;
   /** RegularExpression Id. */
-  int BANG = 190;
+  int L_TRIPLE = 190;
   /** RegularExpression Id. */
-  int TILDE = 191;
+  int R_TRIPLE = 191;
   /** RegularExpression Id. */
-  int COLON = 192;
+  int LT2 = 192;
   /** RegularExpression Id. */
-  int SC_OR = 193;
+  int GT2 = 193;
   /** RegularExpression Id. */
-  int SC_AND = 194;
+  int L_ANN = 194;
   /** RegularExpression Id. */
-  int PLUS = 195;
+  int R_ANN = 195;
   /** RegularExpression Id. */
-  int MINUS = 196;
+  int TILDE = 196;
   /** RegularExpression Id. */
-  int STAR = 197;
+  int BANG = 197;
   /** RegularExpression Id. */
-  int SLASH = 198;
+  int COLON = 198;
   /** RegularExpression Id. */
-  int DATATYPE = 199;
+  int SC_OR = 199;
   /** RegularExpression Id. */
-  int AT = 200;
+  int SC_AND = 200;
   /** RegularExpression Id. */
-  int VBAR = 201;
+  int PLUS = 201;
   /** RegularExpression Id. */
-  int CARAT = 202;
+  int MINUS = 202;
   /** RegularExpression Id. */
-  int FPATH = 203;
+  int STAR = 203;
   /** RegularExpression Id. */
-  int RPATH = 204;
+  int SLASH = 204;
   /** RegularExpression Id. */
-  int QMARK = 205;
+  int DATATYPE = 205;
   /** RegularExpression Id. */
-  int PN_CHARS_BASE = 206;
+  int AT = 206;
   /** RegularExpression Id. */
-  int PN_CHARS_U = 207;
+  int VBAR = 207;
   /** RegularExpression Id. */
-  int PN_CHARS = 208;
+  int CARAT = 208;
   /** RegularExpression Id. */
-  int PN_PREFIX = 209;
+  int FPATH = 209;
   /** RegularExpression Id. */
-  int PN_LOCAL = 210;
+  int RPATH = 210;
   /** RegularExpression Id. */
-  int VARNAME = 211;
+  int QMARK = 211;
   /** RegularExpression Id. */
-  int PN_LOCAL_ESC = 212;
+  int PN_CHARS_BASE = 212;
   /** RegularExpression Id. */
-  int PLX = 213;
+  int PN_CHARS_U = 213;
   /** RegularExpression Id. */
-  int HEX = 214;
+  int PN_CHARS = 214;
   /** RegularExpression Id. */
-  int PERCENT = 215;
+  int PN_PREFIX = 215;
   /** RegularExpression Id. */
-  int UNKNOWN = 216;
+  int PN_LOCAL = 216;
+  /** RegularExpression Id. */
+  int VARNAME = 217;
+  /** RegularExpression Id. */
+  int PN_LOCAL_ESC = 218;
+  /** RegularExpression Id. */
+  int PLX = 219;
+  /** RegularExpression Id. */
+  int HEX = 220;
+  /** RegularExpression Id. */
+  int PERCENT = 221;
+  /** RegularExpression Id. */
+  int UNKNOWN = 222;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -453,7 +465,7 @@ public interface SPARQLParser12Constants {
     "<BLANK_NODE_LABEL>",
     "<VAR1>",
     "<VAR2>",
-    "<LANGTAG>",
+    "<LANG_DIR>",
     "<A2Z>",
     "<A2ZN>",
     "\"a\"",
@@ -518,15 +530,19 @@ public interface SPARQLParser12Constants {
     "\"uri\"",
     "\"str\"",
     "\"strlang\"",
+    "\"strlangdir\"",
     "\"strdt\"",
     "\"datatype\"",
     "\"lang\"",
     "\"langmatches\"",
+    "\"langdir\"",
     "\"isURI\"",
     "\"isIRI\"",
     "\"isBlank\"",
     "\"isLiteral\"",
     "\"isNumeric\"",
+    "\"hasLang\"",
+    "\"hasLangDir\"",
     "\"regex\"",
     "\"sameTerm\"",
     "\"RAND\"",
@@ -624,12 +640,14 @@ public interface SPARQLParser12Constants {
     "\"<\"",
     "\"<=\"",
     "\">=\"",
-    "\">>\"",
+    "\"<<(\"",
+    "\")>>\"",
     "\"<<\"",
+    "\">>\"",
     "\"{|\"",
     "\"|}\"",
-    "\"!\"",
     "\"~\"",
+    "\"!\"",
     "\":\"",
     "\"||\"",
     "\"&&\"",
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java
index bc223668246..bd82a36796f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/SPARQLParser12TokenManager.java
@@ -45,160 +45,160 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 1;
          return jjMoveNfa_0(0, 0);
       case 33:
-         jjmatchedKind = 190;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000000000000L, 0x0L);
+         jjmatchedKind = 197;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x200000000000000L, 0x0L);
       case 38:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x100L);
       case 40:
-         jjmatchedKind = 169;
+         jjmatchedKind = 173;
          return jjMoveNfa_0(0, 0);
       case 41:
-         jjmatchedKind = 170;
-         return jjMoveNfa_0(0, 0);
+         jjmatchedKind = 174;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x8000000000000000L, 0x0L);
       case 42:
-         jjmatchedKind = 197;
+         jjmatchedKind = 203;
          return jjMoveNfa_0(0, 0);
       case 43:
-         jjmatchedKind = 195;
+         jjmatchedKind = 201;
          return jjMoveNfa_0(0, 0);
       case 44:
-         jjmatchedKind = 178;
+         jjmatchedKind = 182;
          return jjMoveNfa_0(0, 0);
       case 45:
-         jjmatchedKind = 196;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x800L);
+         jjmatchedKind = 202;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x20000L);
       case 46:
-         jjmatchedKind = 179;
+         jjmatchedKind = 183;
          return jjMoveNfa_0(0, 0);
       case 47:
-         jjmatchedKind = 198;
+         jjmatchedKind = 204;
          return jjMoveNfa_0(0, 0);
       case 58:
-         jjmatchedKind = 192;
+         jjmatchedKind = 198;
          return jjMoveNfa_0(0, 0);
       case 59:
-         jjmatchedKind = 177;
+         jjmatchedKind = 181;
          return jjMoveNfa_0(0, 0);
       case 60:
-         jjmatchedKind = 183;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x900000000000000L, 0x1000L);
+         jjmatchedKind = 187;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x5000000000000000L, 0x40001L);
       case 61:
-         jjmatchedKind = 180;
+         jjmatchedKind = 184;
          return jjMoveNfa_0(0, 0);
       case 62:
-         jjmatchedKind = 182;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x600000000000000L, 0x0L);
+         jjmatchedKind = 186;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 0x2L);
       case 63:
-         jjmatchedKind = 205;
+         jjmatchedKind = 211;
          return jjMoveNfa_0(0, 0);
       case 64:
-         jjmatchedKind = 200;
+         jjmatchedKind = 206;
          return jjMoveNfa_0(0, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x2110004204000000L, 0x10000000L, 0x20100L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2110004204000000L, 0x100000000L, 0x201000L, 0x0L);
       case 66:
          return jjMoveStringLiteralDfa1_0(0x80040080000L, 0x880L, 0x0L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x200000002000000L, 0x8120000100L, 0x4c0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000002000000L, 0x81200000100L, 0x4c00L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x8000400000020000L, 0x12002L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x4000000040000L, 0x120028L, 0x0L);
       case 69:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x40000000000L, 0x0L, 0x0L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x4000000040000040L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x400000040L, 0x4L, 0x0L);
       case 71:
          return jjMoveStringLiteralDfa1_0(0x20008000000000L, 0x20L, 0x0L, 0x0L);
       case 72:
-         return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x800000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x8000018000000L, 0x0L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x1f01600L, 0x4001L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x7c01600L, 0x40010L, 0x0L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x20000c0000L, 0x20L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x20000380000L, 0x200L, 0x0L);
       case 77:
-         return jjMoveStringLiteralDfa1_0(0xc00040000000000L, 0x81200000000000L, 0xa00L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc00040000000000L, 0x812000000000000L, 0xa000L, 0x0L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x8000800000000L, 0x10000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000800000000L, 0x100000000000000L, 0x0L, 0x0L);
       case 79:
          return jjMoveStringLiteralDfa1_0(0x2010030000000L, 0x0L, 0x0L, 0x0L);
       case 80:
          return jjMoveStringLiteralDfa1_0(0x1000000100000L, 0x0L, 0x0L, 0x0L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x88a000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x88a0000000L, 0x0L, 0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0xd080900000200000L, 0x1f420f060401c011L, 0x1000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xd080900000200000L, 0xf420f0604003c011L, 0x10001L, 0x0L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x200c000000000000L, 0x8000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0xc0000000000000L, 0x80002L, 0x0L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x20001000002000L, 0x80000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x200010000002000L, 0x800000L, 0x0L);
       case 86:
          return jjMoveStringLiteralDfa1_0(0x80000000L, 0xeL, 0x0L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x400000L, 0x0L);
       case 89:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000L, 0x0L, 0x0L);
       case 91:
-         jjmatchedKind = 174;
+         jjmatchedKind = 178;
          return jjMoveNfa_0(0, 0);
       case 93:
-         jjmatchedKind = 175;
+         jjmatchedKind = 179;
          return jjMoveNfa_0(0, 0);
       case 94:
-         jjmatchedKind = 202;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x80L);
+         jjmatchedKind = 208;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x2000L);
       case 97:
          jjmatchedKind = 18;
-         return jjMoveStringLiteralDfa1_0(0x2110004204000000L, 0x10000000L, 0x20100L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2110004204000000L, 0x100000000L, 0x201000L, 0x0L);
       case 98:
          return jjMoveStringLiteralDfa1_0(0x80040080000L, 0x880L, 0x0L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x200000002000000L, 0x8120000100L, 0x4c0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000002000000L, 0x81200000100L, 0x4c00L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x8000400000020000L, 0x12002L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x401400000L, 0x4000000040000L, 0x120028L, 0x0L);
       case 101:
-         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x4000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000000L, 0x40000000000L, 0x0L, 0x0L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x4000000040000040L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000000L, 0x400000040L, 0x4L, 0x0L);
       case 103:
          return jjMoveStringLiteralDfa1_0(0x20008000000000L, 0x20L, 0x0L, 0x0L);
       case 104:
-         return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x800000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000000000000L, 0x8000018000000L, 0x0L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x1f01600L, 0x4001L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x400000000000L, 0x7c01600L, 0x40010L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x20000c0000L, 0x20L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000L, 0x20000380000L, 0x200L, 0x0L);
       case 109:
-         return jjMoveStringLiteralDfa1_0(0xc00040000000000L, 0x81200000000000L, 0xa00L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc00040000000000L, 0x812000000000000L, 0xa000L, 0x0L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x8000800000000L, 0x10000000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000800000000L, 0x100000000000000L, 0x0L, 0x0L);
       case 111:
          return jjMoveStringLiteralDfa1_0(0x2010030000000L, 0x0L, 0x0L, 0x0L);
       case 112:
          return jjMoveStringLiteralDfa1_0(0x1000000100000L, 0x0L, 0x0L, 0x0L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x88a000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x88a0000000L, 0x0L, 0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0xd080900000200000L, 0x1f420f060401c011L, 0x1000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xd080900000200000L, 0xf420f0604003c011L, 0x10001L, 0x0L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0x200c000000000000L, 0x8000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x200000000000L, 0xc0000000000000L, 0x80002L, 0x0L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x20001000002000L, 0x80000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20100000000L, 0x200010000002000L, 0x800000L, 0x0L);
       case 118:
          return jjMoveStringLiteralDfa1_0(0x80000000L, 0xeL, 0x0L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000L, 0x0L, 0x400000L, 0x0L);
       case 121:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000L, 0x0L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000L, 0x0L, 0x0L);
       case 123:
-         jjmatchedKind = 172;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000000000000L, 0x0L);
+         jjmatchedKind = 176;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x4L);
       case 124:
-         jjmatchedKind = 201;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000000000000000L, 0x2L);
+         jjmatchedKind = 207;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x0L, 0x88L);
       case 125:
-         jjmatchedKind = 173;
+         jjmatchedKind = 177;
          return jjMoveNfa_0(0, 0);
       case 126:
-         jjmatchedKind = 191;
+         jjmatchedKind = 196;
          return jjMoveNfa_0(0, 0);
       default :
          return jjMoveNfa_0(0, 0);
@@ -212,65 +212,65 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2,
    switch(curChar)
    {
       case 38:
-         if ((active3 & 0x4L) != 0L)
+         if ((active3 & 0x100L) != 0L)
          {
-            jjmatchedKind = 194;
+            jjmatchedKind = 200;
             jjmatchedPos = 1;
          }
          break;
       case 45:
-         if ((active3 & 0x1000L) != 0L)
+         if ((active3 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 204;
+            jjmatchedKind = 210;
             jjmatchedPos = 1;
          }
          break;
       case 60:
-         if ((active2 & 0x800000000000000L) != 0L)
+         if ((active3 & 0x1L) != 0L)
          {
-            jjmatchedKind = 187;
+            jjmatchedKind = 192;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x4000000000000000L, active3, 0L);
       case 61:
-         if ((active2 & 0x20000000000000L) != 0L)
+         if ((active2 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 181;
+            jjmatchedKind = 185;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x100000000000000L) != 0L)
+         else if ((active2 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 184;
+            jjmatchedKind = 188;
             jjmatchedPos = 1;
          }
-         else if ((active2 & 0x200000000000000L) != 0L)
+         else if ((active2 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 185;
+            jjmatchedKind = 189;
             jjmatchedPos = 1;
          }
          break;
       case 62:
-         if ((active2 & 0x400000000000000L) != 0L)
+         if ((active3 & 0x2L) != 0L)
          {
-            jjmatchedKind = 186;
+            jjmatchedKind = 193;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x800L) != 0L)
+         else if ((active3 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 203;
+            jjmatchedKind = 209;
             jjmatchedPos = 1;
          }
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x8000000000000000L, active3, 0L);
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x840000880080000L, active1, 0xc00040000c0e001eL, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x840000880080000L, active1, 0x40000d83c001eL, active2, 0xcL, active3, 0L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0x10000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0x100000000L, active2, 0L, active3, 0L);
       case 67:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x30000000000L, active2, 0L, active3, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000000000L, active2, 0x100L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000000000L, active2, 0x1000L, active3, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80100401a00000L, active1, 0x2100822000000L, active2, 0x10802L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80100401a00000L, active1, 0x21008220000000L, active2, 0x108020L, active3, 0L);
       case 70:
          if ((active1 & 0x400L) != 0L)
          {
@@ -281,40 +281,40 @@ else if ((active3 & 0x800L) != 0L)
       case 71:
          return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x1f00000000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0xf000000000000000L, active2, 0x1L, active3, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000c0008400000L, active1, 0x5000000000040L, active2, 0x41000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000c0008400000L, active1, 0x50000000000040L, active2, 0x410000L, active3, 0L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L, active2, 0x20040L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000L, active2, 0x200400L, active3, 0L);
       case 78:
          if ((active1 & 0x200L) != 0L)
          {
             jjmatchedKind = 73;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x4000000800L, active2, 0x4001L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x40000000800L, active2, 0x40010L, active3, 0L);
       case 79:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 147;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x208000002000000L, active1, 0x10a08180000180L, active2, 0x620L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x208000002000000L, active1, 0x10a081800000180L, active2, 0x6200L, active3, 0L);
       case 80:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x21209020100000L, active1, 0x2000000000003020L, active2, 0x2080L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x21209020100000L, active1, 0x3020L, active2, 0x20802L, active3, 0L);
       case 83:
          if ((active0 & 0x10000000000000L) != 0L)
          {
             jjmatchedKind = 52;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x400204000000L, active1, 0x1f00000L, active2, 0x80000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400204000000L, active1, 0x7c00000L, active2, 0x800000L, active3, 0L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc000000000000000L, active1, 0x400f040001c001L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc000000000000000L, active1, 0x400f0400003c001L, active2, 0L, active3, 0L);
       case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000800000000000L, active1, 0x20000200000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000800000000000L, active1, 0x200002000000000L, active2, 0L, active3, 0L);
       case 86:
          return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 88:
@@ -327,29 +327,29 @@ else if ((active3 & 0x800L) != 0L)
          }
          break;
       case 90:
-         if ((active1 & 0x8000000000000L) != 0L)
+         if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 119;
             jjmatchedPos = 1;
          }
          break;
       case 94:
-         if ((active3 & 0x80L) != 0L)
+         if ((active3 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 199;
+            jjmatchedKind = 205;
             jjmatchedPos = 1;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x840000880080000L, active1, 0xc00040000c0e001eL, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x840000880080000L, active1, 0x40000d83c001eL, active2, 0xcL, active3, 0L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0x10000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000L, active1, 0x100000000L, active2, 0L, active3, 0L);
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x30000000000L, active2, 0L, active3, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80000000000000L, active2, 0x100L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800000000000000L, active2, 0x1000L, active3, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80100401a00000L, active1, 0x2100822000000L, active2, 0x10802L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80100401a00000L, active1, 0x21008220000000L, active2, 0x108020L, active3, 0L);
       case 102:
          if ((active1 & 0x400L) != 0L)
          {
@@ -360,40 +360,40 @@ else if ((active3 & 0x800L) != 0L)
       case 103:
          return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0x1f00000000000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0xf000000000000000L, active2, 0x1L, active3, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000c0008400000L, active1, 0x5000000000040L, active2, 0x41000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000c0008400000L, active1, 0x50000000000040L, active2, 0x410000L, active3, 0L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L, active2, 0x20040L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000L, active2, 0x200400L, active3, 0L);
       case 110:
          if ((active1 & 0x200L) != 0L)
          {
             jjmatchedKind = 73;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x4000000800L, active2, 0x4001L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x24100000000L, active1, 0x40000000800L, active2, 0x40010L, active3, 0L);
       case 111:
-         if ((active2 & 0x8000L) != 0L)
+         if ((active2 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 143;
+            jjmatchedKind = 147;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x208000002000000L, active1, 0x10a08180000180L, active2, 0x620L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x208000002000000L, active1, 0x10a081800000180L, active2, 0x6200L, active3, 0L);
       case 112:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x21209020100000L, active1, 0x2000000000003020L, active2, 0x2080L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x21209020100000L, active1, 0x3020L, active2, 0x20802L, active3, 0L);
       case 115:
          if ((active0 & 0x10000000000000L) != 0L)
          {
             jjmatchedKind = 52;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x400204000000L, active1, 0x1f00000L, active2, 0x80000L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400204000000L, active1, 0x7c00000L, active2, 0x800000L, active3, 0L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0xc000000000000000L, active1, 0x400f040001c001L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0xc000000000000000L, active1, 0x400f0400003c001L, active2, 0L, active3, 0L);
       case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000800000000000L, active1, 0x20000200000000L, active2, 0L, active3, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000800000000000L, active1, 0x200002000000000L, active2, 0L, active3, 0L);
       case 118:
          return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0L, active2, 0L, active3, 0L);
       case 120:
@@ -406,28 +406,28 @@ else if ((active3 & 0x800L) != 0L)
          }
          break;
       case 122:
-         if ((active1 & 0x8000000000000L) != 0L)
+         if ((active1 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 115;
+            jjmatchedKind = 119;
             jjmatchedPos = 1;
          }
          break;
       case 124:
-         if ((active2 & 0x1000000000000000L) != 0L)
+         if ((active3 & 0x4L) != 0L)
          {
-            jjmatchedKind = 188;
+            jjmatchedKind = 194;
             jjmatchedPos = 1;
          }
-         else if ((active3 & 0x2L) != 0L)
+         else if ((active3 & 0x80L) != 0L)
          {
-            jjmatchedKind = 193;
+            jjmatchedKind = 199;
             jjmatchedPos = 1;
          }
          break;
       case 125:
-         if ((active2 & 0x2000000000000000L) != 0L)
+         if ((active3 & 0x8L) != 0L)
          {
-            jjmatchedKind = 189;
+            jjmatchedKind = 195;
             jjmatchedPos = 1;
          }
          break;
@@ -445,40 +445,54 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
    }
    switch(curChar)
    {
+      case 40:
+         if ((active2 & 0x4000000000000000L) != 0L)
+         {
+            jjmatchedKind = 190;
+            jjmatchedPos = 2;
+         }
+         break;
       case 53:
-         if ((active1 & 0x80000000000000L) != 0L)
+         if ((active1 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 119;
+            jjmatchedKind = 123;
+            jjmatchedPos = 2;
+         }
+         break;
+      case 62:
+         if ((active2 & 0x8000000000000000L) != 0L)
+         {
+            jjmatchedKind = 191;
             jjmatchedPos = 2;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000L, active1, 0x1f00103000000100L, active2, 0x20L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000L, active1, 0xf001030000000100L, active2, 0x201L);
       case 66:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0x200400000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0x2001000000L, active2, 0L);
       case 67:
          if ((active0 & 0x200000000L) != 0L)
          {
             jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2004000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000000000L, active2, 0L);
       case 68:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x100L) != 0L)
+         else if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 140;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0xc000000120800000L, active1, 0x1L, active2, 0L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1002000100000L, active1, 0L, active2, 0xc0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1002000100000L, active1, 0L, active2, 0xc00L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x100000L);
       case 71:
          if ((active0 & 0x100000000000000L) != 0L)
          {
@@ -490,7 +504,7 @@ else if ((active0 & 0x2000000000000000L) != 0L)
             jjmatchedKind = 61;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000000L, active2, 0L);
       case 73:
          if ((active1 & 0x1000L) != 0L)
          {
@@ -502,7 +516,7 @@ else if ((active1 & 0x2000L) != 0L)
             jjmatchedKind = 77;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x4220000000000L, active1, 0x20000020200000L, active2, 0x80000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4220000000000L, active1, 0x200000200800000L, active2, 0x800000L);
       case 74:
          return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0L, active2, 0L);
       case 75:
@@ -513,59 +527,59 @@ else if ((active1 & 0x2000L) != 0L)
          }
          break;
       case 76:
-         if ((active2 & 0x20000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 145;
+            jjmatchedKind = 149;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x80200000L, active1, 0x4000000000800040L, active2, 0x1002L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80200000L, active1, 0x2000040L, active2, 0x10024L);
       case 77:
          if ((active0 & 0x1000000000000000L) != 0L)
          {
             jjmatchedKind = 60;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x808000000L, active1, 0x4000004000010L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x808000000L, active1, 0x40000040000010L, active2, 0L);
       case 78:
          if ((active0 & 0x400000000000000L) != 0L)
          {
             jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x12081090c0000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x12081084380000L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20001000000000L, active1, 0x40000820L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20001000000000L, active1, 0x400000820L, active2, 0x20000L);
       case 80:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x800000000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x8000000000L, active2, 0x4000L);
       case 82:
          if ((active1 & 0x4000L) != 0L)
          {
             jjmatchedKind = 78;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x400f040001800eL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x400f0400003800eL, active2, 0L);
       case 83:
-         if ((active1 & 0x10000000L) != 0L)
+         if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 96;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x18000000L, active2, 0x10L);
       case 84:
          if ((active0 & 0x8000000000000L) != 0L)
          {
             jjmatchedKind = 51;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x410000000000L, active1, 0x8000000000020000L, active2, 0x44800L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x410000000000L, active1, 0x40000L, active2, 0x448008L);
       case 85:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0x2000800080100080L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0x8000800400080L, active2, 0x2L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x2000L);
       case 87:
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 120;
             jjmatchedPos = 2;
          }
          break;
@@ -577,39 +591,39 @@ else if ((active1 & 0x2000L) != 0L)
          }
          break;
       case 89:
-         if ((active1 & 0x400000000000L) != 0L)
+         if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 114;
             jjmatchedPos = 2;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000L, active1, 0x1f00103000000100L, active2, 0x20L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000L, active1, 0xf001030000000100L, active2, 0x201L);
       case 98:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0x200400000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000L, active1, 0x2001000000L, active2, 0L);
       case 99:
          if ((active0 & 0x200000000L) != 0L)
          {
             jjmatchedKind = 33;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2004000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20040000000000L, active2, 0L);
       case 100:
          if ((active0 & 0x4000000000L) != 0L)
          {
             jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         else if ((active2 & 0x100L) != 0L)
+         else if ((active2 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 136;
+            jjmatchedKind = 140;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0xc000000120800000L, active1, 0x1L, active2, 0L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1002000100000L, active1, 0L, active2, 0xc0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1002000100000L, active1, 0L, active2, 0xc00L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000L, active1, 0L, active2, 0x100000L);
       case 103:
          if ((active0 & 0x100000000000000L) != 0L)
          {
@@ -621,7 +635,7 @@ else if ((active0 & 0x2000000000000000L) != 0L)
             jjmatchedKind = 61;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000000L, active2, 0L);
       case 105:
          if ((active1 & 0x1000L) != 0L)
          {
@@ -633,7 +647,7 @@ else if ((active1 & 0x2000L) != 0L)
             jjmatchedKind = 77;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x4220000000000L, active1, 0x20000020200000L, active2, 0x80000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4220000000000L, active1, 0x200000200800000L, active2, 0x800000L);
       case 106:
          return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0L, active2, 0L);
       case 107:
@@ -644,59 +658,59 @@ else if ((active1 & 0x2000L) != 0L)
          }
          break;
       case 108:
-         if ((active2 & 0x20000L) != 0L)
+         if ((active2 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 145;
+            jjmatchedKind = 149;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x80200000L, active1, 0x4000000000800040L, active2, 0x1002L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80200000L, active1, 0x2000040L, active2, 0x10024L);
       case 109:
          if ((active0 & 0x1000000000000000L) != 0L)
          {
             jjmatchedKind = 60;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x808000000L, active1, 0x4000004000010L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x808000000L, active1, 0x40000040000010L, active2, 0L);
       case 110:
          if ((active0 & 0x400000000000000L) != 0L)
          {
             jjmatchedKind = 58;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x12081090c0000L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0002000000L, active1, 0x12081084380000L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20001000000000L, active1, 0x40000820L, active2, 0x2000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20001000000000L, active1, 0x400000820L, active2, 0x20000L);
       case 112:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x800000000L, active2, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x8000000000L, active2, 0x4000L);
       case 114:
          if ((active1 & 0x4000L) != 0L)
          {
             jjmatchedKind = 78;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x400f040001800eL, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000L, active1, 0x400f0400003800eL, active2, 0L);
       case 115:
-         if ((active1 & 0x10000000L) != 0L)
+         if ((active1 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 92;
+            jjmatchedKind = 96;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x401480000L, active1, 0x18000000L, active2, 0x10L);
       case 116:
          if ((active0 & 0x8000000000000L) != 0L)
          {
             jjmatchedKind = 51;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x410000000000L, active1, 0x8000000000020000L, active2, 0x44800L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x410000000000L, active1, 0x40000L, active2, 0x448008L);
       case 117:
-         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0x2000800080100080L, active2, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000000L, active1, 0x8000800400080L, active2, 0x2L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L, active2, 0x2000L);
       case 119:
-         if ((active1 & 0x10000000000000L) != 0L)
+         if ((active1 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 116;
+            jjmatchedKind = 120;
             jjmatchedPos = 2;
          }
          break;
@@ -708,9 +722,9 @@ else if ((active1 & 0x2000L) != 0L)
          }
          break;
       case 121:
-         if ((active1 & 0x400000000000L) != 0L)
+         if ((active1 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 110;
+            jjmatchedKind = 114;
             jjmatchedPos = 2;
          }
          break;
@@ -729,105 +743,105 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         if ((active1 & 0x100000000000000L) != 0L)
+         if ((active1 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 120;
+            jjmatchedKind = 124;
             jjmatchedPos = 3;
          }
          break;
       case 50:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x600000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x6000000000000000L, active2, 0L);
       case 51:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0L, active2, 0x1L);
       case 65:
-         if ((active1 & 0x8000000000000000L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 131;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x800L) != 0L)
+         else if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 139;
+            jjmatchedKind = 143;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x80000020000L, active2, 0x100c0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x800000040000L, active2, 0x100c00L);
       case 66:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 67:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x100000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x1000000000L, active2, 0L);
       case 68:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 95;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 121;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 137;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0x10800L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0x20800L, active2, 0L);
       case 69:
          if ((active0 & 0x80000L) != 0L)
          {
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x200L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 141;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xc002000920200000L, active1, 0x4020006000001L, active2, 0x1003L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xc002000920200000L, active1, 0x40200060000001L, active2, 0x10030L);
       case 70:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 71:
-         if ((active1 & 0x40000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x300000L, active2, 0L);
       case 72:
-         if ((active2 & 0x40000L) != 0L)
+         if ((active2 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 146;
+            jjmatchedKind = 150;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40010008000000L, active1, 0x800002L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40010008000000L, active1, 0x2000002L, active2, 0L);
       case 74:
          return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L, active1, 0L, active2, 0L);
       case 76:
-         if ((active1 & 0x20000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00408100L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc019018100L, active2, 0L);
       case 77:
          if ((active0 & 0x1000000000L) != 0L)
          {
@@ -836,132 +850,132 @@ else if ((active2 & 0x200L) != 0L)
          }
          break;
       case 78:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x80000080L, active2, 0x80000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x800000080L, active2, 0x800000L);
       case 79:
-         if ((active2 & 0x4000L) != 0L)
+         if ((active2 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 146;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x2004040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x20040400000000L, active2, 0L);
       case 80:
-         if ((active2 & 0x2000L) != 0L)
+         if ((active2 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 141;
+            jjmatchedKind = 145;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x208000000000L, active1, 0x10L, active2, 0L);
       case 82:
-         if ((active1 & 0x100000000000L) != 0L)
+         if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 112;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x402000000000L, active1, 0x800000300000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x402000000000L, active1, 0x8000000c00000L, active2, 0L);
       case 83:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000012000000L, active1, 0x4000013200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000012000000L, active1, 0x132000000000L, active2, 0x4L);
       case 84:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0x208000000040L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0x2080000000040L, active2, 0L);
       case 85:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20040080800000L, active1, 0x41000001000020L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20040080800000L, active1, 0x410000004000020L, active2, 0L);
       case 86:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 89:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 142;
             jjmatchedPos = 3;
          }
          break;
       case 95:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xcL, active2, 0L);
       case 97:
-         if ((active1 & 0x8000000000000000L) != 0L)
+         if ((active2 & 0x8L) != 0L)
          {
-            jjmatchedKind = 127;
+            jjmatchedKind = 131;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x800L) != 0L)
+         else if ((active2 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 139;
+            jjmatchedKind = 143;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x80000020000L, active2, 0x100c0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x800000040000L, active2, 0x100c00L);
       case 98:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 99:
          if ((active0 & 0x400000000L) != 0L)
          {
             jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x100000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0x1000000000L, active2, 0L);
       case 100:
          if ((active0 & 0x80000000000L) != 0L)
          {
             jjmatchedKind = 43;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x8000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 91;
+            jjmatchedKind = 95;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20000000000000L) != 0L)
+         else if ((active1 & 0x200000000000000L) != 0L)
          {
-            jjmatchedKind = 117;
+            jjmatchedKind = 121;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x20L) != 0L)
+         else if ((active2 & 0x200L) != 0L)
          {
-            jjmatchedKind = 133;
+            jjmatchedKind = 137;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0x10800L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000000000L, active1, 0x20800L, active2, 0L);
       case 101:
          if ((active0 & 0x80000L) != 0L)
          {
             jjmatchedKind = 19;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x2000000000000000L) != 0L)
+         else if ((active2 & 0x2L) != 0L)
          {
-            jjmatchedKind = 125;
+            jjmatchedKind = 129;
             jjmatchedPos = 3;
          }
-         else if ((active2 & 0x200L) != 0L)
+         else if ((active2 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 137;
+            jjmatchedKind = 141;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xc002000920200000L, active1, 0x4020006000001L, active2, 0x1003L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xc002000920200000L, active1, 0x40200060000001L, active2, 0x10030L);
       case 102:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L, active2, 0L);
       case 103:
-         if ((active1 & 0x40000L) != 0L)
+         if ((active1 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 82;
+            jjmatchedKind = 83;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x300000L, active2, 0L);
       case 104:
-         if ((active2 & 0x40000L) != 0L)
+         if ((active2 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 146;
+            jjmatchedKind = 150;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40010008000000L, active1, 0x800002L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40010008000000L, active1, 0x2000002L, active2, 0L);
       case 106:
          return jjMoveStringLiteralDfa4_0(active0, 0x800000000000L, active1, 0L, active2, 0L);
       case 108:
-         if ((active1 & 0x20000000L) != 0L)
+         if ((active1 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 97;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc00408100L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0xc019018100L, active2, 0L);
       case 109:
          if ((active0 & 0x1000000000L) != 0L)
          {
@@ -970,40 +984,40 @@ else if ((active2 & 0x200L) != 0L)
          }
          break;
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x80000080L, active2, 0x80000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x800000080L, active2, 0x800000L);
       case 111:
-         if ((active2 & 0x4000L) != 0L)
+         if ((active2 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 142;
+            jjmatchedKind = 146;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x2004040000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000000L, active1, 0x20040400000000L, active2, 0L);
       case 112:
-         if ((active2 & 0x2000L) != 0L)
+         if ((active2 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 141;
+            jjmatchedKind = 145;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0x208000000000L, active1, 0x10L, active2, 0L);
       case 114:
-         if ((active1 & 0x100000000000L) != 0L)
+         if ((active1 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 108;
+            jjmatchedKind = 112;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x402000000000L, active1, 0x800000300000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x402000000000L, active1, 0x8000000c00000L, active2, 0L);
       case 115:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000012000000L, active1, 0x4000013200000000L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000012000000L, active1, 0x132000000000L, active2, 0x4L);
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0x208000000040L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0x2080000000040L, active2, 0L);
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0x20040080800000L, active1, 0x41000001000020L, active2, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20040080800000L, active1, 0x410000004000020L, active2, 0L);
       case 118:
          return jjMoveStringLiteralDfa4_0(active0, 0x100000000000L, active1, 0L, active2, 0L);
       case 121:
-         if ((active2 & 0x400L) != 0L)
+         if ((active2 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 138;
+            jjmatchedKind = 142;
             jjmatchedPos = 3;
          }
          break;
@@ -1022,15 +1036,15 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 49:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0L, active2, 0x1L);
       case 50:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2000000000000000L, active2, 0L);
       case 53:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000000L, active2, 0L);
       case 56:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8000000000000000L, active2, 0L);
       case 65:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8900408002L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x89019018002L, active2, 0L);
       case 67:
          return jjMoveStringLiteralDfa5_0(active0, 0x2000000a00000L, active1, 0L, active2, 0L);
       case 68:
@@ -1044,12 +1058,12 @@ else if ((active1 & 0x80L) != 0L)
             jjmatchedKind = 71;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000L) != 0L)
+         else if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 99;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000200000L, active2, 0L);
       case 69:
          if ((active0 & 0x2000000000L) != 0L)
          {
@@ -1061,33 +1075,33 @@ else if ((active1 & 0x800L) != 0L)
             jjmatchedKind = 75;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 104;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000L) != 0L)
+         else if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 105;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 130;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800090000000L, active1, 0x40400000140L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800090000000L, active1, 0x404000000140L, active2, 0L);
       case 70:
          if ((active0 & 0x100000000L) != 0L)
          {
             jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 71:
-         if ((active2 & 0x80000L) != 0L)
+         if ((active2 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 147;
+            jjmatchedKind = 151;
             jjmatchedPos = 4;
          }
          break;
@@ -1097,35 +1111,35 @@ else if ((active1 & 0x4000000000000000L) != 0L)
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
          break;
       case 73:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 86;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 87;
             jjmatchedPos = 4;
          }
          return jjMoveStringLiteralDfa5_0(active0, 0x1500000500000L, active1, 0L, active2, 0L);
       case 76:
          return jjMoveStringLiteralDfa5_0(active0, 0x200000000000L, active1, 0x10L, active2, 0L);
       case 77:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1080000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4100000L, active2, 0L);
       case 78:
          if ((active0 & 0x20000000000L) != 0L)
          {
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0x2020000000000L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0x20200000000000L, active2, 0x10000L);
       case 79:
          return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 80:
@@ -1141,26 +1155,26 @@ else if ((active1 & 0x200000L) != 0L)
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 98;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x40L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 138;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000001000000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000001000000L, active1, 0L, active2, 0x10L);
       case 83:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 115;
             jjmatchedPos = 4;
          }
          return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L, active2, 0L);
@@ -1175,14 +1189,14 @@ else if ((active0 & 0x200000000000000L) != 0L)
             jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000002000000L, active1, 0x1010204820000L, active2, 0x82L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000002000000L, active1, 0x10102042040000L, active2, 0x820L);
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000000L, active2, 0x100000L);
       case 86:
          if ((active0 & 0x4000000000000000L) != 0L)
          {
@@ -1191,16 +1205,16 @@ else if ((active1 & 0x10000L) != 0L)
          }
          return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0x1L, active2, 0L);
       case 88:
-         if ((active1 & 0x2000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 93;
             jjmatchedPos = 4;
          }
          break;
       case 90:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8900408002L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x89019018002L, active2, 0L);
       case 99:
          return jjMoveStringLiteralDfa5_0(active0, 0x2000000a00000L, active1, 0L, active2, 0L);
       case 100:
@@ -1214,12 +1228,12 @@ else if ((active1 & 0x80L) != 0L)
             jjmatchedKind = 71;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000L) != 0L)
+         else if ((active1 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 95;
+            jjmatchedKind = 99;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000200000L, active2, 0L);
       case 101:
          if ((active0 & 0x2000000000L) != 0L)
          {
@@ -1231,33 +1245,33 @@ else if ((active1 & 0x800L) != 0L)
             jjmatchedKind = 75;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x1000000000L) != 0L)
+         else if ((active1 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 100;
+            jjmatchedKind = 104;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x2000000000L) != 0L)
+         else if ((active1 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 101;
+            jjmatchedKind = 105;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x4000000000000000L) != 0L)
+         else if ((active2 & 0x4L) != 0L)
          {
-            jjmatchedKind = 126;
+            jjmatchedKind = 130;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x800090000000L, active1, 0x40400000140L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800090000000L, active1, 0x404000000140L, active2, 0L);
       case 102:
          if ((active0 & 0x100000000L) != 0L)
          {
             jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 103:
-         if ((active2 & 0x80000L) != 0L)
+         if ((active2 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 147;
+            jjmatchedKind = 151;
             jjmatchedPos = 4;
          }
          break;
@@ -1267,35 +1281,35 @@ else if ((active1 & 0x4000000000000000L) != 0L)
             jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000000000L) != 0L)
+         else if ((active1 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 109;
+            jjmatchedKind = 113;
             jjmatchedPos = 4;
          }
          break;
       case 105:
-         if ((active1 & 0x100000L) != 0L)
+         if ((active1 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 84;
+            jjmatchedKind = 86;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x200000L) != 0L)
+         else if ((active1 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 85;
+            jjmatchedKind = 87;
             jjmatchedPos = 4;
          }
          return jjMoveStringLiteralDfa5_0(active0, 0x1500000500000L, active1, 0L, active2, 0L);
       case 108:
          return jjMoveStringLiteralDfa5_0(active0, 0x200000000000L, active1, 0x10L, active2, 0L);
       case 109:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1080000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4100000L, active2, 0L);
       case 110:
          if ((active0 & 0x20000000000L) != 0L)
          {
             jjmatchedKind = 41;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0x2020000000000L, active2, 0x1000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0x20200000000000L, active2, 0x10000L);
       case 111:
          return jjMoveStringLiteralDfa5_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
       case 112:
@@ -1311,26 +1325,26 @@ else if ((active1 & 0x200000L) != 0L)
             jjmatchedKind = 29;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000L) != 0L)
+         else if ((active1 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 98;
             jjmatchedPos = 4;
          }
-         else if ((active2 & 0x40L) != 0L)
+         else if ((active2 & 0x400L) != 0L)
          {
-            jjmatchedKind = 134;
+            jjmatchedKind = 138;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80000001000000L, active1, 0L, active2, 0x1L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000001000000L, active1, 0L, active2, 0x10L);
       case 115:
          if ((active0 & 0x40000000000L) != 0L)
          {
             jjmatchedKind = 42;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x800000000000L) != 0L)
+         else if ((active1 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 111;
+            jjmatchedKind = 115;
             jjmatchedPos = 4;
          }
          return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L, active2, 0L);
@@ -1345,14 +1359,14 @@ else if ((active0 & 0x200000000000000L) != 0L)
             jjmatchedKind = 57;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x10000L) != 0L)
+         else if ((active1 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 80;
+            jjmatchedKind = 81;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x4000002000000L, active1, 0x1010204820000L, active2, 0x82L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000002000000L, active1, 0x10102042040000L, active2, 0x820L);
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000000000L, active2, 0x100000L);
       case 118:
          if ((active0 & 0x4000000000000000L) != 0L)
          {
@@ -1361,14 +1375,14 @@ else if ((active1 & 0x10000L) != 0L)
          }
          return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0x1L, active2, 0L);
       case 120:
-         if ((active1 & 0x2000000L) != 0L)
+         if ((active1 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 89;
+            jjmatchedKind = 93;
             jjmatchedPos = 4;
          }
          break;
       case 122:
-         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4000000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000000000L, active2, 0L);
       default :
          break;
    }
@@ -1384,37 +1398,37 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 50:
-         if ((active1 & 0x1000000000000000L) != 0L)
+         if ((active2 & 0x1L) != 0L)
          {
-            jjmatchedKind = 124;
+            jjmatchedKind = 128;
             jjmatchedPos = 5;
          }
          break;
       case 52:
-         if ((active1 & 0x200000000000000L) != 0L)
+         if ((active1 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 121;
+            jjmatchedKind = 125;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x800000000000000L) != 0L)
+         else if ((active1 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 123;
+            jjmatchedKind = 127;
             jjmatchedPos = 5;
          }
          break;
       case 54:
-         if ((active1 & 0x400000000000000L) != 0L)
+         if ((active1 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 122;
+            jjmatchedKind = 126;
             jjmatchedPos = 5;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x10000080004L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x100000100004L, active2, 0L);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1900000000000L, active1, 0x800000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1900000000000L, active1, 0x8000000000L, active2, 0L);
       case 68:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20200000000000L, active2, 0L);
       case 69:
          if ((active0 & 0x200000000000L) != 0L)
          {
@@ -1426,19 +1440,19 @@ else if ((active1 & 0x10L) != 0L)
             jjmatchedKind = 68;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x2L) != 0L)
+         else if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 133;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x80L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 139;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x1004005800000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x10040046000000L, active2, 0L);
       case 70:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 71:
          if ((active0 & 0x40000000000000L) != 0L)
          {
@@ -1447,18 +1461,18 @@ else if ((active2 & 0x80L) != 0L)
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x40008000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x400080000200000L, active2, 0L);
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x100000L);
       case 78:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 102;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x408002L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x19018002L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000008L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000008L, active2, 0L);
       case 80:
          return jjMoveStringLiteralDfa6_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
       case 82:
@@ -1467,9 +1481,9 @@ else if ((active2 & 0x80L) != 0L)
             jjmatchedKind = 70;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 101;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L, active2, 0L);
@@ -1501,22 +1515,22 @@ else if ((active0 & 0x2000000000000L) != 0L)
             jjmatchedKind = 49;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 100;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 132;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x1000L) != 0L)
+         else if ((active2 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 144;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 88:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1525,15 +1539,15 @@ else if ((active2 & 0x1000L) != 0L)
          }
          break;
       case 89:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
       case 95:
          return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000000L, active1, 0x21L, active2, 0L);
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x10000080004L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0x100000100004L, active2, 0L);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1900000000000L, active1, 0x800000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1900000000000L, active1, 0x8000000000L, active2, 0L);
       case 100:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2020000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20200000000000L, active2, 0L);
       case 101:
          if ((active0 & 0x200000000000L) != 0L)
          {
@@ -1545,19 +1559,19 @@ else if ((active1 & 0x10L) != 0L)
             jjmatchedKind = 68;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x2L) != 0L)
+         else if ((active2 & 0x20L) != 0L)
          {
-            jjmatchedKind = 129;
+            jjmatchedKind = 133;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x80L) != 0L)
+         else if ((active2 & 0x800L) != 0L)
          {
-            jjmatchedKind = 135;
+            jjmatchedKind = 139;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x1004005800000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0x10040046000000L, active2, 0L);
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 103:
          if ((active0 & 0x40000000000000L) != 0L)
          {
@@ -1566,18 +1580,18 @@ else if ((active2 & 0x80L) != 0L)
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x40008000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0x400080000200000L, active2, 0L);
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x10000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0L, active2, 0x100000L);
       case 110:
-         if ((active1 & 0x400000000L) != 0L)
+         if ((active1 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 98;
+            jjmatchedKind = 102;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x408002L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000400000L, active1, 0x19018002L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4000000000008L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000000000008L, active2, 0L);
       case 112:
          return jjMoveStringLiteralDfa6_0(active0, 0x400000000000L, active1, 0L, active2, 0L);
       case 114:
@@ -1586,9 +1600,9 @@ else if ((active2 & 0x80L) != 0L)
             jjmatchedKind = 70;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x200000000L) != 0L)
+         else if ((active1 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 97;
+            jjmatchedKind = 101;
             jjmatchedPos = 5;
          }
          return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L, active2, 0L);
@@ -1620,22 +1634,22 @@ else if ((active0 & 0x2000000000000L) != 0L)
             jjmatchedKind = 49;
             jjmatchedPos = 5;
          }
-         else if ((active1 & 0x100000000L) != 0L)
+         else if ((active1 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 96;
+            jjmatchedKind = 100;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x1L) != 0L)
+         else if ((active2 & 0x10L) != 0L)
          {
-            jjmatchedKind = 128;
+            jjmatchedKind = 132;
             jjmatchedPos = 5;
          }
-         else if ((active2 & 0x1000L) != 0L)
+         else if ((active2 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 140;
+            jjmatchedKind = 144;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 120:
          if ((active0 & 0x100000L) != 0L)
          {
@@ -1644,7 +1658,7 @@ else if ((active2 & 0x1000L) != 0L)
          }
          break;
       case 121:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x20000L, active2, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40000L, active2, 0L);
       default :
          break;
    }
@@ -1671,9 +1685,9 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
             jjmatchedKind = 23;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x40000000000000L) != 0L)
+         else if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 122;
             jjmatchedPos = 6;
          }
          break;
@@ -1683,23 +1697,28 @@ else if ((active1 & 0x40000000000000L) != 0L)
             jjmatchedKind = 44;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800000000L) != 0L)
+         else if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 103;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 71:
          if ((active1 & 0x8000L) != 0L)
          {
             jjmatchedKind = 79;
             jjmatchedPos = 6;
          }
-         break;
+         else if ((active1 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 91;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10010000L, active2, 0L);
       case 75:
-         if ((active1 & 0x400000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 88;
             jjmatchedPos = 6;
          }
          break;
@@ -1708,32 +1727,37 @@ else if ((active1 & 0x800000000L) != 0L)
       case 77:
          return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4L, active2, 0L);
       case 78:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40080000000000L, active2, 0L);
       case 79:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 80:
          if ((active1 & 0x8L) != 0L)
          {
             jjmatchedKind = 67;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20001L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40001L, active2, 0L);
       case 82:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10005800000L, active2, 0L);
+         if ((active1 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 85;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100046000000L, active2, 0L);
       case 83:
-         if ((active1 & 0x20000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 109;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 116;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 117;
             jjmatchedPos = 6;
          }
          return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
@@ -1743,16 +1767,16 @@ else if ((active1 & 0x2000000000000L) != 0L)
             jjmatchedKind = 47;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x10000L) != 0L)
+         else if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 148;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0x100000L, active2, 0L);
       case 85:
          return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
       case 95:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
       case 97:
          return jjMoveStringLiteralDfa7_0(active0, 0x1010000000000L, active1, 0L, active2, 0L);
       case 98:
@@ -1765,9 +1789,9 @@ else if ((active2 & 0x10000L) != 0L)
             jjmatchedKind = 23;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x40000000000000L) != 0L)
+         else if ((active1 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 118;
+            jjmatchedKind = 122;
             jjmatchedPos = 6;
          }
          break;
@@ -1777,23 +1801,28 @@ else if ((active1 & 0x40000000000000L) != 0L)
             jjmatchedKind = 44;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x800000000L) != 0L)
+         else if ((active1 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 99;
+            jjmatchedKind = 103;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x80000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000000000L, active2, 0L);
       case 103:
          if ((active1 & 0x8000L) != 0L)
          {
             jjmatchedKind = 79;
             jjmatchedPos = 6;
          }
-         break;
+         else if ((active1 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 91;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10010000L, active2, 0L);
       case 107:
-         if ((active1 & 0x400000L) != 0L)
+         if ((active1 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 86;
+            jjmatchedKind = 88;
             jjmatchedPos = 6;
          }
          break;
@@ -1802,32 +1831,37 @@ else if ((active1 & 0x800000000L) != 0L)
       case 109:
          return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4L, active2, 0L);
       case 110:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4008000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40080000000000L, active2, 0L);
       case 111:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40000000000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000000L, active2, 0L);
       case 112:
          if ((active1 & 0x8L) != 0L)
          {
             jjmatchedKind = 67;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x20001L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x40001L, active2, 0L);
       case 114:
-         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10005800000L, active2, 0L);
+         if ((active1 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 85;
+            jjmatchedPos = 6;
+         }
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100046000000L, active2, 0L);
       case 115:
-         if ((active1 & 0x20000000000L) != 0L)
+         if ((active1 & 0x200000000000L) != 0L)
          {
-            jjmatchedKind = 105;
+            jjmatchedKind = 109;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x1000000000000L) != 0L)
+         else if ((active1 & 0x10000000000000L) != 0L)
          {
-            jjmatchedKind = 112;
+            jjmatchedKind = 116;
             jjmatchedPos = 6;
          }
-         else if ((active1 & 0x2000000000000L) != 0L)
+         else if ((active1 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 113;
+            jjmatchedKind = 117;
             jjmatchedPos = 6;
          }
          return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L, active1, 0L, active2, 0L);
@@ -1837,12 +1871,12 @@ else if ((active1 & 0x2000000000000L) != 0L)
             jjmatchedKind = 47;
             jjmatchedPos = 6;
          }
-         else if ((active2 & 0x10000L) != 0L)
+         else if ((active2 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 144;
+            jjmatchedKind = 148;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0x80000L, active2, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0x100000L, active2, 0L);
       case 117:
          return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L, active2, 0L);
       default :
@@ -1860,9 +1894,11 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x800000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x2000000L);
       case 67:
-         return jjMoveStringLiteralDfa8_0(active0, 0x2000000L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000L, active1, 0x100000L);
+      case 68:
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10010000L);
       case 69:
          if ((active0 & 0x1000000L) != 0L)
          {
@@ -1884,21 +1920,21 @@ else if ((active1 & 0x100L) != 0L)
             jjmatchedKind = 72;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x20000L) != 0L)
+         else if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 118;
             jjmatchedPos = 7;
          }
          break;
       case 70:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
       case 73:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000L);
       case 76:
          if ((active0 & 0x10000000000L) != 0L)
          {
@@ -1907,9 +1943,9 @@ else if ((active1 & 0x4000000000000L) != 0L)
          }
          break;
       case 77:
-         if ((active1 & 0x4000000L) != 0L)
+         if ((active1 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 94;
             jjmatchedPos = 7;
          }
          break;
@@ -1923,16 +1959,16 @@ else if ((active1 & 0x4000000000000L) != 0L)
          }
          break;
       case 82:
-         if ((active1 & 0x80000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 111;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000000L);
       case 83:
-         if ((active1 & 0x8000000000L) != 0L)
+         if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 107;
             jjmatchedPos = 7;
          }
          break;
@@ -1942,11 +1978,13 @@ else if ((active1 & 0x4000000000000L) != 0L)
             jjmatchedKind = 22;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000L, active1, 0x10000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000L, active1, 0x100000000000L);
       case 97:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x800000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x2000000L);
       case 99:
-         return jjMoveStringLiteralDfa8_0(active0, 0x2000000L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000L, active1, 0x100000L);
+      case 100:
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x10010000L);
       case 101:
          if ((active0 & 0x1000000L) != 0L)
          {
@@ -1968,21 +2006,21 @@ else if ((active1 & 0x100L) != 0L)
             jjmatchedKind = 72;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x20000L) != 0L)
+         else if ((active1 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 81;
+            jjmatchedKind = 82;
             jjmatchedPos = 7;
          }
-         else if ((active1 & 0x4000000000000L) != 0L)
+         else if ((active1 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 114;
+            jjmatchedKind = 118;
             jjmatchedPos = 7;
          }
          break;
       case 102:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
       case 105:
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x1000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4000000L);
       case 108:
          if ((active0 & 0x10000000000L) != 0L)
          {
@@ -1991,9 +2029,9 @@ else if ((active1 & 0x4000000000000L) != 0L)
          }
          break;
       case 109:
-         if ((active1 & 0x4000000L) != 0L)
+         if ((active1 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 90;
+            jjmatchedKind = 94;
             jjmatchedPos = 7;
          }
          break;
@@ -2007,16 +2045,16 @@ else if ((active1 & 0x4000000000000L) != 0L)
          }
          break;
       case 114:
-         if ((active1 & 0x80000000000L) != 0L)
+         if ((active1 & 0x800000000000L) != 0L)
          {
-            jjmatchedKind = 107;
+            jjmatchedKind = 111;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x40000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000000L);
       case 115:
-         if ((active1 & 0x8000000000L) != 0L)
+         if ((active1 & 0x80000000000L) != 0L)
          {
-            jjmatchedKind = 103;
+            jjmatchedKind = 107;
             jjmatchedPos = 7;
          }
          break;
@@ -2026,7 +2064,7 @@ else if ((active1 & 0x4000000000000L) != 0L)
             jjmatchedKind = 22;
             jjmatchedPos = 7;
          }
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000L, active1, 0x10000000000L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x1000000000000L, active1, 0x100000000000L);
       default :
          break;
    }
@@ -2042,9 +2080,9 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 67:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 90;
             jjmatchedPos = 8;
          }
          break;
@@ -2054,18 +2092,20 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
             jjmatchedKind = 48;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x40000000000L) != 0L)
+         else if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 110;
             jjmatchedPos = 8;
          }
          break;
       case 72:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100000L);
+      case 73:
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10010000L);
       case 76:
-         if ((active1 & 0x800000L) != 0L)
+         if ((active1 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 89;
             jjmatchedPos = 8;
          }
          break;
@@ -2074,7 +2114,7 @@ else if ((active1 & 0x40000000000L) != 0L)
       case 78:
          return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x20L);
       case 79:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40000000000L);
       case 80:
          if ((active1 & 0x1L) != 0L)
          {
@@ -2090,9 +2130,9 @@ else if ((active1 & 0x40000000000L) != 0L)
          }
          break;
       case 83:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 108;
             jjmatchedPos = 8;
          }
          break;
@@ -2104,9 +2144,9 @@ else if ((active1 & 0x40000000000L) != 0L)
          }
          break;
       case 99:
-         if ((active1 & 0x1000000L) != 0L)
+         if ((active1 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 88;
+            jjmatchedKind = 90;
             jjmatchedPos = 8;
          }
          break;
@@ -2116,18 +2156,20 @@ else if ((active1 & 0x40000000000L) != 0L)
             jjmatchedKind = 48;
             jjmatchedPos = 8;
          }
-         else if ((active1 & 0x40000000000L) != 0L)
+         else if ((active1 & 0x400000000000L) != 0L)
          {
-            jjmatchedKind = 106;
+            jjmatchedKind = 110;
             jjmatchedPos = 8;
          }
          break;
       case 104:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x100000L);
+      case 105:
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10010000L);
       case 108:
-         if ((active1 & 0x800000L) != 0L)
+         if ((active1 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 87;
+            jjmatchedKind = 89;
             jjmatchedPos = 8;
          }
          break;
@@ -2136,7 +2178,7 @@ else if ((active1 & 0x40000000000L) != 0L)
       case 110:
          return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x20L);
       case 111:
-         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x40000000000L);
       case 112:
          if ((active1 & 0x1L) != 0L)
          {
@@ -2152,9 +2194,9 @@ else if ((active1 & 0x40000000000L) != 0L)
          }
          break;
       case 115:
-         if ((active1 & 0x10000000000L) != 0L)
+         if ((active1 & 0x100000000000L) != 0L)
          {
-            jjmatchedKind = 104;
+            jjmatchedKind = 108;
             jjmatchedPos = 8;
          }
          break;
@@ -2182,7 +2224,7 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
       case 67:
          return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x20L);
       case 69:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x100000L);
       case 80:
          if ((active0 & 0x8000000000000000L) != 0L)
          {
@@ -2191,11 +2233,21 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
          }
          break;
       case 82:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x4000000000L);
+         if ((active1 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 80;
+            jjmatchedPos = 9;
+         }
+         else if ((active1 & 0x10000000L) != 0L)
+         {
+            jjmatchedKind = 92;
+            jjmatchedPos = 9;
+         }
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x40000000000L);
       case 99:
          return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x20L);
       case 101:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x80000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x100000L);
       case 112:
          if ((active0 & 0x8000000000000000L) != 0L)
          {
@@ -2204,7 +2256,17 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a
          }
          break;
       case 114:
-         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x4000000000L);
+         if ((active1 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 80;
+            jjmatchedPos = 9;
+         }
+         else if ((active1 & 0x10000000L) != 0L)
+         {
+            jjmatchedKind = 92;
+            jjmatchedPos = 9;
+         }
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x40000000000L);
       default :
          break;
    }
@@ -2222,20 +2284,20 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long
       case 65:
          return jjMoveStringLiteralDfa11_0(active1, 0x20L);
       case 83:
-         if ((active1 & 0x80000L) != 0L)
+         if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 84;
             jjmatchedPos = 10;
          }
          break;
       case 95:
-         return jjMoveStringLiteralDfa11_0(active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa11_0(active1, 0x40000000000L);
       case 97:
          return jjMoveStringLiteralDfa11_0(active1, 0x20L);
       case 115:
-         if ((active1 & 0x80000L) != 0L)
+         if ((active1 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 83;
+            jjmatchedKind = 84;
             jjmatchedPos = 10;
          }
          break;
@@ -2261,7 +2323,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1){
          }
          break;
       case 85:
-         return jjMoveStringLiteralDfa12_0(active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x40000000000L);
       case 116:
          if ((active1 & 0x20L) != 0L)
          {
@@ -2270,7 +2332,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1){
          }
          break;
       case 117:
-         return jjMoveStringLiteralDfa12_0(active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa12_0(active1, 0x40000000000L);
       default :
          break;
    }
@@ -2286,9 +2348,9 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1){
    switch(curChar)
    {
       case 82:
-         return jjMoveStringLiteralDfa13_0(active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x40000000000L);
       case 114:
-         return jjMoveStringLiteralDfa13_0(active1, 0x4000000000L);
+         return jjMoveStringLiteralDfa13_0(active1, 0x40000000000L);
       default :
          break;
    }
@@ -2304,16 +2366,16 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1){
    switch(curChar)
    {
       case 73:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 106;
             jjmatchedPos = 13;
          }
          break;
       case 105:
-         if ((active1 & 0x4000000000L) != 0L)
+         if ((active1 & 0x40000000000L) != 0L)
          {
-            jjmatchedKind = 102;
+            jjmatchedKind = 106;
             jjmatchedPos = 13;
          }
          break;
@@ -2368,7 +2430,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 253;
+   jjnewStateCnt = 256;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -2386,8 +2448,8 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 0:
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 149)
-                        kind = 149;
+                     if (kind > 153)
+                        kind = 153;
                      { jjCheckNAddStates(0, 6); }
                   }
                   else if (curChar == 45)
@@ -2395,7 +2457,7 @@ else if (curChar == 45)
                   else if (curChar == 43)
                      { jjCheckNAddStates(12, 16); }
                   else if (curChar == 46)
-                     { jjCheckNAddTwoStates(195, 207); }
+                     { jjCheckNAddTwoStates(198, 210); }
                   else if (curChar == 58)
                   {
                      if (kind > 10)
@@ -2405,9 +2467,9 @@ else if (curChar == 58)
                   else if (curChar == 40)
                      { jjCheckNAddStates(20, 22); }
                   else if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 117;
+                     jjstateSet[jjnewStateCnt++] = 120;
                   else if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 97;
+                     jjstateSet[jjnewStateCnt++] = 100;
                   else if (curChar == 36)
                      jjstateSet[jjnewStateCnt++] = 27;
                   else if (curChar == 60)
@@ -2540,64 +2602,63 @@ else if (curChar == 39)
                      break;
                   if (kind > 15)
                      kind = 15;
-                  { jjCheckNAddTwoStates(31, 32); }
+                  { jjCheckNAddStates(35, 37); }
                   break;
-               case 34:
-                  if (curChar == 35)
-                     { jjCheckNAddStates(35, 40); }
+               case 33:
+                  if (curChar != 45)
+                     break;
+                  if (kind > 15)
+                     kind = 15;
+                  jjstateSet[jjnewStateCnt++] = 34;
                   break;
                case 35:
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 37:
+                  if (curChar == 35)
+                     { jjCheckNAddStates(38, 43); }
+                  break;
+               case 38:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(35, 40); }
+                     { jjCheckNAddStates(38, 43); }
                   break;
-               case 36:
+               case 39:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(41, 43); }
+                     { jjCheckNAddStates(44, 46); }
                   break;
-               case 37:
+               case 40:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(41, 43); }
+                     { jjCheckNAddStates(44, 46); }
                   break;
-               case 42:
+               case 45:
                   if (curChar == 10)
-                     { jjCheckNAddStates(41, 43); }
+                     { jjCheckNAddStates(44, 46); }
                   break;
-               case 43:
+               case 46:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 42;
+                     jjstateSet[jjnewStateCnt++] = 45;
                   break;
-               case 50:
-                  if ((0x8400000000L & l) != 0L && kind > 161)
-                     kind = 161;
+               case 53:
+                  if ((0x8400000000L & l) != 0L && kind > 165)
+                     kind = 165;
                   break;
-               case 51:
+               case 54:
                   if (curChar == 39)
                      { jjCheckNAddStates(32, 34); }
                   break;
-               case 52:
+               case 55:
                   if ((0xffffff7fffffdbffL & l) != 0L)
                      { jjCheckNAddStates(32, 34); }
                   break;
-               case 53:
-                  if (curChar == 39 && kind > 165)
-                     kind = 165;
+               case 56:
+                  if (curChar == 39 && kind > 169)
+                     kind = 169;
                   break;
-               case 55:
+               case 58:
                   if ((0x8400000000L & l) != 0L)
                      { jjCheckNAddStates(32, 34); }
                   break;
-               case 57:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 58;
-                  break;
-               case 58:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 59;
-                  break;
-               case 59:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 60;
-                  break;
                case 60:
                   if ((0x3ff000000000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 61;
@@ -2616,35 +2677,35 @@ else if (curChar == 39)
                   break;
                case 64:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(32, 34); }
+                     jjstateSet[jjnewStateCnt++] = 65;
                   break;
                case 65:
-                  if (curChar == 34)
-                     { jjCheckNAddStates(29, 31); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 66;
                   break;
                case 66:
-                  if ((0xfffffffbffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(29, 31); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 67;
                   break;
                case 67:
-                  if (curChar == 34 && kind > 166)
-                     kind = 166;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(32, 34); }
                   break;
-               case 69:
-                  if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(29, 31); }
+               case 68:
+                  if (curChar == 34)
+                     { jjCheckNAddStates(29, 31); }
                   break;
-               case 71:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 72;
+               case 69:
+                  if ((0xfffffffbffffdbffL & l) != 0L)
+                     { jjCheckNAddStates(29, 31); }
                   break;
-               case 72:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 73;
+               case 70:
+                  if (curChar == 34 && kind > 170)
+                     kind = 170;
                   break;
-               case 73:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 74;
+               case 72:
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(29, 31); }
                   break;
                case 74:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2664,40 +2725,40 @@ else if (curChar == 39)
                   break;
                case 78:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(29, 31); }
+                     jjstateSet[jjnewStateCnt++] = 79;
                   break;
                case 79:
-                  if (curChar == 39)
-                     { jjCheckNAddStates(44, 47); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 80;
                   break;
                case 80:
-               case 83:
-                  if (curChar == 39)
-                     { jjCheckNAddTwoStates(81, 84); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 81;
                   break;
                case 81:
-                  if ((0xffffff7fffffffffL & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(29, 31); }
                   break;
                case 82:
                   if (curChar == 39)
-                     { jjAddStates(48, 49); }
+                     { jjCheckNAddStates(47, 50); }
                   break;
-               case 85:
-                  if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+               case 83:
+               case 86:
+                  if (curChar == 39)
+                     { jjCheckNAddTwoStates(84, 87); }
                   break;
-               case 87:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 88;
+               case 84:
+                  if ((0xffffff7fffffffffL & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
-               case 88:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 89;
+               case 85:
+                  if (curChar == 39)
+                     { jjAddStates(51, 52); }
                   break;
-               case 89:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 90;
+               case 88:
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
                case 90:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2717,56 +2778,56 @@ else if (curChar == 39)
                   break;
                case 94:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+                     jjstateSet[jjnewStateCnt++] = 95;
                   break;
                case 95:
-                  if (curChar == 39 && kind > 167)
-                     kind = 167;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 96;
                   break;
                case 96:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 95;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 97;
                   break;
                case 97:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 79;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
                case 98:
-                  if (curChar == 39)
-                     jjstateSet[jjnewStateCnt++] = 97;
+                  if (curChar == 39 && kind > 171)
+                     kind = 171;
                   break;
                case 99:
-                  if (curChar == 34)
-                     { jjCheckNAddStates(50, 53); }
+                  if (curChar == 39)
+                     jjstateSet[jjnewStateCnt++] = 98;
                   break;
                case 100:
-               case 103:
-                  if (curChar == 34)
-                     { jjCheckNAddTwoStates(101, 104); }
+                  if (curChar == 39)
+                     jjstateSet[jjnewStateCnt++] = 82;
                   break;
                case 101:
-                  if ((0xfffffffbffffffffL & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+                  if (curChar == 39)
+                     jjstateSet[jjnewStateCnt++] = 100;
                   break;
                case 102:
                   if (curChar == 34)
-                     { jjAddStates(54, 55); }
+                     { jjCheckNAddStates(53, 56); }
                   break;
-               case 105:
-                  if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+               case 103:
+               case 106:
+                  if (curChar == 34)
+                     { jjCheckNAddTwoStates(104, 107); }
                   break;
-               case 107:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 108;
+               case 104:
+                  if ((0xfffffffbffffffffL & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
                   break;
-               case 108:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 109;
+               case 105:
+                  if (curChar == 34)
+                     { jjAddStates(57, 58); }
                   break;
-               case 109:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 110;
+               case 108:
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
                   break;
                case 110:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -2786,251 +2847,248 @@ else if (curChar == 39)
                   break;
                case 114:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+                     jjstateSet[jjnewStateCnt++] = 115;
                   break;
                case 115:
-                  if (curChar == 34 && kind > 168)
-                     kind = 168;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 116;
                   break;
                case 116:
-                  if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 115;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
                case 117:
-                  if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 99;
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
                   break;
                case 118:
-                  if (curChar == 34)
-                     jjstateSet[jjnewStateCnt++] = 117;
+                  if (curChar == 34 && kind > 172)
+                     kind = 172;
                   break;
                case 119:
+                  if (curChar == 34)
+                     jjstateSet[jjnewStateCnt++] = 118;
+                  break;
+               case 120:
+                  if (curChar == 34)
+                     jjstateSet[jjnewStateCnt++] = 102;
+                  break;
+               case 121:
+                  if (curChar == 34)
+                     jjstateSet[jjnewStateCnt++] = 120;
+                  break;
+               case 122:
                   if (curChar == 40)
                      { jjCheckNAddStates(20, 22); }
                   break;
-               case 120:
+               case 123:
                   if (curChar == 35)
-                     { jjCheckNAddStates(56, 61); }
+                     { jjCheckNAddStates(59, 64); }
                   break;
-               case 121:
+               case 124:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(56, 61); }
+                     { jjCheckNAddStates(59, 64); }
                   break;
-               case 122:
+               case 125:
                   if ((0x2400L & l) != 0L)
                      { jjCheckNAddStates(20, 22); }
                   break;
-               case 123:
+               case 126:
                   if ((0x100003600L & l) != 0L)
                      { jjCheckNAddStates(20, 22); }
                   break;
-               case 124:
-                  if (curChar == 41 && kind > 171)
-                     kind = 171;
+               case 127:
+                  if (curChar == 41 && kind > 175)
+                     kind = 175;
                   break;
-               case 125:
+               case 128:
                   if (curChar == 10)
                      { jjCheckNAddStates(20, 22); }
                   break;
-               case 126:
+               case 129:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 125;
+                     jjstateSet[jjnewStateCnt++] = 128;
                   break;
-               case 128:
+               case 131:
                   if (curChar == 35)
-                     { jjCheckNAddStates(62, 67); }
+                     { jjCheckNAddStates(65, 70); }
                   break;
-               case 129:
+               case 132:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(62, 67); }
+                     { jjCheckNAddStates(65, 70); }
                   break;
-               case 130:
+               case 133:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(68, 70); }
+                     { jjCheckNAddStates(71, 73); }
                   break;
-               case 131:
+               case 134:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(68, 70); }
+                     { jjCheckNAddStates(71, 73); }
                   break;
-               case 133:
+               case 136:
                   if (curChar == 10)
-                     { jjCheckNAddStates(68, 70); }
+                     { jjCheckNAddStates(71, 73); }
                   break;
-               case 134:
+               case 137:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 133;
+                     jjstateSet[jjnewStateCnt++] = 136;
                   break;
-               case 136:
+               case 139:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(71, 72); }
+                     { jjAddStates(74, 75); }
                   break;
-               case 137:
+               case 140:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 138;
+                     jjstateSet[jjnewStateCnt++] = 141;
                   break;
-               case 138:
+               case 141:
                   if (curChar == 58 && kind > 10)
                      kind = 10;
                   break;
-               case 139:
+               case 142:
                   if ((0x3ff600000000000L & l) != 0L)
-                     { jjAddStates(73, 74); }
+                     { jjAddStates(76, 77); }
                   break;
-               case 140:
+               case 143:
                   if ((0x3ff200000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 141;
+                     jjstateSet[jjnewStateCnt++] = 144;
                   break;
-               case 141:
+               case 144:
                   if (curChar == 58)
                      { jjCheckNAddStates(17, 19); }
                   break;
-               case 142:
+               case 145:
                   if ((0x7ff000000000000L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 143:
+               case 146:
                   if ((0x7ff600000000000L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 144:
+               case 147:
                   if ((0x7ff200000000000L & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 146:
+               case 149:
                   if ((0xa800fffa00000000L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 147:
+               case 150:
                   if (curChar == 37)
-                     { jjAddStates(79, 80); }
+                     { jjAddStates(82, 83); }
                   break;
-               case 148:
+               case 151:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 149;
+                     jjstateSet[jjnewStateCnt++] = 152;
                   break;
-               case 149:
+               case 152:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 150:
+               case 153:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 151;
+                     jjstateSet[jjnewStateCnt++] = 154;
                   break;
-               case 151:
+               case 154:
                   if ((0x3ff000000000000L & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 152:
+               case 155:
                   if ((0xa800fffa00000000L & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 154:
+               case 157:
                   if ((0xa800fffa00000000L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 155:
+               case 158:
                   if (curChar == 37)
-                     jjstateSet[jjnewStateCnt++] = 156;
+                     jjstateSet[jjnewStateCnt++] = 159;
                   break;
-               case 156:
+               case 159:
                   if ((0x3ff000000000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 157;
+                     jjstateSet[jjnewStateCnt++] = 160;
                   break;
-               case 157:
+               case 160:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 158:
+               case 161:
                   if (curChar != 58)
                      break;
                   if (kind > 10)
                      kind = 10;
                   { jjCheckNAddStates(17, 19); }
                   break;
-               case 161:
+               case 164:
                   if (curChar == 35)
-                     { jjCheckNAddStates(81, 86); }
+                     { jjCheckNAddStates(84, 89); }
                   break;
-               case 162:
+               case 165:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(81, 86); }
+                     { jjCheckNAddStates(84, 89); }
                   break;
-               case 163:
+               case 166:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(87, 89); }
+                     { jjCheckNAddStates(90, 92); }
                   break;
-               case 164:
+               case 167:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(87, 89); }
+                     { jjCheckNAddStates(90, 92); }
                   break;
-               case 169:
+               case 172:
                   if (curChar == 10)
-                     { jjCheckNAddStates(87, 89); }
+                     { jjCheckNAddStates(90, 92); }
                   break;
-               case 170:
+               case 173:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 169;
+                     jjstateSet[jjnewStateCnt++] = 172;
                   break;
-               case 176:
+               case 179:
                   if (curChar == 35)
-                     { jjCheckNAddStates(90, 95); }
+                     { jjCheckNAddStates(93, 98); }
                   break;
-               case 177:
+               case 180:
                   if ((0xffffffffffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(90, 95); }
+                     { jjCheckNAddStates(93, 98); }
                   break;
-               case 178:
+               case 181:
                   if ((0x2400L & l) != 0L)
-                     { jjCheckNAddStates(96, 98); }
+                     { jjCheckNAddStates(99, 101); }
                   break;
-               case 179:
+               case 182:
                   if ((0x100003600L & l) != 0L)
-                     { jjCheckNAddStates(96, 98); }
+                     { jjCheckNAddStates(99, 101); }
                   break;
-               case 185:
+               case 188:
                   if (curChar == 10)
-                     { jjCheckNAddStates(96, 98); }
+                     { jjCheckNAddStates(99, 101); }
                   break;
-               case 186:
+               case 189:
                   if (curChar == 13)
-                     jjstateSet[jjnewStateCnt++] = 185;
+                     jjstateSet[jjnewStateCnt++] = 188;
                   break;
-               case 191:
+               case 194:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 149)
-                     kind = 149;
+                  if (kind > 153)
+                     kind = 153;
                   { jjCheckNAddStates(0, 6); }
                   break;
-               case 192:
-                  if ((0x3ff000000000000L & l) == 0L)
-                     break;
-                  if (kind > 149)
-                     kind = 149;
-                  { jjCheckNAdd(192); }
-                  break;
-               case 193:
-                  if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(193, 194); }
-                  break;
-               case 194:
-                  if (curChar == 46)
-                     { jjCheckNAdd(195); }
-                  break;
                case 195:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 150)
-                     kind = 150;
+                  if (kind > 153)
+                     kind = 153;
                   { jjCheckNAdd(195); }
                   break;
                case 196:
@@ -3039,230 +3097,245 @@ else if (curChar == 39)
                   break;
                case 197:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(198, 199); }
+                     { jjCheckNAdd(198); }
                   break;
                case 198:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 154)
+                     kind = 154;
+                  { jjCheckNAdd(198); }
+                  break;
+               case 199:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(198, 199); }
+                     { jjCheckNAddTwoStates(199, 200); }
                   break;
                case 200:
-                  if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(201); }
+                  if (curChar == 46)
+                     { jjCheckNAddTwoStates(201, 202); }
                   break;
                case 201:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(201, 202); }
+                  break;
+               case 203:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(204); }
+                  break;
+               case 204:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 151)
-                     kind = 151;
-                  { jjCheckNAdd(201); }
+                  if (kind > 155)
+                     kind = 155;
+                  { jjCheckNAdd(204); }
                   break;
-               case 202:
+               case 205:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(202, 203); }
+                     { jjCheckNAddTwoStates(205, 206); }
                   break;
-               case 204:
+               case 207:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(205); }
+                     { jjCheckNAdd(208); }
                   break;
-               case 205:
+               case 208:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 151)
-                     kind = 151;
-                  { jjCheckNAdd(205); }
+                  if (kind > 155)
+                     kind = 155;
+                  { jjCheckNAdd(208); }
                   break;
-               case 206:
+               case 209:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(195, 207); }
+                     { jjCheckNAddTwoStates(198, 210); }
                   break;
-               case 207:
+               case 210:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(207, 208); }
+                     { jjCheckNAddTwoStates(210, 211); }
                   break;
-               case 209:
+               case 212:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(210); }
+                     { jjCheckNAdd(213); }
                   break;
-               case 210:
+               case 213:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 151)
-                     kind = 151;
-                  { jjCheckNAdd(210); }
+                  if (kind > 155)
+                     kind = 155;
+                  { jjCheckNAdd(213); }
                   break;
-               case 211:
+               case 214:
                   if (curChar == 43)
                      { jjCheckNAddStates(12, 16); }
                   break;
-               case 212:
+               case 215:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 152)
-                     kind = 152;
-                  { jjCheckNAdd(212); }
+                  if (kind > 156)
+                     kind = 156;
+                  { jjCheckNAdd(215); }
                   break;
-               case 213:
+               case 216:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(213, 214); }
+                     { jjCheckNAddTwoStates(216, 217); }
                   break;
-               case 214:
+               case 217:
                   if (curChar == 46)
-                     { jjCheckNAdd(215); }
+                     { jjCheckNAdd(218); }
                   break;
-               case 215:
+               case 218:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 153)
-                     kind = 153;
-                  { jjCheckNAdd(215); }
+                  if (kind > 157)
+                     kind = 157;
+                  { jjCheckNAdd(218); }
                   break;
-               case 216:
+               case 219:
                   if (curChar == 46)
-                     { jjCheckNAdd(217); }
+                     { jjCheckNAdd(220); }
                   break;
-               case 217:
+               case 220:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(217, 218); }
+                     { jjCheckNAddTwoStates(220, 221); }
                   break;
-               case 219:
+               case 222:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(220); }
+                     { jjCheckNAdd(223); }
                   break;
-               case 220:
+               case 223:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 154)
-                     kind = 154;
-                  { jjCheckNAdd(220); }
+                  if (kind > 158)
+                     kind = 158;
+                  { jjCheckNAdd(223); }
                   break;
-               case 221:
+               case 224:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(99, 102); }
+                     { jjCheckNAddStates(102, 105); }
                   break;
-               case 222:
+               case 225:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(222, 223); }
+                     { jjCheckNAddTwoStates(225, 226); }
                   break;
-               case 223:
+               case 226:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(224, 225); }
+                     { jjCheckNAddTwoStates(227, 228); }
                   break;
-               case 224:
+               case 227:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(224, 225); }
+                     { jjCheckNAddTwoStates(227, 228); }
                   break;
-               case 226:
+               case 229:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(227); }
+                     { jjCheckNAdd(230); }
                   break;
-               case 227:
+               case 230:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 154)
-                     kind = 154;
-                  { jjCheckNAdd(227); }
+                  if (kind > 158)
+                     kind = 158;
+                  { jjCheckNAdd(230); }
                   break;
-               case 228:
+               case 231:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(228, 229); }
+                     { jjCheckNAddTwoStates(231, 232); }
                   break;
-               case 230:
+               case 233:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(231); }
+                     { jjCheckNAdd(234); }
                   break;
-               case 231:
+               case 234:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 154)
-                     kind = 154;
-                  { jjCheckNAdd(231); }
+                  if (kind > 158)
+                     kind = 158;
+                  { jjCheckNAdd(234); }
                   break;
-               case 232:
+               case 235:
                   if (curChar == 45)
                      { jjCheckNAddStates(7, 11); }
                   break;
-               case 233:
+               case 236:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 155)
-                     kind = 155;
-                  { jjCheckNAdd(233); }
+                  if (kind > 159)
+                     kind = 159;
+                  { jjCheckNAdd(236); }
                   break;
-               case 234:
+               case 237:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(234, 235); }
+                     { jjCheckNAddTwoStates(237, 238); }
                   break;
-               case 235:
+               case 238:
                   if (curChar == 46)
-                     { jjCheckNAdd(236); }
+                     { jjCheckNAdd(239); }
                   break;
-               case 236:
+               case 239:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 156)
-                     kind = 156;
-                  { jjCheckNAdd(236); }
+                  if (kind > 160)
+                     kind = 160;
+                  { jjCheckNAdd(239); }
                   break;
-               case 237:
+               case 240:
                   if (curChar == 46)
-                     { jjCheckNAdd(238); }
+                     { jjCheckNAdd(241); }
                   break;
-               case 238:
+               case 241:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(238, 239); }
+                     { jjCheckNAddTwoStates(241, 242); }
                   break;
-               case 240:
+               case 243:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(241); }
+                     { jjCheckNAdd(244); }
                   break;
-               case 241:
+               case 244:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 157)
-                     kind = 157;
-                  { jjCheckNAdd(241); }
+                  if (kind > 161)
+                     kind = 161;
+                  { jjCheckNAdd(244); }
                   break;
-               case 242:
+               case 245:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(103, 106); }
+                     { jjCheckNAddStates(106, 109); }
                   break;
-               case 243:
+               case 246:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(243, 244); }
+                     { jjCheckNAddTwoStates(246, 247); }
                   break;
-               case 244:
+               case 247:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(245, 246); }
+                     { jjCheckNAddTwoStates(248, 249); }
                   break;
-               case 245:
+               case 248:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(245, 246); }
+                     { jjCheckNAddTwoStates(248, 249); }
                   break;
-               case 247:
+               case 250:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(248); }
+                     { jjCheckNAdd(251); }
                   break;
-               case 248:
+               case 251:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 157)
-                     kind = 157;
-                  { jjCheckNAdd(248); }
+                  if (kind > 161)
+                     kind = 161;
+                  { jjCheckNAdd(251); }
                   break;
-               case 249:
+               case 252:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(249, 250); }
+                     { jjCheckNAddTwoStates(252, 253); }
                   break;
-               case 251:
+               case 254:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(252); }
+                     { jjCheckNAdd(255); }
                   break;
-               case 252:
+               case 255:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 157)
-                     kind = 157;
-                  { jjCheckNAdd(252); }
+                  if (kind > 161)
+                     kind = 161;
+                  { jjCheckNAdd(255); }
                   break;
                default : break;
             }
@@ -3277,19 +3350,19 @@ else if (curChar < 128)
             {
                case 0:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(107, 112); }
+                     { jjCheckNAddStates(110, 115); }
                   else if (curChar == 91)
-                     { jjCheckNAddStates(68, 70); }
+                     { jjCheckNAddStates(71, 73); }
                   else if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 50;
+                     jjstateSet[jjnewStateCnt++] = 53;
                   else if (curChar == 64)
                      { jjCheckNAdd(30); }
                   else if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 18;
                   if ((0x1000000010L & l) != 0L)
-                     { jjAddStates(113, 114); }
+                     { jjAddStates(116, 117); }
                   else if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 47;
+                     jjstateSet[jjnewStateCnt++] = 50;
                   break;
                case 1:
                   if (kind > 6)
@@ -3384,92 +3457,87 @@ else if ((0x20000000200L & l) != 0L)
                      break;
                   if (kind > 15)
                      kind = 15;
-                  { jjCheckNAddTwoStates(30, 31); }
+                  { jjCheckNAddStates(118, 120); }
                   break;
                case 32:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
                   if (kind > 15)
                      kind = 15;
-                  { jjCheckNAddTwoStates(31, 32); }
+                  { jjCheckNAddStates(35, 37); }
                   break;
-               case 33:
-                  if ((0x10000000100000L & l) != 0L)
-                     { jjCheckNAddStates(41, 43); }
+               case 34:
+                  if ((0x7fffffe07fffffeL & l) == 0L)
+                     break;
+                  if (kind > 15)
+                     kind = 15;
+                  jjstateSet[jjnewStateCnt++] = 34;
                   break;
-               case 35:
-                  { jjCheckNAddStates(35, 40); }
+               case 36:
+                  if ((0x10000000100000L & l) != 0L)
+                     { jjCheckNAddStates(44, 46); }
                   break;
                case 38:
-                  if ((0x200000002L & l) != 0L && kind > 130)
-                     kind = 130;
+                  { jjCheckNAddStates(38, 43); }
                   break;
-               case 39:
+               case 41:
+                  if ((0x200000002L & l) != 0L && kind > 134)
+                     kind = 134;
+                  break;
+               case 42:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 38;
+                     jjstateSet[jjnewStateCnt++] = 41;
                   break;
-               case 40:
+               case 43:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 39;
+                     jjstateSet[jjnewStateCnt++] = 42;
                   break;
-               case 41:
+               case 44:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 40;
+                     jjstateSet[jjnewStateCnt++] = 43;
                   break;
-               case 44:
+               case 47:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 33;
+                     jjstateSet[jjnewStateCnt++] = 36;
                   break;
-               case 45:
+               case 48:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 44;
+                     jjstateSet[jjnewStateCnt++] = 47;
                   break;
-               case 46:
+               case 49:
                   if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 45;
+                     jjstateSet[jjnewStateCnt++] = 48;
                   break;
-               case 47:
+               case 50:
                   if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 46;
+                     jjstateSet[jjnewStateCnt++] = 49;
                   break;
-               case 48:
+               case 51:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 47;
-                  break;
-               case 49:
-                  if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 50;
                   break;
-               case 50:
-                  if ((0x14404410000000L & l) != 0L && kind > 161)
-                     kind = 161;
-                  break;
                case 52:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(32, 34); }
-                  break;
-               case 54:
                   if (curChar == 92)
-                     { jjAddStates(115, 116); }
+                     jjstateSet[jjnewStateCnt++] = 53;
+                  break;
+               case 53:
+                  if ((0x14404410000000L & l) != 0L && kind > 165)
+                     kind = 165;
                   break;
                case 55:
-                  if ((0x14404410000000L & l) != 0L)
+                  if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(32, 34); }
                   break;
-               case 56:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 57;
-                  break;
                case 57:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 58;
+                  if (curChar == 92)
+                     { jjAddStates(121, 122); }
                   break;
                case 58:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 59;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(32, 34); }
                   break;
                case 59:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 60;
                   break;
                case 60:
@@ -3486,38 +3554,38 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 63:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 64;
+                     jjstateSet[jjnewStateCnt++] = 64;
+                  break;
+               case 64:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 65;
+                  break;
+               case 65:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 66;
+                  break;
+               case 66:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 67;
                   break;
-               case 64:
+               case 67:
                   if ((0x7e0000007eL & l) != 0L)
                      { jjCheckNAddStates(32, 34); }
                   break;
-               case 66:
+               case 69:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(29, 31); }
                   break;
-               case 68:
+               case 71:
                   if (curChar == 92)
-                     { jjAddStates(117, 118); }
+                     { jjAddStates(123, 124); }
                   break;
-               case 69:
+               case 72:
                   if ((0x14404410000000L & l) != 0L)
                      { jjCheckNAddStates(29, 31); }
                   break;
-               case 70:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 71;
-                  break;
-               case 71:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 72;
-                  break;
-               case 72:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 73;
-                  break;
                case 73:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 74;
                   break;
                case 74:
@@ -3538,34 +3606,34 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 78:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(29, 31); }
+                     jjstateSet[jjnewStateCnt++] = 79;
                   break;
-               case 81:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+               case 79:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 80;
                   break;
-               case 84:
-                  if (curChar == 92)
-                     { jjAddStates(119, 120); }
+               case 80:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 81;
                   break;
-               case 85:
-                  if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+               case 81:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(29, 31); }
                   break;
-               case 86:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 87;
+               case 84:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
                case 87:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 88;
+                  if (curChar == 92)
+                     { jjAddStates(125, 126); }
                   break;
                case 88:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 89;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
                case 89:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 90;
                   break;
                case 90:
@@ -3586,34 +3654,34 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 94:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(44, 47); }
+                     jjstateSet[jjnewStateCnt++] = 95;
                   break;
-               case 101:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+               case 95:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 96;
                   break;
-               case 104:
-                  if (curChar == 92)
-                     { jjAddStates(121, 122); }
+               case 96:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 97;
                   break;
-               case 105:
-                  if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+               case 97:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(47, 50); }
                   break;
-               case 106:
-                  if (curChar == 85)
-                     jjstateSet[jjnewStateCnt++] = 107;
+               case 104:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
                   break;
                case 107:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 108;
+                  if (curChar == 92)
+                     { jjAddStates(127, 128); }
                   break;
                case 108:
-                  if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 109;
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
                   break;
                case 109:
-                  if ((0x7e0000007eL & l) != 0L)
+                  if (curChar == 85)
                      jjstateSet[jjnewStateCnt++] = 110;
                   break;
                case 110:
@@ -3634,33 +3702,37 @@ else if ((0x20000000200L & l) != 0L)
                   break;
                case 114:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(50, 53); }
+                     jjstateSet[jjnewStateCnt++] = 115;
                   break;
-               case 121:
-                  { jjAddStates(56, 61); }
+               case 115:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 116;
                   break;
-               case 127:
-                  if (curChar == 91)
-                     { jjCheckNAddStates(68, 70); }
+               case 116:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
-               case 129:
-                  { jjCheckNAddStates(62, 67); }
+               case 117:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(53, 56); }
+                  break;
+               case 124:
+                  { jjAddStates(59, 64); }
+                  break;
+               case 130:
+                  if (curChar == 91)
+                     { jjCheckNAddStates(71, 73); }
                   break;
                case 132:
-                  if (curChar == 93 && kind > 176)
-                     kind = 176;
+                  { jjCheckNAddStates(65, 70); }
                   break;
                case 135:
-                  if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(107, 112); }
-                  break;
-               case 136:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddTwoStates(136, 137); }
+                  if (curChar == 93 && kind > 180)
+                     kind = 180;
                   break;
-               case 137:
-                  if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAdd(138); }
+               case 138:
+                  if ((0x7fffffe07fffffeL & l) != 0L)
+                     { jjCheckNAddStates(110, 115); }
                   break;
                case 139:
                   if ((0x7fffffe87fffffeL & l) != 0L)
@@ -3671,192 +3743,200 @@ else if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(141); }
                   break;
                case 142:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     { jjCheckNAddTwoStates(142, 143); }
+                  break;
+               case 143:
+                  if ((0x7fffffe87fffffeL & l) != 0L)
+                     { jjCheckNAdd(144); }
+                  break;
+               case 145:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 143:
+               case 146:
                   if ((0x7fffffe87fffffeL & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 144:
+               case 147:
                   if ((0x7fffffe87fffffeL & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 145:
+               case 148:
                   if (curChar == 92)
-                     { jjAddStates(123, 124); }
+                     { jjAddStates(129, 130); }
                   break;
-               case 146:
+               case 149:
                   if ((0x4000000080000001L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 148:
+               case 151:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 149;
+                     jjstateSet[jjnewStateCnt++] = 152;
                   break;
-               case 149:
+               case 152:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 150:
+               case 153:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 151;
+                     jjstateSet[jjnewStateCnt++] = 154;
                   break;
-               case 151:
+               case 154:
                   if ((0x7e0000007eL & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 152:
+               case 155:
                   if ((0x4000000080000001L & l) != 0L && kind > 11)
                      kind = 11;
                   break;
-               case 153:
+               case 156:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 154;
+                     jjstateSet[jjnewStateCnt++] = 157;
                   break;
-               case 154:
+               case 157:
                   if ((0x4000000080000001L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 156:
+               case 159:
                   if ((0x7e0000007eL & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 157;
+                     jjstateSet[jjnewStateCnt++] = 160;
                   break;
-               case 157:
+               case 160:
                   if ((0x7e0000007eL & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 159:
+               case 162:
                   if ((0x1000000010L & l) != 0L)
-                     { jjAddStates(113, 114); }
+                     { jjAddStates(116, 117); }
                   break;
-               case 160:
+               case 163:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAddStates(87, 89); }
-                  break;
-               case 162:
-                  { jjCheckNAddStates(81, 86); }
+                     { jjCheckNAddStates(90, 92); }
                   break;
                case 165:
-                  if ((0x200000002L & l) != 0L && kind > 131)
-                     kind = 131;
+                  { jjCheckNAddStates(84, 89); }
                   break;
-               case 166:
+               case 168:
+                  if ((0x200000002L & l) != 0L && kind > 135)
+                     kind = 135;
+                  break;
+               case 169:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 165;
+                     jjstateSet[jjnewStateCnt++] = 168;
                   break;
-               case 167:
+               case 170:
                   if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 166;
+                     jjstateSet[jjnewStateCnt++] = 169;
                   break;
-               case 168:
+               case 171:
                   if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 167;
+                     jjstateSet[jjnewStateCnt++] = 170;
                   break;
-               case 171:
+               case 174:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 160;
+                     jjstateSet[jjnewStateCnt++] = 163;
                   break;
-               case 172:
+               case 175:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 171;
+                     jjstateSet[jjnewStateCnt++] = 174;
                   break;
-               case 173:
+               case 176:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 172;
+                     jjstateSet[jjnewStateCnt++] = 175;
                   break;
-               case 174:
+               case 177:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 173;
+                     jjstateSet[jjnewStateCnt++] = 176;
                   break;
-               case 175:
+               case 178:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAddStates(96, 98); }
-                  break;
-               case 177:
-                  { jjCheckNAddStates(90, 95); }
+                     { jjCheckNAddStates(99, 101); }
                   break;
                case 180:
-                  if ((0x2000000020L & l) != 0L && kind > 132)
-                     kind = 132;
+                  { jjCheckNAddStates(93, 98); }
                   break;
-               case 181:
+               case 183:
+                  if ((0x2000000020L & l) != 0L && kind > 136)
+                     kind = 136;
+                  break;
+               case 184:
                   if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 180;
+                     jjstateSet[jjnewStateCnt++] = 183;
                   break;
-               case 182:
+               case 185:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 181;
+                     jjstateSet[jjnewStateCnt++] = 184;
                   break;
-               case 183:
+               case 186:
                   if ((0x10000000100L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 182;
+                     jjstateSet[jjnewStateCnt++] = 185;
                   break;
-               case 184:
+               case 187:
                   if ((0x80000000800000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 183;
+                     jjstateSet[jjnewStateCnt++] = 186;
                   break;
-               case 187:
+               case 190:
                   if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 175;
+                     jjstateSet[jjnewStateCnt++] = 178;
                   break;
-               case 188:
+               case 191:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 187;
+                     jjstateSet[jjnewStateCnt++] = 190;
                   break;
-               case 189:
+               case 192:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 188;
-                  break;
-               case 190:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 189;
-                  break;
-               case 199:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(125, 126); }
-                  break;
-               case 203:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(127, 128); }
+                     jjstateSet[jjnewStateCnt++] = 191;
                   break;
-               case 208:
+               case 193:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(129, 130); }
+                     jjstateSet[jjnewStateCnt++] = 192;
                   break;
-               case 218:
+               case 202:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(131, 132); }
                   break;
-               case 225:
+               case 206:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(133, 134); }
                   break;
-               case 229:
+               case 211:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(135, 136); }
                   break;
-               case 239:
+               case 221:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(137, 138); }
                   break;
-               case 246:
+               case 228:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(139, 140); }
                   break;
-               case 250:
+               case 232:
                   if ((0x2000000020L & l) != 0L)
                      { jjAddStates(141, 142); }
                   break;
+               case 242:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(143, 144); }
+                  break;
+               case 249:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(145, 146); }
+                  break;
+               case 253:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(147, 148); }
+                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -3874,7 +3954,7 @@ else if ((0x20000000200L & l) != 0L)
             {
                case 0:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(107, 112); }
+                     { jjCheckNAddStates(110, 115); }
                   break;
                case 1:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -3930,41 +4010,33 @@ else if ((0x20000000200L & l) != 0L)
                      kind = 14;
                   { jjCheckNAdd(28); }
                   break;
-               case 35:
+               case 38:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(35, 40); }
+                     { jjAddStates(38, 43); }
                   break;
-               case 52:
+               case 55:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjAddStates(32, 34); }
                   break;
-               case 66:
+               case 69:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjAddStates(29, 31); }
                   break;
-               case 81:
+               case 84:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(44, 47); }
+                     { jjAddStates(47, 50); }
                   break;
-               case 101:
+               case 104:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(50, 53); }
+                     { jjAddStates(53, 56); }
                   break;
-               case 121:
+               case 124:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(56, 61); }
+                     { jjAddStates(59, 64); }
                   break;
-               case 129:
+               case 132:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(62, 67); }
-                  break;
-               case 136:
-                  if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddTwoStates(136, 137); }
-                  break;
-               case 137:
-                  if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAdd(138); }
+                     { jjAddStates(65, 70); }
                   break;
                case 139:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
@@ -3975,27 +4047,35 @@ else if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(141); }
                   break;
                case 142:
+                  if (jjCanMove_2(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddTwoStates(142, 143); }
+                  break;
+               case 143:
+                  if (jjCanMove_2(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAdd(144); }
+                  break;
+               case 145:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(75, 78); }
+                  { jjCheckNAddStates(78, 81); }
                   break;
-               case 143:
+               case 146:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(78, 81); }
                   break;
-               case 144:
+               case 147:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2) && kind > 11)
                      kind = 11;
                   break;
-               case 162:
+               case 165:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(81, 86); }
+                     { jjAddStates(84, 89); }
                   break;
-               case 177:
+               case 180:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(90, 95); }
+                     { jjAddStates(93, 98); }
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -4008,7 +4088,7 @@ else if ((0x20000000200L & l) != 0L)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 253 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 256 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -4048,11 +4128,12 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, "\50", "\51", null, "\173", "\175", "\133", "\135", null, "\73", "\54", 
-"\56", "\75", "\41\75", "\76", "\74", "\74\75", "\76\75", "\76\76", "\74\74", 
-"\173\174", "\174\175", "\41", "\176", "\72", "\174\174", "\46\46", "\53", "\55", "\52", 
-"\57", "\136\136", "\100", "\174", "\136", "\55\76", "\74\55", "\77", null, null, 
-null, null, null, null, null, null, null, null, null, };
+null, null, null, null, null, null, "\50", "\51", null, "\173", "\175", "\133", 
+"\135", null, "\73", "\54", "\56", "\75", "\41\75", "\76", "\74", "\74\75", "\76\75", 
+"\74\74\50", "\51\76\76", "\74\74", "\76\76", "\173\174", "\174\175", "\176", "\41", "\72", 
+"\174\174", "\46\46", "\53", "\55", "\52", "\57", "\136\136", "\100", "\174", "\136", 
+"\55\76", "\74\55", "\77", null, null, null, null, null, null, null, null, null, null, 
+null, };
 protected Token jjFillToken()
 {
    final Token t;
@@ -4077,15 +4158,16 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   192, 193, 194, 196, 197, 202, 203, 233, 234, 235, 237, 242, 212, 213, 214, 216, 
-   221, 142, 153, 155, 120, 123, 124, 6, 7, 17, 1, 2, 4, 66, 67, 68, 
-   52, 53, 54, 34, 35, 36, 43, 37, 41, 34, 37, 41, 80, 81, 82, 84, 
-   83, 96, 100, 101, 102, 104, 103, 116, 120, 121, 122, 126, 123, 124, 128, 129, 
-   130, 134, 131, 132, 128, 131, 132, 136, 137, 139, 140, 143, 144, 145, 147, 148, 
-   150, 161, 162, 163, 170, 164, 168, 161, 164, 168, 176, 177, 178, 186, 179, 184, 
-   176, 179, 184, 222, 223, 228, 229, 243, 244, 249, 250, 136, 137, 138, 139, 140, 
-   141, 174, 190, 55, 56, 69, 70, 85, 86, 105, 106, 146, 152, 200, 201, 204, 
-   205, 209, 210, 219, 220, 226, 227, 230, 231, 240, 241, 247, 248, 251, 252, 
+   195, 196, 197, 199, 200, 205, 206, 236, 237, 238, 240, 245, 215, 216, 217, 219, 
+   224, 145, 156, 158, 123, 126, 127, 6, 7, 17, 1, 2, 4, 69, 70, 71, 
+   55, 56, 57, 31, 32, 35, 37, 38, 39, 46, 40, 44, 37, 40, 44, 83, 
+   84, 85, 87, 86, 99, 103, 104, 105, 107, 106, 119, 123, 124, 125, 129, 126, 
+   127, 131, 132, 133, 137, 134, 135, 131, 134, 135, 139, 140, 142, 143, 146, 147, 
+   148, 150, 151, 153, 164, 165, 166, 173, 167, 171, 164, 167, 171, 179, 180, 181, 
+   189, 182, 187, 179, 182, 187, 225, 226, 231, 232, 246, 247, 252, 253, 139, 140, 
+   141, 142, 143, 144, 177, 193, 30, 31, 35, 58, 59, 72, 73, 88, 89, 108, 
+   109, 149, 155, 203, 204, 207, 208, 212, 213, 222, 223, 229, 230, 233, 234, 243, 
+   244, 250, 251, 254, 255, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -4315,7 +4397,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 253; i-- > 0;)
+    for (i = 256; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -4352,10 +4434,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfffffffffffcfe01L, 0xffffffffffffffffL, 0xffffffe23fefffffL, 0x3fffL, 
+   0xfffffffffffcfe01L, 0xffffffffffffffffL, 0xfffffe23feffffffL, 0xfffffL, 
 };
 static final long[] jjtoSkip = {
    0x7eL, 0x0L, 0x0L, 0x0L, 
@@ -4368,8 +4450,8 @@ public void SwitchTo(int lexState)
 };
     protected JavaCharStream  input_stream;
 
-    private final int[] jjrounds = new int[253];
-    private final int[] jjstateSet = new int[2 * 253];
+    private final int[] jjrounds = new int[256];
+    private final int[] jjstateSet = new int[2 * 256];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
index 3330616debb..b18a48fd9f2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetCompare.java
@@ -349,7 +349,7 @@ public boolean equal(Node n1, Node n2) {
             if ( n1.isVariable() && n2.isVariable() )
                 return mapping.makeIsomorphic(n1, n2);
 
-            if ( n1.isNodeTriple() && n2.isNodeTriple() ) {
+            if ( n1.isTripleTerm() && n2.isTripleTerm() ) {
                 Triple t1 = n1.getTriple();
                 Triple t2 = n2.getTriple();
                 return  Iso.tripleIso(t1, t2, mapping);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java
index 319adb2e181..96b3481e0a3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java
@@ -32,9 +32,9 @@
 import org.apache.jena.sparql.engine.binding.Binding ;
 import org.apache.jena.sparql.engine.binding.BindingFactory;
 
-/** A result set held in-memory. rewindable.
+/**
+ * A result set held in-memory. rewindable.
  */
-
 public class ResultSetMem implements ResultSetRewindable, ResultSetPeekable
 {
     protected List<Binding> rows = new ArrayList<>();
@@ -60,7 +60,6 @@ public ResultSetMem(ResultSetMem imrs2) {
      * @param takeCopy
      *            Should we copy the rows?
      */
-
     public ResultSetMem(ResultSetMem imrs2, boolean takeCopy) {
         varNames = imrs2.varNames;
         if ( takeCopy )
@@ -77,7 +76,6 @@ public ResultSetMem(ResultSetMem imrs2, boolean takeCopy) {
      * necessary internal datastructures are shared. This operation destroys
      * (uses up) a ResultSet object that is not an in-memory one.
      */
-
     public ResultSetMem(ResultSet qr) {
         model = qr.getResourceModel();
         if ( qr instanceof ResultSetMem ) {
@@ -95,29 +93,6 @@ public ResultSetMem(ResultSet qr) {
         reset();
     }
 
-    /**
-     * Create an in-memory result set from an array of ResulSets. It is assumed
-     * that all the ResultSets from the array have the same variables.
-     *
-     * @param sets
-     *            the ResultSet objects to concatenate.
-     */
-
-    public ResultSetMem(ResultSet... sets) {
-        varNames = sets[0].getResultVars();
-
-        for ( ResultSet rs : sets ) {
-            if ( !varNames.equals(rs.getResultVars()) )
-                throw new ResultSetException("ResultSet must have the same variables.");
-            if ( rs instanceof ResultSetMem )
-                rows.addAll(((ResultSetMem)rs).rows);
-            else
-                while (rs.hasNext())
-                    rows.add(rs.nextBinding());
-        }
-        reset();
-    }
-
     public ResultSetMem() {
         this.varNames = new ArrayList<>();
         reset();
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java
index fddb3a2dc3e..082e0f8ff89 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterBase.java
@@ -17,45 +17,39 @@
  */
 
 package org.apache.jena.sparql.serializer;
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.Triple ;
-import org.apache.jena.sparql.core.BasicPattern ;
-import org.apache.jena.sparql.util.FmtUtils ;
-
-public abstract class FormatterBase
-{
-    protected IndentedWriter out ;
-    protected SerializationContext context ;
-    protected FormatterBase(IndentedWriter _out, SerializationContext _context)
-    {
-        out = _out ;
-        context = _context ; 
-    }
-    
-    public void startVisit()  {}
-    public void finishVisit() { out.flush() ; }
-    
-    // Utilities
-    
-    protected void formatTriples(BasicPattern pattern)
-    {
-        FmtUtils.formatPattern(out, pattern, context) ;
+
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.core.BasicPattern;
+import org.apache.jena.sparql.util.FmtUtils;
+
+public abstract class FormatterBase {
+    protected IndentedWriter out;
+    protected SerializationContext context;
+    protected FormatterBase(IndentedWriter _out, SerializationContext _context) {
+        out = _out;
+        context = _context;
     }
-    
-    protected void formatTriple(Triple tp)
-    {
-        out.print(slotToString(tp.getSubject())) ;
-        out.print(" ") ;
-        out.print(slotToString(tp.getPredicate())) ;
-        out.print(" ") ;
-        out.print(slotToString(tp.getObject())) ;
+
+    public void startVisit() {}
+
+    public void finishVisit() { out.flush(); }
+
+    protected void formatTriples(BasicPattern pattern) {
+        FmtUtils.formatPattern(out, pattern, context);
     }
-    
-    protected String slotToString(Node n)
-    {
-        return FmtUtils.stringForNode(n, context) ;
+
+    protected void formatTriple(Triple tp) {
+        out.print(slotToString(tp.getSubject()));
+        out.print(" ");
+        out.print(slotToString(tp.getPredicate()));
+        out.print(" ");
+        out.print(slotToString(tp.getObject()));
     }
 
+    protected String slotToString(Node n) {
+        return FmtUtils.stringForNode(n, context);
+    }
 
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
index 30fd057b21b..8121ae553c7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
@@ -362,6 +362,24 @@ public void visit(ElementLateral el) {
         out.decIndent(INDENT);
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        out.print("SEMIJOIN");
+        out.incIndent(INDENT);
+        out.newline();
+        visitAsGroup(el.getSubElement());
+        out.decIndent(INDENT);
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        out.print("ANTIJOIN");
+        out.incIndent(INDENT);
+        out.newline();
+        visitAsGroup(el.getSubElement());
+        out.decIndent(INDENT);
+    }
+
     @Override
     public void visit(ElementNamedGraph el) {
         visitNodePattern("GRAPH", el.getGraphNameNode(), el.getElement());
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemLift.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemLift.java
index 548e62d2b2e..88204971924 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemLift.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemLift.java
@@ -64,7 +64,7 @@ public static Item liftCompound(Item item) {
 
     /** Reverse lift. */
     public static Item lowerCompound(Node node) {
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Item newItem = ItemLift.lowerCompound(node, -1, -1);
             return newItem;
         }
@@ -79,13 +79,13 @@ public static Item lowerCompound(Item item) {
     }
 
     private static Item lowerCompound(Node node, int line, int column) {
-        if ( node.isNodeTriple()) {
+        if ( node.isTripleTerm()) {
             Triple t = node.getTriple();
             Node s = t.getSubject();
             Node p = t.getPredicate();
             Node o = t.getObject();
             ItemList list = new ItemList();
-            list.add(Tags.tagQTriple);
+            list.add(Tags.tagTripleTerm);
             list.add(nodeToItem(s, -1, -1));
             list.add(nodeToItem(p, -1, -1));
             list.add(nodeToItem(o, -1, -1));
@@ -125,45 +125,45 @@ public static Item lowerSymbol(Node node) {
 
     // ==== API
 
-    // ---- Quoted triple specific
+    // ---- Triple term specific
 
-    private static boolean isValidQuotedTriple(Item item) {
-        return item.isTagged(Tags.tagQTriple) && item.getList().size() == 4;
+    private static boolean isValidTripleTerm(Item item) {
+        return item.isTagged(Tags.tagTripleTerm) && item.getList().size() == 4;
     }
 
-    private static boolean isValidQuotedTriple(ItemList list) {
-        return list.isTagged(Tags.tagQTriple) && list.size() == 4;
+    private static boolean isValidTripleTerm(ItemList list) {
+        return list.isTagged(Tags.tagTripleTerm) && list.size() == 4;
     }
 
     // Entry to recursion.
-    private static Item liftQuotedTriple(ItemList list, int line, int column) {
-        Node n = liftQuotedTripleToNode(list);
+    private static Item liftTripleTerm(ItemList list, int line, int column) {
+        Node n = liftTripleTermToNode(list);
         return Item.createNode(n, line, column);
     }
 
-    private static Node liftQuotedTripleToNode(Item item) {
+    private static Node liftTripleTermToNode(Item item) {
         if ( item.isNode() )
             return item.getNode();
-        if ( ! isValidQuotedTriple(item))
-            throw new SSE_Exception("Not valid for a quoted triple: "+item.toString());
-        return liftQuotedTripleToNode(item.getList());
+        if ( ! isValidTripleTerm(item))
+            throw new SSE_Exception("Not valid for a triple term: "+item.toString());
+        return liftTripleTermToNode(item.getList());
     }
 
-    private static Node liftQuotedTripleToNode(ItemList list) {
+    private static Node liftTripleTermToNode(ItemList list) {
         if ( list.isEmpty() )
             broken(list, "Not a quoted triple (empty list)");
-        if ( ! isValidQuotedTriple(list) )
-            broken(list, "Not valid for a quoted triple: "+list);
-        return buildQuotedTriple(list);
+        if ( ! isValidTripleTerm(list) )
+            broken(list, "Not valid for a triple term: "+list);
+        return buildTripleTerm(list);
     }
 
-    private static Node buildQuotedTriple(ItemList list) {
+    private static Node buildTripleTerm(ItemList list) {
         // Recurses
-        Node s = liftQuotedTripleToNode(list.get(1));
-        Node p = liftQuotedTripleToNode(list.get(2));
-        Node o = liftQuotedTripleToNode(list.get(3));
+        Node s = liftTripleTermToNode(list.get(1));
+        Node p = liftTripleTermToNode(list.get(2));
+        Node o = liftTripleTermToNode(list.get(3));
         Triple triple = Triple.create(s, p, o);
-        return NodeFactory.createTripleNode(triple);
+        return NodeFactory.createTripleTerm(triple);
     }
 
     // ---- Symbols
@@ -195,8 +195,8 @@ private static String fn_nodeToSymbol(Node node) {
     private static class LiftAll extends ItemTransformBase {
         @Override
         public Item transform(Item item, ItemList list) {
-            if ( isValidQuotedTriple(list) )
-                return ItemLift.liftQuotedTriple(list, item.getLine(),item.getColumn());
+            if ( isValidTripleTerm(list) )
+                return ItemLift.liftTripleTerm(list, item.getLine(),item.getColumn());
             return super.transform(item, list);
         }
 
@@ -215,7 +215,7 @@ public Item transform(Item item, Node node) {
             Item item2 = nodeToItem(node, item.getLine(), item.getColumn());
             if (item2 != null )
                 return item2;
-            if ( node.isNodeTriple() )
+            if ( node.isTripleTerm() )
                 return ItemLift.lowerCompound(node, item.getLine(), item.getColumn());
             return super.transform(item, node);
         }
@@ -224,8 +224,8 @@ public Item transform(Item item, Node node) {
     private static class LiftCompound extends ItemTransformBase {
         @Override
         public Item transform(Item item, ItemList list) {
-            if ( isValidQuotedTriple(list) )
-                return ItemLift.liftQuotedTriple(list, item.getLine(),item.getColumn());
+            if ( isValidTripleTerm(list) )
+                return ItemLift.liftTripleTerm(list, item.getLine(),item.getColumn());
             return super.transform(item, list);
         }
     }
@@ -233,7 +233,7 @@ public Item transform(Item item, ItemList list) {
     private static class LowerCompound extends ItemTransformBase {
         @Override
         public Item transform(Item item, Node node) {
-            if ( node.isNodeTriple() ) {
+            if ( node.isTripleTerm() ) {
                 Item newItem = ItemLift.nodeToItem(node, item.getLine(),item.getColumn());
                 return newItem;
             }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemWriter.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemWriter.java
index 1a0b45d7a07..3a7d73250ca 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemWriter.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/ItemWriter.java
@@ -80,21 +80,21 @@ public static void write(IndentedWriter out, Node node, SerializationContext sCx
     }
 
     private static void writeNode(IndentedWriter out, Node node, SerializationContext sCxt) {
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple t = node.getTriple();
             if ( writeQuotedTriplesAsNodes ) {
-                // As <<....>>
-                out.print("<< ");
+                // As <<(....)>>
+                out.print("<<( ");
                 writeNode(out, t.getSubject(), sCxt);
                 out.print(" ");
                 writeNode(out, t.getPredicate(), sCxt);
                 out.print(" ");
                 writeNode(out, t.getObject(), sCxt);
-                out.print(" >>");
+                out.print(" )>>");
             } else {
-                // As (qtriple ...)
+                // As (triple ...) -- RDF Triple term.
                 out.print("(");
-                out.print(Tags.tagQTriple);
+                out.print(Tags.tagTripleTerm);
                 out.print(" ");
                 writeNode(out, t.getSubject(), sCxt);
                 out.print(" ");
@@ -183,7 +183,7 @@ public void visit(Item item, String symbol) {
         }
 
         // Tags to leave on one line.
-        private static Set<String> oneLineTags = Set.of(Tags.tagQTriple, Tags.tagTriple);
+        private static Set<String> oneLineTags = Set.of(Tags.tagTripleTerm, Tags.tagTriple);
 
         @Override
         public void visit(Item item, ItemList list) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
index 9a2539fd2fe..deb816760e1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/Tags.java
@@ -45,7 +45,7 @@ public class Tags
     public static final String tagQuad            = "quad";
     public static final String tagTriplePath      = "path";
     // RDF Star quoted triple : Node_Triple
-    public static final String tagQTriple         = "qtriple";
+    public static final String tagTripleTerm      = "tripleterm";
 
     public static final String tagBase            = "base";
     public static final String tagPrefix          = "prefix";
@@ -67,13 +67,15 @@ public class Tags
     public static final String tagLabel           = "label";
     public static final String tagService         = "service";
     public static final String tagJoin            = "join";
-    public static final String tagLateral         = "lateral";
-    public static final String tagLeftJoin        = "leftjoin";
-    public static final String tagDiff            = "diff";
     public static final String tagMinus           = "minus";
     public static final String tagUnion           = "union";
     public static final String tagDatasetNames    = "datasetnames";
 
+    public static final String tagLateral         = "lateral";
+    public static final String tagSemiJoin        = "semijoin";
+    public static final String tagAntiJoin        = "antijoin";
+    public static final String tagLeftJoin        = "leftjoin";
+
     // Additional operators.
     public static final String tagProc            = "proc";
     public static final String tagPropFunc        = "propfunc";
@@ -166,10 +168,12 @@ public class Tags
     public static final String tagNot             = "not";
     public static final String tagStr             = "str";
     public static final String tagStrLang         = "strlang";
+    public static final String tagStrLangDir      = "strlangdir";
     public static final String tagStrDatatype     = "strdt";
     public static final String tagRand            = "rand";
 
     public static final String tagLang            = "lang";
+    public static final String tagLangDir         = "langdir";
     public static final String tagLangMatches     = "langMatches";
     public static final String tagSameTerm        = "sameTerm";
     public static final String tagDatatype        = "datatype";
@@ -180,6 +184,11 @@ public class Tags
     public static final String tagIsURI           = "isURI";
     public static final String tagIsBlank         = "isBlank";
     public static final String tagIsLiteral       = "isLiteral";
+    public static final String tagIsNumeric       = "isNumeric";
+
+    public static final String tagHasLang         = "hasLang";
+    public static final String tagHasLangDir      = "hasLangDir";
+
     public static final String tagRegex           = "regex";
     public static final String tagExists          = "exists";
     public static final String tagNotExists       = "notexists";
@@ -223,7 +232,6 @@ public class Tags
     public static final String tagNumRound        = "round";
     public static final String tagNumCeiling      = "ceil";
     public static final String tagNumFloor        = "floor";
-    public static final String tagIsNumeric       = "isNumeric";
 
     public static final String tagBNode           = "bnode";
     public static final String tagIri             = "iri";
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
index 9581ebc65a1..c3c1aef9de6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderExpr.java
@@ -163,7 +163,7 @@ private static void buildNamedExpr(Item item, VarExprList varExprList) {
     private final static Map<String, Build> dispatch;
 
     public static Expr buildExpr(Item item) {
-        // Before testing for a list because of RDF terms that are lists: (qtriple).
+        // Before testing for a list because of there are RDF terms that are lists: (qtriple).
         if ( item.isNode() )
             return ExprLib.nodeToExpr(item.getNode());
 
@@ -367,13 +367,13 @@ private static Expr buildFunctionCall(ItemList list)
     };
 
     private static Build buildNot = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "!: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "!: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_LogicalNot(ex);
     };
 
     private static Build buildStr = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "str: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "str: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_Str(ex);
     };
@@ -385,6 +385,14 @@ private static Expr buildFunctionCall(ItemList list)
         return new E_StrLang(ex1, ex2);
     };
 
+    private static Build buildStrLangDir = (ItemList list) -> {
+        BuilderLib.checkLength(4, list, "strlangdir: wanted 3 arguments: got :"+numArgs(list));
+        Expr ex1 = buildExpr(list.get(1));
+        Expr ex2 = buildExpr(list.get(2));
+        Expr ex3 = buildExpr(list.get(3));
+        return new E_StrLangDir(ex1, ex2, ex3);
+    };
+
     private static Build buildStrDatatype = (ItemList list) -> {
         BuilderLib.checkLength(3, list, "strlang: wanted 2 arguments: got :"+numArgs(list));
         Expr ex1 = buildExpr(list.get(1));
@@ -615,11 +623,16 @@ private static Expr buildFunctionCall(ItemList list)
     };
 
     private static Build buildLang = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "lang: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "lang: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_Lang(ex);
     };
 
+    private static Build buildLangDir = (ItemList list) -> {
+        BuilderLib.checkLength(2, list, "langdir: wanted 1 argument: got :"+numArgs(list));
+        Expr ex = buildExpr(list.get(1));
+        return new E_LangDir(ex);
+    };
     private static Build buildLangMatches = (ItemList list) -> {
         BuilderLib.checkLength(3, list, "langmatches: wanted 2 arguments: got :"+numArgs(list));
         Expr left = buildExpr(list.get(1));
@@ -635,13 +648,13 @@ private static Expr buildFunctionCall(ItemList list)
     };
 
     private static Build buildDatatype = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "datatype: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "datatype: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_Datatype(ex);
     };
 
     private static Build buildBound = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "bound: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "bound: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_Bound(ex);
     };
@@ -665,52 +678,63 @@ private static Expr buildFunctionCall(ItemList list)
     };
 
     private static Build buildIsIRI = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "isIRI: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "isIRI: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_IsIRI(ex);
     };
 
     private static Build buildIsURI = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "isURI: wanted 1 arguments: got :"+numArgs(list));
+        BuilderLib.checkLength(2, list, "isURI: wanted 1 argument: got :"+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_IsURI(ex);
     };
 
     private static Build buildIsBlank = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "isBlank: wanted 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(2, list, "isBlank: wanted 1 argument: got: "+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_IsBlank(ex);
     };
 
     private static Build buildIsLiteral = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "isLiteral: wanted 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(2, list, "isLiteral: wanted 1 argument: got: "+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_IsLiteral(ex);
     };
 
     private static Build buildIsNumeric = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "isNumeric: wanted 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(2, list, "isNumeric: wanted 1 argument: got: "+numArgs(list));
         Expr ex = buildExpr(list.get(1));
         return new E_IsNumeric(ex);
     };
 
+    private static Build buildIsLang = (ItemList list) -> {
+        BuilderLib.checkLength(2, list, "isLang: wanted 1 argument: got: "+numArgs(list));
+        Expr ex = buildExpr(list.get(1));
+        return new E_HasLang(ex);
+    };
+
+    private static Build buildIsLangDir = (ItemList list) -> {
+        BuilderLib.checkLength(2, list, "isLangDir: wanted 1 argument: got: "+numArgs(list));
+        Expr ex = buildExpr(list.get(1));
+        return new E_HasLangDir(ex);
+    };
+
     private static Build buildExists = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "exists: wanted 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(2, list, "exists: wanted 1 argument: got: "+numArgs(list));
         Op op = BuilderOp.build(list.get(1));
         return new E_Exists(op);
     };
 
     private static Build buildNotExists = (ItemList list) -> {
-        BuilderLib.checkLength(2, list, "notexists: wanted 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(2, list, "notexists: wanted 1 argument: got: "+numArgs(list));
         Op op = BuilderOp.build(list.get(1));
         return new E_NotExists(op);
     };
 
     private static Build buildBNode = (ItemList list) -> {
-        BuilderLib.checkLength(1, 2, list, "bnode: wanted 0 or 1 arguments: got: "+numArgs(list));
+        BuilderLib.checkLength(1, 2, list, "bnode: wanted 0 or 1 argument: got: "+numArgs(list));
         if ( list.size() == 1 )
             return E_BNode.create();
-
         Expr expr = buildExpr(list.get(1));
         return E_BNode.create(expr);
     };
@@ -967,131 +991,144 @@ private static Build aggCommonOne(BuildAgg make) {
     };
 
     private static Map<String, Build> createDispatchTable() {
-        Map<String, Build> dispatch = new HashMap<>();
-        dispatch.put(Tags.tagRegex, buildRegex);
-        dispatch.put(Tags.symEQ, buildEQ);
-        dispatch.put(Tags.tagEQ, buildEQ);
-        dispatch.put(Tags.symNE, buildNE);
-        dispatch.put(Tags.tagNE, buildNE);
-        dispatch.put(Tags.symGT, buildGT);
-        dispatch.put(Tags.tagGT, buildGT);
-        dispatch.put(Tags.symLT, buildLT);
-        dispatch.put(Tags.tagLT, buildLT);
-        dispatch.put(Tags.symLE, buildLE);
-        dispatch.put(Tags.tagLE, buildLE);
-        dispatch.put(Tags.symGE, buildGE);
-        dispatch.put(Tags.tagGE, buildGE);
-        dispatch.put(Tags.symOr, buildOr);
-        dispatch.put(Tags.tagOr, buildOr);
-        dispatch.put(Tags.symAnd, buildAnd);
-        dispatch.put(Tags.tagAnd, buildAnd);
-        dispatch.put(Tags.symPlus, buildPlus);
-        dispatch.put(Tags.tagAdd,  buildPlus);
-        dispatch.put(Tags.symMinus, buildMinus);
-        dispatch.put(Tags.tagSubtract, buildMinus);
-        dispatch.put(Tags.tagMinus, buildMinus);    // Not to be confused with Op for SPARQL MINUS
-
-        dispatch.put(Tags.tagUnaryPlus, buildUnaryPlus);
-        dispatch.put(Tags.tagUnaryMinus, buildUnaryMinus);
-
-        dispatch.put(Tags.symMult, buildMult);
-        dispatch.put(Tags.tagMultiply, buildMult);
-
-        dispatch.put(Tags.symDiv, buildDiv);
-        dispatch.put(Tags.tagDivide, buildDiv);
-
-        dispatch.put(Tags.tagIDiv, buildIDiv);
-        dispatch.put(Tags.tagMod, buildMod);
-
-        dispatch.put(Tags.tagNot, buildNot);   // Same builders for (not ..) and (! ..)
-        dispatch.put(Tags.symNot, buildNot);
-
-        dispatch.put(Tags.tagStr, buildStr);
-        dispatch.put(Tags.tagStrLang, buildStrLang);
-        dispatch.put(Tags.tagStrDatatype, buildStrDatatype);
-
-        dispatch.put(Tags.tagYear, buildYear);
-        dispatch.put(Tags.tagMonth, buildMonth);
-        dispatch.put(Tags.tagDay, buildDay);
-        dispatch.put(Tags.tagHours, buildHours);
-        dispatch.put(Tags.tagMinutes, buildMinutes);
-        dispatch.put(Tags.tagSeconds, buildSeconds);
-        dispatch.put(Tags.tagTimezone, buildTimezone);
-        dispatch.put(Tags.tagTZ, buildTZ);
-        dispatch.put(Tags.tagAdjust, buildAdjust);
-
-        dispatch.put(Tags.tagRand, buildRand);
-        dispatch.put(Tags.tagNow, buildNow);
-        dispatch.put(Tags.tagUUID, buildUUID);
-        dispatch.put(Tags.tagStrUUID, buildStrUUID);
-        dispatch.put(Tags.tagVersion, buildVersion);
-
-        dispatch.put(Tags.tagMD5, buildMD5);
-        dispatch.put(Tags.tagSHA1, buildSHA1);
-        dispatch.put(Tags.tagSHA224, buildSHA224);
-        dispatch.put(Tags.tagSHA256, buildSHA256);
-        dispatch.put(Tags.tagSHA384, buildSHA384);
-        dispatch.put(Tags.tagSHA512, buildSHA512);
-
-        dispatch.put(Tags.tagStrlen, buildStrlen);
-        dispatch.put(Tags.tagSubstr, buildSubstr);
-        dispatch.put(Tags.tagReplace, buildStrReplace);
-        dispatch.put(Tags.tagStrUppercase, buildStrUppercase);
-        dispatch.put(Tags.tagStrLowercase, buildStrLowercase);
-        dispatch.put(Tags.tagStrEnds, buildStrEnds);
-        dispatch.put(Tags.tagStrStarts, buildStrStarts);
-        dispatch.put(Tags.tagStrBefore, buildStrBefore);
-        dispatch.put(Tags.tagStrAfter, buildStrAfter);
-        dispatch.put(Tags.tagStrContains, buildStrContains);
-        dispatch.put(Tags.tagStrEncodeForURI, buildStrEncode);
-
-        dispatch.put(Tags.tagNumAbs, buildNumAbs);
-        dispatch.put(Tags.tagNumRound, buildNumRound);
-        dispatch.put(Tags.tagNumCeiling, buildNumCeiling);
-        dispatch.put(Tags.tagNumFloor, buildNumFloor);
-        dispatch.put(Tags.tagIsNumeric, buildIsNumeric);
-
-        dispatch.put(Tags.tagLang, buildLang);
-        dispatch.put(Tags.tagLangMatches, buildLangMatches);
-        dispatch.put(Tags.tagSameTerm, buildSameTerm);
-        dispatch.put(Tags.tagDatatype, buildDatatype);
-        dispatch.put(Tags.tagBound, buildBound);
-        dispatch.put(Tags.tagCoalesce, buildCoalesce);
-        dispatch.put(Tags.tagConcat, buildConcat);
-        dispatch.put(Tags.tagIf, buildConditional);
-        dispatch.put(Tags.tagIsIRI, buildIsIRI);
-        dispatch.put(Tags.tagIsURI, buildIsURI);
-        dispatch.put(Tags.tagIsBlank, buildIsBlank);
-        dispatch.put(Tags.tagIsLiteral, buildIsLiteral);
-        dispatch.put(Tags.tagExists, buildExists);
-        dispatch.put(Tags.tagNotExists, buildNotExists);
-
-        dispatch.put(Tags.tagBNode, buildBNode);
-        dispatch.put(Tags.tagIri, buildIri);
-        dispatch.put(Tags.tagUri, buildUri);
-        dispatch.put(Tags.tagIri2, buildIri2);
-        dispatch.put(Tags.tagUri2, buildUri2);
-
-        dispatch.put(Tags.tagIn, buildIn);
-        dispatch.put(Tags.tagNotIn, buildNotIn);
-
-        dispatch.put(Tags.tagSubject, buildSubject);
-        dispatch.put(Tags.tagPredicate, buildPredicate);
-        dispatch.put(Tags.tagObject, buildObject);
-        dispatch.put(Tags.tagFnTriple, buildTripleFn);
-        dispatch.put(Tags.tagIsTriple, buildIsTriple);
-
-        dispatch.put(Tags.tagCall, buildCall);
-
-        dispatch.put(Tags.tagCount, buildCount);
-        dispatch.put(Tags.tagSum, buildSum);
-        dispatch.put(Tags.tagMin, buildMin);
-        dispatch.put(Tags.tagMax, buildMax);
-        dispatch.put(Tags.tagAvg, buildAvg);
-        dispatch.put(Tags.tagSample, buildSample);
-        dispatch.put(Tags.tagGroupConcat, buildGroupConcat);
-        dispatch.put(Tags.tagAgg,  buildCustomAggregate);
-        return dispatch;
+        Map<String, Build> dispatchMap = new HashMap<>();
+        dispatch(dispatchMap, Tags.tagRegex, buildRegex);
+        dispatch(dispatchMap, Tags.symEQ, buildEQ);
+        dispatch(dispatchMap, Tags.tagEQ, buildEQ);
+        dispatch(dispatchMap, Tags.symNE, buildNE);
+        dispatch(dispatchMap, Tags.tagNE, buildNE);
+        dispatch(dispatchMap, Tags.symGT, buildGT);
+        dispatch(dispatchMap, Tags.tagGT, buildGT);
+        dispatch(dispatchMap, Tags.symLT, buildLT);
+        dispatch(dispatchMap, Tags.tagLT, buildLT);
+        dispatch(dispatchMap, Tags.symLE, buildLE);
+        dispatch(dispatchMap, Tags.tagLE, buildLE);
+        dispatch(dispatchMap, Tags.symGE, buildGE);
+        dispatch(dispatchMap, Tags.tagGE, buildGE);
+        dispatch(dispatchMap, Tags.symOr, buildOr);
+        dispatch(dispatchMap, Tags.tagOr, buildOr);
+        dispatch(dispatchMap, Tags.symAnd, buildAnd);
+        dispatch(dispatchMap, Tags.tagAnd, buildAnd);
+        dispatch(dispatchMap, Tags.symPlus, buildPlus);
+        dispatch(dispatchMap, Tags.tagAdd,  buildPlus);
+        dispatch(dispatchMap, Tags.symMinus, buildMinus);
+        dispatch(dispatchMap, Tags.tagSubtract, buildMinus);
+        dispatch(dispatchMap, Tags.tagMinus, buildMinus);    // Not to be confused with Op for SPARQL MINUS
+
+        dispatch(dispatchMap, Tags.tagUnaryPlus, buildUnaryPlus);
+        dispatch(dispatchMap, Tags.tagUnaryMinus, buildUnaryMinus);
+
+        dispatch(dispatchMap, Tags.symMult, buildMult);
+        dispatch(dispatchMap, Tags.tagMultiply, buildMult);
+
+        dispatch(dispatchMap, Tags.symDiv, buildDiv);
+        dispatch(dispatchMap, Tags.tagDivide, buildDiv);
+
+        dispatch(dispatchMap, Tags.tagIDiv, buildIDiv);
+        dispatch(dispatchMap, Tags.tagMod, buildMod);
+
+        dispatch(dispatchMap, Tags.tagNot, buildNot);   // Same builders for (not ..) and (! ..)
+        dispatch(dispatchMap, Tags.symNot, buildNot);
+
+        dispatch(dispatchMap, Tags.tagStr, buildStr);
+        dispatch(dispatchMap, Tags.tagStrLang, buildStrLang);
+        dispatch(dispatchMap, Tags.tagStrLangDir, buildStrLangDir);
+        dispatch(dispatchMap, Tags.tagStrDatatype, buildStrDatatype);
+
+        dispatch(dispatchMap, Tags.tagYear, buildYear);
+        dispatch(dispatchMap, Tags.tagMonth, buildMonth);
+        dispatch(dispatchMap, Tags.tagDay, buildDay);
+        dispatch(dispatchMap, Tags.tagHours, buildHours);
+        dispatch(dispatchMap, Tags.tagMinutes, buildMinutes);
+        dispatch(dispatchMap, Tags.tagSeconds, buildSeconds);
+        dispatch(dispatchMap, Tags.tagTimezone, buildTimezone);
+        dispatch(dispatchMap, Tags.tagTZ, buildTZ);
+        dispatch(dispatchMap, Tags.tagAdjust, buildAdjust);
+
+        dispatch(dispatchMap, Tags.tagRand, buildRand);
+        dispatch(dispatchMap, Tags.tagNow, buildNow);
+        dispatch(dispatchMap, Tags.tagUUID, buildUUID);
+        dispatch(dispatchMap, Tags.tagStrUUID, buildStrUUID);
+        dispatch(dispatchMap, Tags.tagVersion, buildVersion);
+
+        dispatch(dispatchMap, Tags.tagMD5, buildMD5);
+        dispatch(dispatchMap, Tags.tagSHA1, buildSHA1);
+        dispatch(dispatchMap, Tags.tagSHA224, buildSHA224);
+        dispatch(dispatchMap, Tags.tagSHA256, buildSHA256);
+        dispatch(dispatchMap, Tags.tagSHA384, buildSHA384);
+        dispatch(dispatchMap, Tags.tagSHA512, buildSHA512);
+
+        dispatch(dispatchMap, Tags.tagStrlen, buildStrlen);
+        dispatch(dispatchMap, Tags.tagSubstr, buildSubstr);
+        dispatch(dispatchMap, Tags.tagReplace, buildStrReplace);
+        dispatch(dispatchMap, Tags.tagStrUppercase, buildStrUppercase);
+        dispatch(dispatchMap, Tags.tagStrLowercase, buildStrLowercase);
+        dispatch(dispatchMap, Tags.tagStrEnds, buildStrEnds);
+        dispatch(dispatchMap, Tags.tagStrStarts, buildStrStarts);
+        dispatch(dispatchMap, Tags.tagStrBefore, buildStrBefore);
+        dispatch(dispatchMap, Tags.tagStrAfter, buildStrAfter);
+        dispatch(dispatchMap, Tags.tagStrContains, buildStrContains);
+        dispatch(dispatchMap, Tags.tagStrEncodeForURI, buildStrEncode);
+
+        dispatch(dispatchMap, Tags.tagNumAbs, buildNumAbs);
+        dispatch(dispatchMap, Tags.tagNumRound, buildNumRound);
+        dispatch(dispatchMap, Tags.tagNumCeiling, buildNumCeiling);
+        dispatch(dispatchMap, Tags.tagNumFloor, buildNumFloor);
+
+        dispatch(dispatchMap, Tags.tagLang, buildLang);
+        dispatch(dispatchMap, Tags.tagLangDir, buildLangDir);
+        dispatch(dispatchMap, Tags.tagLangMatches, buildLangMatches);
+
+        dispatch(dispatchMap, Tags.tagSameTerm, buildSameTerm);
+        dispatch(dispatchMap, Tags.tagDatatype, buildDatatype);
+        dispatch(dispatchMap, Tags.tagBound, buildBound);
+        dispatch(dispatchMap, Tags.tagCoalesce, buildCoalesce);
+        dispatch(dispatchMap, Tags.tagConcat, buildConcat);
+        dispatch(dispatchMap, Tags.tagIf, buildConditional);
+        dispatch(dispatchMap, Tags.tagIsIRI, buildIsIRI);
+        dispatch(dispatchMap, Tags.tagIsURI, buildIsURI);
+        dispatch(dispatchMap, Tags.tagIsBlank, buildIsBlank);
+        dispatch(dispatchMap, Tags.tagIsLiteral, buildIsLiteral);
+
+        dispatch(dispatchMap, Tags.tagIsNumeric, buildIsNumeric);
+        dispatch(dispatchMap, Tags.tagHasLang, buildIsLang);
+        dispatch(dispatchMap, Tags.tagHasLangDir, buildIsLangDir);
+
+        dispatch(dispatchMap, Tags.tagExists, buildExists);
+        dispatch(dispatchMap, Tags.tagNotExists, buildNotExists);
+
+        dispatch(dispatchMap, Tags.tagBNode, buildBNode);
+        dispatch(dispatchMap, Tags.tagIri, buildIri);
+        dispatch(dispatchMap, Tags.tagUri, buildUri);
+        dispatch(dispatchMap, Tags.tagIri2, buildIri2);
+        dispatch(dispatchMap, Tags.tagUri2, buildUri2);
+
+        dispatch(dispatchMap, Tags.tagIn, buildIn);
+        dispatch(dispatchMap, Tags.tagNotIn, buildNotIn);
+
+        dispatch(dispatchMap, Tags.tagSubject, buildSubject);
+        dispatch(dispatchMap, Tags.tagPredicate, buildPredicate);
+        dispatch(dispatchMap, Tags.tagObject, buildObject);
+        dispatch(dispatchMap, Tags.tagFnTriple, buildTripleFn);
+        dispatch(dispatchMap, Tags.tagIsTriple, buildIsTriple);
+
+        dispatch(dispatchMap, Tags.tagCall, buildCall);
+
+        dispatch(dispatchMap, Tags.tagCount, buildCount);
+        dispatch(dispatchMap, Tags.tagSum, buildSum);
+        dispatch(dispatchMap, Tags.tagMin, buildMin);
+        dispatch(dispatchMap, Tags.tagMax, buildMax);
+        dispatch(dispatchMap, Tags.tagAvg, buildAvg);
+        dispatch(dispatchMap, Tags.tagSample, buildSample);
+        dispatch(dispatchMap, Tags.tagGroupConcat, buildGroupConcat);
+        dispatch(dispatchMap, Tags.tagAgg,  buildCustomAggregate);
+        return dispatchMap;
+    }
+
+    private static void dispatch(Map<String, Build> dispatchMap, String tag, Build build) {
+        if ( dispatchMap.containsKey(tag) )
+            throw new ARQInternalErrorException("Multiple dispatch entry for "+tag);
+        dispatchMap.put(tag, build);
     }
 
     //  --------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderOp.java
index 1be0cd2d39b..ca00779478d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/builders/BuilderOp.java
@@ -46,8 +46,7 @@ public class BuilderOp
 
     private static BuilderOp builderOp = new BuilderOp();
 
-    public static Op build(Item item)
-    {
+    public static Op build(Item item) {
         if (item.isNode() )
             BuilderLib.broken(item, "Attempt to build op structure from a plain node");
 
@@ -62,8 +61,7 @@ public static Op build(Item item)
 
     protected Map<String, Build> dispatch = new HashMap<>();
 
-    public BuilderOp()
-    {
+    public BuilderOp() {
         addBuild(Tags.tagBGP,           buildBGP);
         addBuild(Tags.tagQuadPattern,   buildQuadPattern);
         addBuild(Tags.tagQuadBlock,     buildQuadBlock);
@@ -79,11 +77,12 @@ public BuilderOp()
         addBuild(Tags.tagSequence,      buildSequence);
         addBuild(Tags.tagDisjunction,   buildDisjunction);
         addBuild(Tags.tagLeftJoin,      buildLeftJoin);
-        addBuild(Tags.tagDiff,          buildDiff);
         addBuild(Tags.tagMinus,         buildMinus);
         addBuild(Tags.tagUnion,         buildUnion);
         addBuild(Tags.tagDatasetNames,  buildDatasetNames);
         addBuild(Tags.tagLateral,       buildLateral);
+        addBuild(Tags.tagSemiJoin,      buildSemiJoin);
+        addBuild(Tags.tagAntiJoin,      buildAntiJoin);
         addBuild(Tags.tagConditional,   buildConditional);
 
         addBuild(Tags.tagToList,        buildToList);
@@ -104,25 +103,20 @@ public BuilderOp()
         addBuild(Tags.tagLabel,         buildLabel);
     }
 
-
-    public static void add(String tag, Build builder)
-    {
+    public static void add(String tag, Build builder) {
         builderOp.addBuild(tag, builder);
     }
 
-    public static void remove(String tag)
-    {
+    public static void remove(String tag) {
         builderOp.removeBuild(tag);
     }
 
-    public static boolean contains(String tag)
-    {
+    public static boolean contains(String tag) {
         return builderOp.containsBuild(tag);
     }
 
     // The main recursive build operation.
-    private Op build(ItemList list)
-    {
+    private Op build(ItemList list) {
         Item head = list.get(0);
         String tag = head.getSymbol();
 
@@ -134,25 +128,21 @@ private Op build(ItemList list)
         return null;
     }
 
-    public static BasicPattern buildBGP(Item item)
-    {
-        if ( ! item.isTagged(Tags.tagBGP) )
+    public static BasicPattern buildBGP(Item item) {
+        if ( !item.isTagged(Tags.tagBGP) )
             BuilderLib.broken(item, "Not a basic graph pattern");
-        if ( ! item.isList() )
+        if ( !item.isList() )
             BuilderLib.broken(item, "Not a list for a basic graph pattern");
         ItemList list = item.getList();
         return buildBGP(list);
-
     }
 
-    private static BasicPattern buildBGP(ItemList list)
-    {
+    private static BasicPattern buildBGP(ItemList list) {
         // Skips the tag.
         BasicPattern triples = new BasicPattern();
-        for ( int i = 1; i < list.size(); i++ )
-        {
+        for ( int i = 1 ; i < list.size() ; i++ ) {
             Item item = list.get(i);
-            if ( ! item.isList() )
+            if ( !item.isList() )
                 BuilderLib.broken(item, "Not a triple structure");
             Triple t = BuilderGraph.buildTriple(item.getList());
             triples.add(t);
@@ -160,36 +150,29 @@ private static BasicPattern buildBGP(ItemList list)
         return triples;
     }
 
-    protected Op build(ItemList list, int idx)
-    {
+    protected Op build(ItemList list, int idx) {
         return build(list.get(idx).getList());
     }
 
     // <<<< ---- Coordinate these
     // Lowercase on insertion?
-    protected void addBuild(String tag, Build builder)
-    {
+    protected void addBuild(String tag, Build builder) {
         dispatch.put(tag, builder);
     }
 
-    protected void removeBuild(String tag)
-    {
+    protected void removeBuild(String tag) {
         dispatch.remove(tag);
     }
 
-    protected boolean containsBuild(String tag)
-    {
+    protected boolean containsBuild(String tag) {
         return findBuild(tag) != null;
 
     }
 
-    protected Build findBuild(String str)
-    {
-        for ( String key : dispatch.keySet() )
-        {
-            if ( str.equalsIgnoreCase( key ) )
-            {
-                return dispatch.get( key );
+    protected Build findBuild(String str) {
+        for ( String key : dispatch.keySet() ) {
+            if ( str.equalsIgnoreCase(key) ) {
+                return dispatch.get(key);
             }
         }
         return null;
@@ -202,7 +185,7 @@ public interface Build { Op make(ItemList list); }
 
     // Not static.  The initialization through the singleton would not work
     // (static initialization order - these operations would need to go
-    // before the singelton.
+    // before the singleton.
     // Or assign null and create object on first call but that breaks add/remove
     final protected Build buildTable = (ItemList list) -> {
             Item t = Item.createList(list);
@@ -331,14 +314,6 @@ final private void addOps(OpN op, ItemList list)
 		return op;
     };
 
-    final protected Build buildDiff = (ItemList list) -> {
-		BuilderLib.checkLength(3, 4, list, "diff: wanted 2 arguments");
-		Op left = build(list, 1);
-		Op right  = build(list, 2);
-		Op op = OpDiff.create(left, right);
-		return op;
-    };
-
     final protected Build buildMinus = (ItemList list) -> {
 		BuilderLib.checkLength(3, 4, list, "minus: wanted 2 arguments");
 		Op left = build(list, 1);
@@ -369,6 +344,22 @@ final private void addOps(OpN op, ItemList list)
         return op;
     };
 
+    final protected Build buildSemiJoin = (ItemList list) -> {
+        BuilderLib.checkLength(3, 4, list, "lateral");
+        Op left = build(list, 1);
+        Op right = build(list, 2);
+        Op op = OpSemiJoin.create(left, right);
+        return op;
+    };
+
+    final protected Build buildAntiJoin = (ItemList list) -> {
+        BuilderLib.checkLength(3, 4, list, "lateral");
+        Op left = build(list, 1);
+        Op right = build(list, 2);
+        Op op = OpAntiJoin.create(left, right);
+        return op;
+    };
+
     final protected Build buildConditional = (ItemList list) -> {
 		BuilderLib.checkLength(2, 3, list, "condition");
 		Op left = build(list, 1);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerLink.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerLink.java
index cf3f1aaf2d2..75ac443485c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerLink.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerLink.java
@@ -75,7 +75,6 @@ protected void declItem(ItemList list, Item item) {
 
     @Override
     protected boolean endOfDecl(ItemList list, Item item) {
-        // XXX No. This does not allow for nested "@names"
         super.setFormResult(item);
         if ( namedItems.containsKey(currentName) )
             throwException("Name already defined: " + currentName, item);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
index 810f3b35290..e7a756dd0fd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
@@ -181,7 +181,7 @@ public void tripleTermFinish(int line, int column) {
         Node o = tripleTermStack.removeLast();
         Node p = tripleTermStack.removeLast();
         Node s = tripleTermStack.removeLast();
-        Node n = NodeFactory.createTripleNode(s, p, o);
+        Node n = NodeFactory.createTripleTerm(s, p, o);
         inTripleTermDepth--;
 
         if ( inTripleTermDepth == 0 ) {
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParserSSEBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParserSSEBase.java
index 232595dd710..30aa618e408 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParserSSEBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParserSSEBase.java
@@ -49,7 +49,6 @@ protected void emitPName(int line, int column, String pname)
     { handler.emitPName(line, column, pname); }
 
     protected void emitSymbol(int line, int column, String pname) {
-        // XXX Fix escapes?
         handler.emitSymbol(line, column, pname);
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java
index 1b4b5e41b33..a8163760d89 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/ParseException.java
@@ -1,5 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 7.0 */
 /* JavaCCOptions:KEEP_LINE_COLUMN=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
 
 /**
@@ -192,4 +210,4 @@ static String add_escapes(String str) {
    }
 
 }
-/* JavaCC - OriginalChecksum=1c33541c7f28d99fc8b49129ce8966cd (do not edit this line) */
+/* JavaCC - OriginalChecksum=ac43afa487728cd66c7be8df3e35a3b8 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java
index f8754d08362..d6347a5fb18 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCore.java
@@ -1,11 +1,36 @@
 /* SSE_ParserCore.java */
 /* Generated By:JavaCC: Do not edit this line. SSE_ParserCore.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
+
 import org.apache.jena.sparql.sse.lang.ParserSSEBase ;
 import static org.apache.jena.riot.lang.extra.LangParserLib.*;
+
 public class SSE_ParserCore extends ParserSSEBase implements SSE_ParserCoreConstants {
 
-  final public void parse() throws ParseException {
+// Now has explicit WS control in the grammar.
+// Policy - eat trailing WS
+
+// ---- Entry points : check for EOF.
+  final public 
+void parse() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case BOM:{
       jj_consume_token(BOM);
@@ -34,6 +59,7 @@ final public void parse() throws ParseException {
 parseFinish() ;
 }
 
+// Parse one atom  - non-compound RDF term.
   final public void atom() throws ParseException {
 parseStart() ;
     TermAtom();
@@ -41,7 +67,9 @@ final public void atom() throws ParseException {
 parseFinish() ;
 }
 
-  final public void TermOrList() throws ParseException {
+// ----
+  final public 
+void TermOrList() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:
     case PNAME:
@@ -55,7 +83,7 @@ final public void TermOrList() throws ParseException {
     case STRING_LITERAL2:
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:
-    case LT2:
+    case L_TRIPLE:
     case SYMBOL:{
       TermAtom();
       label_2:
@@ -180,7 +208,7 @@ final public void BareList() throws ParseException {
       case STRING_LITERAL_LONG2:
       case LPAREN:
       case LBRACKET:
-      case LT2:
+      case L_TRIPLE:
       case SYMBOL:{
         ;
         break;
@@ -211,7 +239,7 @@ final public void TermAtom() throws ParseException {
     case STRING_LITERAL2:
     case STRING_LITERAL_LONG1:
     case STRING_LITERAL_LONG2:
-    case LT2:{
+    case L_TRIPLE:{
       RDFTermAtom();
       break;
       }
@@ -222,6 +250,8 @@ final public void TermAtom() throws ParseException {
     }
 }
 
+// Atomic RDF terms URI, literal, bnode, variable.
+// Not quoted triple. unless <<>> support is active.
   final public void RDFTermAtom() throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case IRIref:{
@@ -251,7 +281,7 @@ final public void RDFTermAtom() throws ParseException {
       BlankNode();
       break;
       }
-    case LT2:{
+    case L_TRIPLE:{
       TripleTerm();
       break;
       }
@@ -326,7 +356,7 @@ final public void Literal() throws ParseException {
 }
 
   final public void TripleTerm() throws ParseException {Token t1 = null ; Token t2 = null ;
-    t1 = jj_consume_token(LT2);
+    t1 = jj_consume_token(L_TRIPLE);
     label_8:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -383,7 +413,7 @@ final public void Literal() throws ParseException {
       }
       jj_consume_token(WS);
     }
-    t2 = jj_consume_token(GT2);
+    t2 = jj_consume_token(R_TRIPLE);
 tripleTermFinish(t2.beginLine, t2.beginColumn);
 }
 
@@ -420,10 +450,10 @@ final public void Literal() throws ParseException {
     lex = unescapeStr(lex, currLine, currColumn) ;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case DATATYPE:
-    case LANGTAG:{
+    case LANG_DIR:{
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LANGTAG:{
-        t = jj_consume_token(LANGTAG);
+      case LANG_DIR:{
+        t = jj_consume_token(LANG_DIR);
 lang = stripChars(t.image, 1) ;
         break;
         }
@@ -432,7 +462,7 @@ final public void Literal() throws ParseException {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IRIref:{
           t = jj_consume_token(IRIref);
-dt_iri = stripQuotes(t.image) ;
+dt_iri  = stripQuotes(t.image) ;
           break;
           }
         case PNAME:{
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java
index a379daec7f5..b641127ea4f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreConstants.java
@@ -1,4 +1,22 @@
 /* Generated By:JavaCC: Do not edit this line. SSE_ParserCoreConstants.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
 
 
@@ -71,13 +89,13 @@ public interface SSE_ParserCoreConstants {
   /** RegularExpression Id. */
   int RBRACKET = 30;
   /** RegularExpression Id. */
-  int LT2 = 31;
+  int L_TRIPLE = 31;
   /** RegularExpression Id. */
-  int GT2 = 32;
+  int R_TRIPLE = 32;
   /** RegularExpression Id. */
   int DATATYPE = 33;
   /** RegularExpression Id. */
-  int LANGTAG = 34;
+  int LANG_DIR = 34;
   /** RegularExpression Id. */
   int AT = 35;
   /** RegularExpression Id. */
@@ -151,10 +169,10 @@ public interface SSE_ParserCoreConstants {
     "\"}\"",
     "\"[\"",
     "\"]\"",
-    "\"<<\"",
-    "\">>\"",
+    "\"<<(\"",
+    "\")>>\"",
     "\"^^\"",
-    "<LANGTAG>",
+    "<LANG_DIR>",
     "\"@\"",
     "<A2Z>",
     "<A2ZN>",
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java
index fed68235bdc..7a1742dbfbc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SSE_ParserCoreTokenManager.java
@@ -1,8 +1,29 @@
 /* SSE_ParserCoreTokenManager.java */
 /* Generated By:JavaCC: Do not edit this line. SSE_ParserCoreTokenManager.java */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
+import org.apache.jena.sparql.sse.lang.ParserSSEBase ;
+import static org.apache.jena.riot.lang.extra.LangParserLib.*;
 
 /** Token Manager. */
+@SuppressWarnings ("unused")
 public class SSE_ParserCoreTokenManager implements SSE_ParserCoreConstants {
 
   /** Debug output. */
@@ -13,17 +34,23 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0){
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x200L) != 0L)
-            return 184;
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x80000000L) != 0L)
          {
             jjmatchedKind = 51;
-            return 156;
+            return 187;
          }
+         if ((active0 & 0x200L) != 0L)
+            return 188;
+         return -1;
+      case 1:
          if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 51;
-            return 185;
+            if (jjmatchedPos == 0)
+            {
+               jjmatchedKind = 51;
+               jjmatchedPos = 0;
+            }
+            return -1;
          }
          return -1;
       default :
@@ -45,11 +72,10 @@ private int jjMoveStringLiteralDfa0_0(){
       case 40:
          return jjStopAtPos(0, 25);
       case 41:
-         return jjStopAtPos(0, 26);
+         jjmatchedKind = 26;
+         return jjMoveStringLiteralDfa1_0(0x100000000L);
       case 60:
          return jjMoveStringLiteralDfa1_0(0x80000000L);
-      case 62:
-         return jjMoveStringLiteralDfa1_0(0x100000000L);
       case 91:
          return jjStopAtPos(0, 29);
       case 93:
@@ -61,7 +87,7 @@ private int jjMoveStringLiteralDfa0_0(){
       case 125:
          return jjStopAtPos(0, 28);
       case 65279:
-         return jjStartNfaWithStates_0(0, 9, 184);
+         return jjStartNfaWithStates_0(0, 9, 188);
       default :
          return jjMoveNfa_0(0, 0);
    }
@@ -75,13 +101,9 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 60:
-         if ((active0 & 0x80000000L) != 0L)
-            return jjStopAtPos(1, 31);
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);
       case 62:
-         if ((active0 & 0x100000000L) != 0L)
-            return jjStopAtPos(1, 32);
-         break;
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000L);
       case 94:
          if ((active0 & 0x200000000L) != 0L)
             return jjStopAtPos(1, 33);
@@ -91,6 +113,29 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    }
    return jjStartNfa_0(0, active0);
 }
+private int jjMoveStringLiteralDfa2_0(long old0, long active0){
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(0, old0);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(1, active0);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 40:
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStopAtPos(2, 31);
+         break;
+      case 62:
+         if ((active0 & 0x100000000L) != 0L)
+            return jjStopAtPos(2, 32);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(1, active0);
+}
 private int jjStartNfaWithStates_0(int pos, int kind, int state)
 {
    jjmatchedKind = kind;
@@ -138,7 +183,7 @@ private int jjStartNfaWithStates_0(int pos, int kind, int state)
 private int jjMoveNfa_0(int startState, int curPos)
 {
    int startsAt = 0;
-   jjnewStateCnt = 184;
+   jjnewStateCnt = 187;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -153,12 +198,12 @@ private int jjMoveNfa_0(int startState, int curPos)
          {
             switch(jjstateSet[--i])
             {
-               case 184:
+               case 188:
                   if ((0xaffffc7affffc9ffL & l) != 0L)
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   if ((0x3ff600000000000L & l) != 0L)
                      { jjCheckNAddTwoStates(29, 30); }
@@ -171,27 +216,12 @@ else if (curChar == 58)
                   if ((0x3ff200000000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 31;
                   break;
-               case 185:
-                  if ((0xaffffc7affffc9ffL & l) != 0L)
-                  {
-                     if (kind > 51)
-                        kind = 51;
-                     { jjCheckNAdd(156); }
-                  }
-                  else if (curChar == 62)
-                  {
-                     if (kind > 4)
-                        kind = 4;
-                  }
-                  if ((0xaffffffa00000000L & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
-                  break;
                case 0:
                   if ((0xfffffc7affffc9ffL & l) != 0L)
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   else if ((0x100003600L & l) != 0L)
                   {
@@ -206,21 +236,21 @@ else if (curChar == 39)
                   {
                      if (kind > 11)
                         kind = 11;
-                     { jjCheckNAddStates(6, 12); }
+                     { jjCheckNAddStates(3, 9); }
                   }
                   else if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAddStates(13, 16); }
+                     { jjCheckNAddStates(10, 13); }
                   else if ((0x5000000000000000L & l) != 0L)
                   {
                      if (kind > 51)
                         kind = 51;
                   }
                   else if (curChar == 46)
-                     { jjCheckNAddTwoStates(167, 180); }
+                     { jjCheckNAddTwoStates(170, 183); }
                   else if (curChar == 34)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   else if (curChar == 39)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   else if (curChar == 58)
                   {
                      if (kind > 5)
@@ -231,36 +261,51 @@ else if (curChar == 59)
                   {
                      if (kind > 3)
                         kind = 3;
-                     { jjCheckNAddStates(23, 25); }
+                     { jjCheckNAddStates(20, 22); }
                   }
                   else if (curChar == 35)
                   {
                      if (kind > 2)
                         kind = 2;
-                     { jjCheckNAddStates(26, 28); }
+                     { jjCheckNAddStates(23, 25); }
                   }
                   else if (curChar == 63)
                   {
                      if (kind > 7)
                         kind = 7;
-                     { jjCheckNAddTwoStates(158, 160); }
+                     { jjCheckNAddTwoStates(161, 163); }
                   }
                   if (curChar == 60)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
+                  break;
+               case 187:
+                  if ((0xaffffc7affffc9ffL & l) != 0L)
+                  {
+                     if (kind > 51)
+                        kind = 51;
+                     { jjCheckNAdd(159); }
+                  }
+                  else if (curChar == 62)
+                  {
+                     if (kind > 4)
+                        kind = 4;
+                  }
+                  if ((0xaffffffa00000000L & l) != 0L)
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 1:
                   if (curChar != 35)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  { jjCheckNAddStates(26, 28); }
+                  { jjCheckNAddStates(23, 25); }
                   break;
                case 2:
                   if ((0xffffffffffffdbffL & l) == 0L)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  { jjCheckNAddStates(26, 28); }
+                  { jjCheckNAddStates(23, 25); }
                   break;
                case 3:
                   if ((0x2400L & l) != 0L && kind > 2)
@@ -279,14 +324,14 @@ else if (curChar == 63)
                      break;
                   if (kind > 3)
                      kind = 3;
-                  { jjCheckNAddStates(23, 25); }
+                  { jjCheckNAddStates(20, 22); }
                   break;
                case 7:
                   if ((0xffffffffffffdbffL & l) == 0L)
                      break;
                   if (kind > 3)
                      kind = 3;
-                  { jjCheckNAddStates(23, 25); }
+                  { jjCheckNAddStates(20, 22); }
                   break;
                case 8:
                   if ((0x2400L & l) != 0L && kind > 3)
@@ -302,11 +347,11 @@ else if (curChar == 63)
                   break;
                case 11:
                   if (curChar == 60)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 12:
                   if ((0xaffffffa00000000L & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 13:
                   if (curChar == 62 && kind > 4)
@@ -343,7 +388,7 @@ else if (curChar == 63)
                   break;
                case 23:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 25:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -507,11 +552,11 @@ else if (curChar == 63)
                   break;
                case 66:
                   if (curChar == 39)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 67:
                   if ((0xffffff7fffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 68:
                   if (curChar == 39 && kind > 21)
@@ -519,7 +564,7 @@ else if (curChar == 63)
                   break;
                case 70:
                   if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 72:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -552,7 +597,7 @@ else if (curChar == 63)
                   break;
                case 79:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 81:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -564,11 +609,11 @@ else if (curChar == 63)
                   break;
                case 84:
                   if (curChar == 34)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 85:
                   if ((0xfffffffbffffdbffL & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 86:
                   if (curChar == 34 && kind > 22)
@@ -576,7 +621,7 @@ else if (curChar == 63)
                   break;
                case 88:
                   if ((0x8400000000L & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 90:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -609,7 +654,7 @@ else if (curChar == 63)
                   break;
                case 97:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 99:
                   if ((0x3ff000000000000L & l) != 0L)
@@ -784,151 +829,162 @@ else if (curChar == 63)
                      break;
                   if (kind > 34)
                      kind = 34;
-                  { jjCheckNAddTwoStates(152, 153); }
+                  { jjCheckNAddStates(56, 58); }
                   break;
                case 154:
+                  if (curChar != 45)
+                     break;
+                  if (kind > 34)
+                     kind = 34;
+                  jjstateSet[jjnewStateCnt++] = 155;
+                  break;
+               case 156:
+                  if (curChar == 45)
+                     jjstateSet[jjnewStateCnt++] = 154;
+                  break;
+               case 157:
                   if ((0x5000000000000000L & l) != 0L && kind > 51)
                      kind = 51;
                   break;
-               case 155:
+               case 158:
                   if ((0xfffffc7affffc9ffL & l) == 0L)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 156:
+               case 159:
                   if ((0xaffffc7affffc9ffL & l) == 0L)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 157:
+               case 160:
                   if (curChar != 63)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAddTwoStates(158, 160); }
+                  { jjCheckNAddTwoStates(161, 163); }
                   break;
-               case 158:
-               case 159:
+               case 161:
+               case 162:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAdd(159); }
+                  { jjCheckNAdd(162); }
                   break;
-               case 160:
+               case 163:
                   if ((0xaffffc7affffc9ffL & l) == 0L)
                      break;
                   if (kind > 8)
                      kind = 8;
-                  { jjCheckNAdd(160); }
+                  { jjCheckNAdd(163); }
                   break;
-               case 161:
+               case 164:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAddStates(13, 16); }
+                     { jjCheckNAddStates(10, 13); }
                   break;
-               case 162:
+               case 165:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAdd(162); }
+                  { jjCheckNAdd(165); }
                   break;
-               case 163:
+               case 166:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(163, 164); }
+                     { jjCheckNAddTwoStates(166, 167); }
                   break;
-               case 164:
+               case 167:
                   if (curChar != 46)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAdd(165); }
+                  { jjCheckNAdd(168); }
                   break;
-               case 165:
+               case 168:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAdd(165); }
+                  { jjCheckNAdd(168); }
                   break;
-               case 166:
+               case 169:
                   if (curChar == 46)
-                     { jjCheckNAdd(167); }
+                     { jjCheckNAdd(170); }
                   break;
-               case 167:
+               case 170:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 12)
                      kind = 12;
-                  { jjCheckNAdd(167); }
+                  { jjCheckNAdd(170); }
                   break;
-               case 168:
+               case 171:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(168, 169); }
+                     { jjCheckNAddTwoStates(171, 172); }
                   break;
-               case 169:
+               case 172:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(170, 171); }
+                     { jjCheckNAddTwoStates(173, 174); }
                   break;
-               case 170:
+               case 173:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(170, 171); }
+                     { jjCheckNAddTwoStates(173, 174); }
                   break;
-               case 172:
+               case 175:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(173); }
+                     { jjCheckNAdd(176); }
                   break;
-               case 173:
+               case 176:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 13)
                      kind = 13;
-                  { jjCheckNAdd(173); }
+                  { jjCheckNAdd(176); }
                   break;
-               case 174:
+               case 177:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 11)
                      kind = 11;
-                  { jjCheckNAddStates(6, 12); }
+                  { jjCheckNAddStates(3, 9); }
                   break;
-               case 175:
+               case 178:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(175, 176); }
+                     { jjCheckNAddTwoStates(178, 179); }
                   break;
-               case 177:
+               case 180:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(178); }
+                     { jjCheckNAdd(181); }
                   break;
-               case 178:
+               case 181:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 13)
                      kind = 13;
-                  { jjCheckNAdd(178); }
+                  { jjCheckNAdd(181); }
                   break;
-               case 179:
+               case 182:
                   if (curChar == 46)
-                     { jjCheckNAddTwoStates(167, 180); }
+                     { jjCheckNAddTwoStates(170, 183); }
                   break;
-               case 180:
+               case 183:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(180, 181); }
+                     { jjCheckNAddTwoStates(183, 184); }
                   break;
-               case 182:
+               case 185:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(183); }
+                     { jjCheckNAdd(186); }
                   break;
-               case 183:
+               case 186:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 13)
                      kind = 13;
-                  { jjCheckNAdd(183); }
+                  { jjCheckNAdd(186); }
                   break;
                default : break;
             }
@@ -941,61 +997,61 @@ else if (curChar < 128)
          {
             switch(jjstateSet[--i])
             {
-               case 184:
+               case 188:
                   if ((0xd7ffffffd7ffffffL & l) != 0L)
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                      { jjCheckNAdd(31); }
                   if ((0x7fffffe87fffffeL & l) != 0L)
                      { jjCheckNAddTwoStates(29, 30); }
                   break;
-               case 185:
-                  if ((0xd7ffffffd7ffffffL & l) != 0L)
-                  {
-                     if (kind > 51)
-                        kind = 51;
-                     { jjCheckNAdd(156); }
-                  }
-                  if ((0xc7fffffeafffffffL & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
-                  else if (curChar == 92)
-                     { jjAddStates(56, 57); }
-                  break;
                case 0:
                   if ((0xd7ffffff97fffffeL & l) != 0L)
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   else if (curChar == 64)
                      { jjCheckNAdd(151); }
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(59, 61); }
                   else if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 48;
                   break;
+               case 187:
+                  if ((0xd7ffffffd7ffffffL & l) != 0L)
+                  {
+                     if (kind > 51)
+                        kind = 51;
+                     { jjCheckNAdd(159); }
+                  }
+                  if ((0xc7fffffeafffffffL & l) != 0L)
+                     { jjCheckNAddStates(26, 28); }
+                  else if (curChar == 92)
+                     { jjAddStates(62, 63); }
+                  break;
                case 2:
                   if (kind > 2)
                      kind = 2;
-                  { jjAddStates(26, 28); }
+                  { jjAddStates(23, 25); }
                   break;
                case 7:
                   if (kind > 3)
                      kind = 3;
-                  { jjAddStates(23, 25); }
+                  { jjAddStates(20, 22); }
                   break;
                case 12:
                   if ((0xc7fffffeafffffffL & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 14:
                   if (curChar == 92)
-                     { jjAddStates(56, 57); }
+                     { jjAddStates(62, 63); }
                   break;
                case 15:
                   if (curChar == 85)
@@ -1032,7 +1088,7 @@ else if (curChar == 95)
                   break;
                case 23:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 24:
                   if (curChar == 117)
@@ -1048,7 +1104,7 @@ else if (curChar == 95)
                   break;
                case 28:
                   if ((0x7fffffe07fffffeL & l) != 0L)
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(59, 61); }
                   break;
                case 29:
                   if ((0x7fffffe87fffffeL & l) != 0L)
@@ -1075,7 +1131,7 @@ else if (curChar == 95)
                   break;
                case 35:
                   if (curChar == 92)
-                     { jjAddStates(61, 62); }
+                     { jjAddStates(64, 65); }
                   break;
                case 36:
                   if ((0x4000000080000001L & l) != 0L)
@@ -1140,7 +1196,7 @@ else if (curChar == 95)
                   break;
                case 52:
                   if (curChar == 92)
-                     { jjAddStates(63, 64); }
+                     { jjAddStates(66, 67); }
                   break;
                case 53:
                   if ((0x4000000080000001L & l) != 0L)
@@ -1194,15 +1250,15 @@ else if (curChar == 95)
                   break;
                case 67:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 69:
                   if (curChar == 92)
-                     { jjAddStates(65, 67); }
+                     { jjAddStates(68, 70); }
                   break;
                case 70:
                   if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 71:
                   if (curChar == 85)
@@ -1239,7 +1295,7 @@ else if (curChar == 95)
                   break;
                case 79:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(20, 22); }
+                     { jjCheckNAddStates(17, 19); }
                   break;
                case 80:
                   if (curChar == 117)
@@ -1255,15 +1311,15 @@ else if (curChar == 95)
                   break;
                case 85:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 87:
                   if (curChar == 92)
-                     { jjAddStates(68, 70); }
+                     { jjAddStates(71, 73); }
                   break;
                case 88:
                   if ((0x14404410000000L & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 89:
                   if (curChar == 85)
@@ -1300,7 +1356,7 @@ else if (curChar == 95)
                   break;
                case 97:
                   if ((0x7e0000007eL & l) != 0L)
-                     { jjCheckNAddStates(17, 19); }
+                     { jjCheckNAddStates(14, 16); }
                   break;
                case 98:
                   if (curChar == 117)
@@ -1320,7 +1376,7 @@ else if (curChar == 95)
                   break;
                case 107:
                   if (curChar == 92)
-                     { jjAddStates(71, 73); }
+                     { jjAddStates(74, 76); }
                   break;
                case 108:
                   if ((0x14404410000000L & l) != 0L)
@@ -1381,7 +1437,7 @@ else if (curChar == 95)
                   break;
                case 131:
                   if (curChar == 92)
-                     { jjAddStates(74, 76); }
+                     { jjAddStates(77, 79); }
                   break;
                case 132:
                   if ((0x14404410000000L & l) != 0L)
@@ -1445,55 +1501,62 @@ else if (curChar == 95)
                      break;
                   if (kind > 34)
                      kind = 34;
-                  { jjCheckNAddTwoStates(151, 152); }
+                  { jjCheckNAddStates(80, 82); }
                   break;
                case 153:
                   if ((0x7fffffe07fffffeL & l) == 0L)
                      break;
                   if (kind > 34)
                      kind = 34;
-                  { jjCheckNAddTwoStates(152, 153); }
+                  { jjCheckNAddStates(56, 58); }
                   break;
                case 155:
+                  if ((0x7fffffe07fffffeL & l) == 0L)
+                     break;
+                  if (kind > 34)
+                     kind = 34;
+                  jjstateSet[jjnewStateCnt++] = 155;
+                  break;
+               case 158:
                   if ((0xd7ffffff97fffffeL & l) == 0L)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 156:
+               case 159:
                   if ((0xd7ffffffd7ffffffL & l) == 0L)
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 158:
-               case 159:
+               case 161:
+               case 162:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAdd(159); }
+                  { jjCheckNAdd(162); }
                   break;
-               case 160:
+               case 163:
                   if ((0xd7ffffffd7ffffffL & l) == 0L)
                      break;
                   if (kind > 8)
                      kind = 8;
-                  jjstateSet[jjnewStateCnt++] = 160;
+                  jjstateSet[jjnewStateCnt++] = 163;
                   break;
-               case 171:
+               case 174:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(77, 78); }
+                     { jjAddStates(83, 84); }
                   break;
-               case 176:
+               case 179:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(79, 80); }
+                     { jjAddStates(85, 86); }
                   break;
-               case 181:
+               case 184:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(81, 82); }
+                     { jjAddStates(87, 88); }
                   break;
                default : break;
             }
@@ -1510,7 +1573,7 @@ else if (curChar == 95)
          {
             switch(jjstateSet[--i])
             {
-               case 184:
+               case 188:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddTwoStates(29, 30); }
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
@@ -1519,27 +1582,27 @@ else if (curChar == 95)
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   break;
-               case 185:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(3, 5); }
+               case 0:
+                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(59, 61); }
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   break;
-               case 0:
-                  if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(58, 60); }
+               case 187:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(26, 28); }
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
                      if (kind > 51)
                         kind = 51;
-                     { jjCheckNAdd(156); }
+                     { jjCheckNAdd(159); }
                   }
                   break;
                case 2:
@@ -1547,22 +1610,22 @@ else if (curChar == 95)
                      break;
                   if (kind > 2)
                      kind = 2;
-                  { jjAddStates(26, 28); }
+                  { jjAddStates(23, 25); }
                   break;
                case 7:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 3)
                      kind = 3;
-                  { jjAddStates(23, 25); }
+                  { jjAddStates(20, 22); }
                   break;
                case 12:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(3, 5); }
+                     { jjCheckNAddStates(26, 28); }
                   break;
                case 28:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(58, 60); }
+                     { jjCheckNAddStates(59, 61); }
                   break;
                case 29:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
@@ -1604,11 +1667,11 @@ else if (curChar == 95)
                   break;
                case 67:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(20, 22); }
+                     { jjAddStates(17, 19); }
                   break;
                case 85:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjAddStates(17, 19); }
+                     { jjAddStates(14, 16); }
                   break;
                case 104:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1618,40 +1681,40 @@ else if (curChar == 95)
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjAddStates(50, 53); }
                   break;
-               case 155:
+               case 158:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 156:
+               case 159:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 51)
                      kind = 51;
-                  { jjCheckNAdd(156); }
+                  { jjCheckNAdd(159); }
                   break;
-               case 158:
+               case 161:
                   if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAdd(159); }
+                  { jjCheckNAdd(162); }
                   break;
-               case 159:
+               case 162:
                   if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 7)
                      kind = 7;
-                  { jjCheckNAdd(159); }
+                  { jjCheckNAdd(162); }
                   break;
-               case 160:
+               case 163:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 8)
                      kind = 8;
-                  jjstateSet[jjnewStateCnt++] = 160;
+                  jjstateSet[jjnewStateCnt++] = 163;
                   break;
                default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
             }
@@ -1664,7 +1727,7 @@ else if (curChar == 95)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 184 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 187 - (jjnewStateCnt = startsAt)))
          return curPos;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { return curPos; }
@@ -1673,11 +1736,11 @@ else if (curChar == 95)
 
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
-"", null, null, null, null, null, null, null, null, "\ufeff", null, null, null,
-null, null, null, null, null, null, null, null, null, null, null, null, "\50",
-"\51", "\173", "\175", "\133", "\135", "\74\74", "\76\76", "\136\136", null, null,
-null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-null, null, null, };
+"", null, null, null, null, null, null, null, null, "\ufeff", null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, "\50", 
+"\51", "\173", "\175", "\133", "\135", "\74\74\50", "\51\76\76", "\136\136", null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, };
 protected Token jjFillToken()
 {
    final Token t;
@@ -1702,12 +1765,12 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   32, 43, 45, 12, 13, 14, 162, 163, 164, 168, 169, 175, 176, 162, 163, 166,
-   168, 85, 86, 87, 67, 68, 69, 7, 8, 10, 2, 3, 5, 33, 34, 35,
-   37, 38, 40, 49, 60, 62, 50, 51, 52, 54, 55, 57, 103, 104, 105, 107,
-   106, 123, 127, 128, 129, 131, 130, 147, 15, 24, 29, 30, 31, 36, 42, 53,
-   59, 70, 71, 80, 88, 89, 98, 108, 109, 118, 132, 133, 142, 172, 173, 177,
-   178, 182, 183,
+   32, 43, 45, 165, 166, 167, 171, 172, 178, 179, 165, 166, 169, 171, 85, 86, 
+   87, 67, 68, 69, 7, 8, 10, 2, 3, 5, 12, 13, 14, 33, 34, 35, 
+   37, 38, 40, 49, 60, 62, 50, 51, 52, 54, 55, 57, 103, 104, 105, 107, 
+   106, 123, 127, 128, 129, 131, 130, 147, 152, 153, 156, 29, 30, 31, 15, 24, 
+   36, 42, 53, 59, 70, 71, 80, 88, 89, 98, 108, 109, 118, 132, 133, 142, 
+   151, 152, 156, 175, 176, 180, 181, 185, 186, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -1778,7 +1841,7 @@ private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, lo
 int jjmatchedKind;
 
 /** Get the next Token. */
-public Token getNextToken()
+public Token getNextToken() 
 {
   Token specialToken = null;
   Token matchedToken;
@@ -1920,7 +1983,7 @@ public SSE_ParserCoreTokenManager (SimpleCharStream stream, int lexState){
   }
 
   /** Reinitialise parser. */
-
+  
   public void ReInit(SimpleCharStream stream)
   {
 
@@ -1937,13 +2000,13 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 184; i-- > 0;)
+    for (i = 187; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
   /** Reinitialise parser. */
   public void ReInit(SimpleCharStream stream, int lexState)
-
+  
   {
     ReInit(stream);
     SwitchTo(lexState);
@@ -1966,26 +2029,26 @@ public void SwitchTo(int lexState)
 
 /** Lex State array. */
 public static final int[] jjnewLexState = {
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-   -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0x80007ffe03bf3L,
+   0x80007ffe03bf3L, 
 };
 static final long[] jjtoSkip = {
-   0xcL,
+   0xcL, 
 };
 static final long[] jjtoSpecial = {
-   0xcL,
+   0xcL, 
 };
 static final long[] jjtoMore = {
-   0x0L,
+   0x0L, 
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[184];
-    private final int[] jjstateSet = new int[2 * 184];
+    private final int[] jjrounds = new int[187];
+    private final int[] jjstateSet = new int[2 * 187];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java
index a9745aa32ec..64f39903a69 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/SimpleCharStream.java
@@ -1,5 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 7.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
 
 /**
@@ -469,4 +487,4 @@ public void adjustBeginLineColumn(int newLine, int newCol)
   boolean getTrackLineColumn() { return trackLineColumn; }
   void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 }
-/* JavaCC - OriginalChecksum=2e5845acf1ed00288deeebfdbcc4efbd (do not edit this line) */
+/* JavaCC - OriginalChecksum=f8ad3934f2c9d922ed3e21f069e7fdbe (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
index a51b2aba253..0ef3d19c879 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/Token.java
@@ -1,5 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 7.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COLUMN=true,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
 
 /**
@@ -129,4 +147,4 @@ public static Token newToken(int ofKind)
   }
 
 }
-/* JavaCC - OriginalChecksum=61c19e89b70d17d05ab1b1c25fd29a83 (do not edit this line) */
+/* JavaCC - OriginalChecksum=b470e52e9e469b5131fc43edbb483298 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java
index 3b738498285..4649a605528 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/parser/TokenMgrError.java
@@ -1,5 +1,23 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 7.0 */
 /* JavaCCOptions: */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.jena.sparql.sse.lang.parser ;
 
 /** Token Manager Error. */
@@ -105,11 +123,10 @@ protected static final String addEscapes(String str) {
    * Note: You can customize the lexical error message by modifying this method.
    */
   protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-    char curChar1 = (char)curChar;
     return("Lexical error at line " + //
           errorLine + ", column " + //
           errorColumn + ".  Encountered: " + //
-          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + (int)curChar + "),")) + //
+          (EOFSeen ? "<EOF>" : ("'" + addEscapes(String.valueOf(curChar)) + "' (" + curChar + "),")) + //
           (errorAfter == null || errorAfter.length() == 0 ? "" : " after prefix \"" + addEscapes(errorAfter) + "\"")) + //
           (lexState == 0 ? "" : " (in lexical state " + lexState + ")");
   }
@@ -147,4 +164,4 @@ public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColu
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
   }
 }
-/* JavaCC - OriginalChecksum=add602dc0be797a95372d50091a2b992 (do not edit this line) */
+/* JavaCC - OriginalChecksum=5a878c0dbfeb1b80583c6ddf2c88a8f6 (do not edit this line) */
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/writers/WriterOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/writers/WriterOp.java
index dd3672cab4b..5bec9053aa5 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/writers/WriterOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/writers/WriterOp.java
@@ -295,11 +295,6 @@ public void visit(OpLeftJoin opLeftJoin) {
             visitOp2(opLeftJoin, opLeftJoin.getExprs());
         }
 
-        @Override
-        public void visit(OpDiff opDiff) {
-            visitOp2(opDiff);
-        }
-
         @Override
         public void visit(OpMinus opMinus) {
             visitOp2(opMinus);
@@ -315,6 +310,16 @@ public void visit(OpLateral opLateral) {
             visitOp2(opLateral);
         }
 
+        @Override
+        public void visit(OpSemiJoin opSemiJoin) {
+            visitOp2(opSemiJoin);
+        }
+
+        @Override
+        public void visit(OpAntiJoin opAntiJoin) {
+            visitOp2(opAntiJoin);
+        }
+
         @Override
         public void visit(OpConditional opCondition) {
             visitOp2(opCondition);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Element.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Element.java
index c9ec7cc1c82..ee66fa16080 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Element.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Element.java
@@ -18,48 +18,48 @@
 
 package org.apache.jena.sparql.syntax;
 
-import org.apache.jena.sparql.serializer.FormatterElement ;
-import org.apache.jena.sparql.util.NodeIsomorphismMap ;
+import org.apache.jena.sparql.serializer.FormatterElement;
+import org.apache.jena.sparql.util.NodeIsomorphismMap;
 
 /** Element - abstract class for all pattern elements */
-
 public abstract class Element
 {
-    public abstract void visit(ElementVisitor v) ;
+    public abstract void visit(ElementVisitor v);
 
     @Override
-    public abstract int hashCode() ;
+    public abstract int hashCode();
     // If the labelMap is null, do .equals() on nodes, else map from
-    // bNode varables in one to bNodes variables in the other
-    public abstract boolean equalTo(Element el2, NodeIsomorphismMap isoMap) ;
+    // bNode variables in one to bNodes variables in the other
+    public abstract boolean equalTo(Element el2, NodeIsomorphismMap isoMap);
 
     @Override
-    final public boolean equals(Object el2)
-    {
-        if ( this == el2 ) return true ;
+    final public boolean equals(Object el2) {
+        if ( this == el2 )
+            return true;
 
-        if ( ! ( el2 instanceof Element ) )
-            return false ;
-        return equalTo((Element)el2, null) ;
+        if ( !(el2 instanceof Element) )
+            return false;
+        return equalTo((Element)el2, null);
     }
 
     @Override
-    public String toString()
-    {
-        return FormatterElement.asString(this) ;
+    public String toString() {
+        return FormatterElement.asString(this);
     }
 
     // Constants used in hashing to stop an element and it's subelement
     // (if just one) having the same hash.
 
-    static final int HashBasicGraphPattern    = 0xA1 ;
-    static final int HashGroup                = 0xA2 ;
-    static final int HashUnion                = 0xA3 ;
-    static final int HashOptional             = 0xA4 ;
-    // static final int HashGraph                = 0xA5 ; // Not needed
-    static final int HashExists               = 0xA6 ;
-    static final int HashNotExists            = 0xA7 ;
-    static final int HashPath                 = 0xA8 ;
-    static final int HashFetch                = 0xA9 ;
-    static final int HashLateral              = 0xAA ;
+    static final int HashBasicGraphPattern    = 0xA1;
+    static final int HashGroup                = 0xA2;
+    static final int HashUnion                = 0xA3;
+    static final int HashOptional             = 0xA4;
+    // static final int HashGraph                = 0xA5; // Not needed
+    static final int HashExists               = 0xA6;
+    static final int HashNotExists            = 0xA7;
+    static final int HashPath                 = 0xA8;
+    static final int HashFetch                = 0xA9;
+    static final int HashLateral              = 0xAA;
+    static final int HashSemiJoin             = 0xAB;
+    static final int HashAntiJoin             = 0xAC;
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementAntiJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementAntiJoin.java
new file mode 100644
index 00000000000..e180ac0f456
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementAntiJoin.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.syntax;
+
+import java.util.List;
+
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.util.NodeIsomorphismMap;
+
+/** ANTIJOIN */
+public class ElementAntiJoin extends Element
+{
+    private final Element right;
+
+    public ElementAntiJoin(Element right) {
+        this(right, null, false);
+    }
+
+    private ElementAntiJoin(Element right, List<Var> vars, boolean seenStar) {
+        this.right = right;
+    }
+
+    public Element getSubElement()  { return right; }
+
+    @Override
+    public int hashCode() {
+        int hash = Element.HashAntiJoin;
+        hash = hash ^ getSubElement().hashCode();
+        return hash;
+    }
+
+    @Override
+    public boolean equalTo(Element el2, NodeIsomorphismMap isoMap) {
+        if ( el2 == null ) return false;
+        if ( ! ( el2 instanceof ElementAntiJoin ) )
+            return false;
+        ElementAntiJoin other = (ElementAntiJoin)el2;
+        return getSubElement().equalTo(other.getSubElement(), isoMap);
+    }
+
+    @Override
+    public void visit(ElementVisitor v) { v.visit(this); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementLateral.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementLateral.java
index b2116174fa6..0ab3d3f9690 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementLateral.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementLateral.java
@@ -24,7 +24,6 @@
 import org.apache.jena.sparql.util.NodeIsomorphismMap;
 
 /** LATERAL */
-
 public class ElementLateral extends Element
 {
     private final Element right ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementSemiJoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementSemiJoin.java
new file mode 100644
index 00000000000..9d56e57138b
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementSemiJoin.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.syntax;
+
+import java.util.List;
+
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.util.NodeIsomorphismMap;
+
+/** SEMIJOIN */
+public class ElementSemiJoin extends Element
+{
+    private final Element right;
+
+    public ElementSemiJoin(Element right) {
+        this(right, null, false);
+    }
+
+    private ElementSemiJoin(Element right, List<Var> vars, boolean seenStar) {
+        this.right = right;
+    }
+
+    public Element getSubElement()  { return right; }
+
+    @Override
+    public int hashCode() {
+        int hash = Element.HashSemiJoin;
+        hash = hash ^ getSubElement().hashCode();
+        return hash;
+    }
+
+    @Override
+    public boolean equalTo(Element el2, NodeIsomorphismMap isoMap) {
+        if ( el2 == null ) return false;
+        if ( ! ( el2 instanceof ElementSemiJoin ) )
+            return false;
+        ElementSemiJoin other = (ElementSemiJoin)el2;
+        return getSubElement().equalTo(other.getSubElement(), isoMap);
+    }
+
+    @Override
+    public void visit(ElementVisitor v) { v.visit(this); }
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitor.java
index 516f5ac693f..12ef2c1919f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitor.java
@@ -20,22 +20,24 @@
 
 public interface ElementVisitor
 {
-    public void visit(ElementTriplesBlock el) ;
-    public void visit(ElementPathBlock el) ;
-    public void visit(ElementFilter el) ;
-    public void visit(ElementAssign el) ;
-    public void visit(ElementBind el) ;
-    public void visit(ElementUnfold el) ;
-    public void visit(ElementData el) ;
-    public void visit(ElementUnion el) ;
-    public void visit(ElementOptional el) ;
-    public void visit(ElementLateral el) ;
-    public void visit(ElementGroup el) ;
-    public void visit(ElementDataset el) ;
-    public void visit(ElementNamedGraph el) ;
-    public void visit(ElementExists el) ;
-    public void visit(ElementNotExists el) ;
-    public void visit(ElementMinus el) ;
-    public void visit(ElementService el) ;
-    public void visit(ElementSubQuery el) ;
+    public void visit(ElementTriplesBlock el);
+    public void visit(ElementPathBlock el);
+    public void visit(ElementFilter el);
+    public void visit(ElementAssign el);
+    public void visit(ElementBind el);
+    public void visit(ElementUnfold el);
+    public void visit(ElementData el);
+    public void visit(ElementUnion el);
+    public void visit(ElementOptional el);
+    public void visit(ElementLateral el);
+    public void visit(ElementSemiJoin el);
+    public void visit(ElementAntiJoin el);
+    public void visit(ElementGroup el);
+    public void visit(ElementDataset el);
+    public void visit(ElementNamedGraph el);
+    public void visit(ElementExists el);
+    public void visit(ElementNotExists el);
+    public void visit(ElementMinus el);
+    public void visit(ElementService el);
+    public void visit(ElementSubQuery el);
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitorBase.java
index 83fa6e85d55..87821bc227b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementVisitorBase.java
@@ -54,6 +54,12 @@ public void visit(ElementOptional el)       { }
     @Override
     public void visit(ElementLateral el)        { }
 
+    @Override
+    public void visit(ElementSemiJoin el)       { }
+
+    @Override
+    public void visit(ElementAntiJoin el)       { }
+
     @Override
     public void visit(ElementGroup el)          { }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
index b94b3df5ac9..4ee224802ff 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
@@ -141,6 +141,24 @@ public void visit(ElementLateral el) {
             after(el);
         }
 
+        @Override
+        public void visit(ElementSemiJoin el) {
+            before(el);
+            if ( el.getSubElement() != null )
+                el.getSubElement().visit(this);
+            proc.visit(el);
+            after(el);
+        }
+
+        @Override
+        public void visit(ElementAntiJoin el) {
+            before(el);
+            if ( el.getSubElement() != null )
+                el.getSubElement().visit(this);
+            proc.visit(el);
+            after(el);
+        }
+
         @Override
         public void visit(ElementDataset el) {
             before(el);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVars.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVars.java
index a7e8c7ec58a..e0a5eefc785 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVars.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVars.java
@@ -18,46 +18,125 @@
 
 package org.apache.jena.sparql.syntax;
 
-import java.util.Collection ;
-import java.util.LinkedHashSet ;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
 
-import org.apache.jena.sparql.core.Var ;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.sparql.core.TriplePath;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.core.VarExprList;
+import org.apache.jena.sparql.util.VarUtils;
 
-/** Get the variables potentially bound by an element.
- *  All mentioned variables except those in MINUS and FILTER (and hence NOT EXISTS)
- *  The work is done by PatternVarsVisitor.
+/**
+ * Get the variables potentially bound by an element. All mentioned variables except
+ * those in MINUS, SEMIJOIN, ANTIJOIN and FILTER (and hence NOT EXISTS).
  */
-public class PatternVars
-{
-    public static Collection<Var> vars(Element element) { return vars(new LinkedHashSet<Var>(), element) ; }
+public class PatternVars {
+    public static Collection<Var> vars(Element element) {
+        return vars(new LinkedHashSet<Var>(), element);
+    }
 
-    public static Collection<Var> vars(Collection<Var> s, Element element)
-    {
-        PatternVarsVisitor v = new PatternVarsVisitor(s) ;
-        vars(element, v) ;
-        return s ;
+    public static Collection<Var> vars(Collection<Var> s, Element element) {
+        PatternVarsVisitor v = new PatternVarsVisitor(s);
+        vars(element, v);
+        return s;
     }
 
-    public static void vars(Element element, PatternVarsVisitor visitor)
-    {
-        ElementWalker.EltWalker walker = new WalkerSkipMinus(visitor) ;
-        ElementWalker.walk$(element, walker) ;
+    public static void vars(Element element, PatternVarsVisitor visitor) {
+        ElementWalker.EltWalker walker = new WalkerSkipNonBinding(visitor);
+        ElementWalker.walk$(element, walker);
+    }
+
+    /** Algebra forms that don't contribute variables to "SELECT *". */
+    private static class WalkerSkipNonBinding extends ElementWalker.EltWalker {
+        protected WalkerSkipNonBinding(ElementVisitor visitor) {
+            super(visitor, null, null);
+        }
+
+        @Override
+        public void visit(ElementMinus el) { proc.visit(el); }
+
+        @Override
+        public void visit(ElementSemiJoin el) { proc.visit(el); }
+
+        @Override
+        public void visit(ElementAntiJoin el) { proc.visit(el); }
     }
 
-    public static class WalkerSkipMinus extends ElementWalker.EltWalker
+    private static class PatternVarsVisitor extends ElementVisitorBase
     {
-        protected WalkerSkipMinus(ElementVisitor visitor)
-        {
-            super(visitor, null, null) ;
+        public Collection<Var> acc;
+        /*package*/ PatternVarsVisitor(Collection<Var> s) {
+            acc = s;
+        }
+
+        @Override
+        public void visit(ElementTriplesBlock el) {
+            for ( Iterator<Triple> iter = el.patternElts(); iter.hasNext(); ) {
+                Triple t = iter.next();
+                VarUtils.addVarsFromTriple(acc, t);
+            }
+        }
+
+        @Override
+        public void visit(ElementPathBlock el) {
+            for ( Iterator<TriplePath> iter = el.patternElts(); iter.hasNext(); ) {
+                TriplePath tp = iter.next();
+                // If it's triple-izable, then use the triple.
+                if ( tp.isTriple() )
+                    VarUtils.addVarsFromTriple(acc, tp.asTriple());
+                else
+                    VarUtils.addVarsFromTriplePath(acc, tp);
+            }
         }
-        
+
+        // Variables here are non-binding.
+        @Override public void visit(ElementExists el)       { }
+        @Override public void visit(ElementNotExists el)    { }
+        @Override public void visit(ElementMinus el)        { }
+        @Override public void visit(ElementSemiJoin el)     { }
+        @Override public void visit(ElementAntiJoin el)     { }
+        @Override public void visit(ElementFilter el)       { }
+
+        @Override
+        public void visit(ElementNamedGraph el) {
+            VarUtils.addVar(acc, el.getGraphNameNode());
+        }
+
+        @Override
+        public void visit(ElementSubQuery el) {
+            el.getQuery().setResultVars();
+            VarExprList x = el.getQuery().getProject();
+            acc.addAll(x.getVars());
+        }
+
+        @Override
+        public void visit(ElementAssign el) {
+            acc.add(el.getVar());
+        }
+
+        @Override
+        public void visit(ElementBind el) {
+            acc.add(el.getVar());
+        }
+
         @Override
-        public void visit(ElementMinus el)
-        {
-            // Don't go down the RHS of MINUS
-            //if ( el.getMinusElement() != null )
-            //    el.getMinusElement().visit(this) ;
-            proc.visit(el) ;
+        public void visit(ElementUnfold el) {
+            acc.add(el.getVar1());
+            if ( el.getVar2() != null )
+                acc.add(el.getVar2());
         }
+
+        @Override
+        public void visit(ElementData el) {
+            acc.addAll(el.getVars());
+        }
+
+//        @Override
+//        public void visit(ElementService el) {
+//            // Although if this isn't defined elsewhere the query won't work.
+//            VarUtils.addVar(acc, el.getServiceNode());
+//        }
     }
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVarsVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVarsVisitor.java
deleted file mode 100644
index 362077bbbcb..00000000000
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/PatternVarsVisitor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.syntax;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.jena.graph.Triple;
-import org.apache.jena.sparql.core.TriplePath;
-import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.core.VarExprList;
-import org.apache.jena.sparql.util.VarUtils;
-
-public class PatternVarsVisitor extends ElementVisitorBase
-{
-    public Collection<Var> acc;
-    public PatternVarsVisitor(Collection<Var> s) {
-        acc = s;
-    }
-
-    @Override
-    public void visit(ElementTriplesBlock el) {
-        for ( Iterator<Triple> iter = el.patternElts() ; iter.hasNext() ; ) {
-            Triple t = iter.next();
-            VarUtils.addVarsFromTriple(acc, t);
-        }
-    }
-
-    @Override
-    public void visit(ElementPathBlock el) {
-        for ( Iterator<TriplePath> iter = el.patternElts() ; iter.hasNext() ; ) {
-            TriplePath tp = iter.next();
-            // If it's triple-izable, then use the triple.
-            if ( tp.isTriple() )
-                VarUtils.addVarsFromTriple(acc, tp.asTriple());
-            else
-                VarUtils.addVarsFromTriplePath(acc, tp);
-        }
-    }
-
-    // Variables here are non-binding.
-    @Override public void visit(ElementExists el)       { }
-    @Override public void visit(ElementNotExists el)    { }
-    @Override public void visit(ElementMinus el)        { }
-    @Override public void visit(ElementFilter el)       { }
-
-    @Override
-    public void visit(ElementNamedGraph el) {
-        VarUtils.addVar(acc, el.getGraphNameNode());
-    }
-
-    @Override
-    public void visit(ElementSubQuery el) {
-        el.getQuery().setResultVars();
-        VarExprList x = el.getQuery().getProject();
-        acc.addAll(x.getVars());
-    }
-
-    @Override
-    public void visit(ElementAssign el) {
-        acc.add(el.getVar());
-    }
-
-    @Override
-    public void visit(ElementBind el) {
-        acc.add(el.getVar());
-    }
-
-    @Override
-    public void visit(ElementUnfold el) {
-        acc.add(el.getVar1());
-        if ( el.getVar2() != null )
-            acc.add(el.getVar2());
-    }
-
-    @Override
-    public void visit(ElementData el) {
-        acc.addAll(el.getVars());
-    }
-
-//    @Override
-//    public void visit(ElementService el) {
-//        // Although if this isn't defined elsewhere the query won't work.
-//        VarUtils.addVar(acc, el.getServiceNode());
-//    }
-}
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
index 4b54d16f13c..4ec055be5fd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ApplyElementTransformVisitor.java
@@ -131,6 +131,20 @@ public void visit(ElementLateral el) {
         push(el2);
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        Element elSub = pop();
+        Element el2 = transform.transform(el, elSub);
+        push(el2);
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        Element elSub = pop();
+        Element el2 = transform.transform(el, elSub);
+        push(el2);
+    }
+
     @Override
     public void visit(ElementGroup el) {
         ElementGroup newElt = new ElementGroup();
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransform.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransform.java
index effab2e5f46..0b30534c724 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransform.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransform.java
@@ -45,7 +45,9 @@ public interface ElementTransform
     public Element transform(ElementDataset el, Element subElt);
     public Element transform(ElementUnion el, List<Element> elements);
     public Element transform(ElementOptional el, Element opElt);
-    public Element transform(ElementLateral el, Element opElt);
+    public Element transform(ElementLateral el, Element subElt);
+    public Element transform(ElementSemiJoin el, Element subElt);
+    public Element transform(ElementAntiJoin el, Element subElt);
     public Element transform(ElementGroup el, List<Element> members);
     public Element transform(ElementNamedGraph el, Node gn, Element subElt);
     public Element transform(ElementExists el, Element subElt);
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformCopyBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformCopyBase.java
index 86212444fe9..e647ac64bf3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformCopyBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformCopyBase.java
@@ -142,6 +142,20 @@ public Element transform(ElementLateral el, Element elt1) {
         return new ElementLateral(elt1);
     }
 
+    @Override
+    public Element transform(ElementSemiJoin el, Element elt1) {
+        if ( !alwaysCopy && el.getSubElement() == elt1 )
+            return el;
+        return new ElementSemiJoin(elt1);
+    }
+
+    @Override
+    public Element transform(ElementAntiJoin el, Element elt1) {
+        if ( !alwaysCopy && el.getSubElement() == elt1 )
+            return el;
+        return new ElementAntiJoin(elt1);
+    }
+
     @Override
     public Element transform(ElementGroup el, List<Element> elts) {
         if ( !alwaysCopy && el.getElements() == elts )
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformIdentity.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformIdentity.java
index 2080a57798c..b0c0de37cd3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformIdentity.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformIdentity.java
@@ -65,6 +65,10 @@ private ElementTransformIdentity() {}
     @Override
     public Element transform(ElementLateral el, Element subElt) { return el; }
     @Override
+    public Element transform(ElementSemiJoin el, Element subElt) { return el; }
+    @Override
+    public Element transform(ElementAntiJoin el, Element subElt) { return el; }
+    @Override
     public Element transform(ElementGroup el, List<Element> members) { return el; }
     @Override
     public Element transform(ElementDataset el, Element subElt) { return el; }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
index cd40a017ab2..f77f6c4790b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
@@ -26,6 +26,7 @@
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Node_Literal ;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.irix.IRIException;
 import org.apache.jena.irix.IRIx;
@@ -180,7 +181,8 @@ public static String stringForLiteral(Node_Literal literal, SerializationContext
     public static void stringForLiteral(StringBuilder result, Node_Literal literal, SerializationContext context) {
         String datatype = literal.getLiteralDatatypeURI();
         String lang = literal.getLiteralLanguage();
-        String s = literal.getLiteralLexicalForm();
+        String lex = literal.getLiteralLexicalForm();
+       TextDirection textDir = literal.getLiteralBaseDirection();
 
         // For some literals we can use plain literal form unless the Serialization
         // Context explicitly says not to. For backwards compatibility if using a
@@ -191,14 +193,14 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
             // Assume valid text
             if ( datatype.equals(XSD.integer.getURI()) ) {
                 try {
-                    String s1 = s;
+                    String s1 = lex;
                     // BigInteger does not allow leading +
                     // so chop it off before the format test
                     // BigDecimal does allow a leading +
-                    if ( s.startsWith("+") )
-                        s1 = s.substring(1);
+                    if ( lex.startsWith("+") )
+                        s1 = lex.substring(1);
                     new java.math.BigInteger(s1);
-                    result.append(s);
+                    result.append(lex);
                     return;
                 } catch (NumberFormatException nfe) {}
                 // No luck. Continue.
@@ -206,11 +208,11 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
             }
 
             if ( datatype.equals(XSD.decimal.getURI()) ) {
-                if ( s.indexOf('.') > 0 ) {
+                if ( lex.indexOf('.') > 0 ) {
                     try {
                         // BigDecimal does allow a leading +
-                        new java.math.BigDecimal(s);
-                        result.append(s);
+                        new java.math.BigDecimal(lex);
+                        result.append(lex);
                         return;
                     } catch (NumberFormatException nfe) {}
                     // No luck. Continue.
@@ -221,10 +223,10 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
                 // Assumes SPARQL has decimals and doubles.
                 // Must have 'e' or 'E' to be a double short form.
 
-                if ( s.indexOf('e') >= 0 || s.indexOf('E') >= 0 ) {
+                if ( lex.indexOf('e') >= 0 || lex.indexOf('E') >= 0 ) {
                     try {
-                        Double.parseDouble(s);
-                        result.append(s);
+                        Double.parseDouble(lex);
+                        result.append(lex);
                         return;  // returm the original lexical form.
                     } catch (NumberFormatException nfe) {}
                     // No luck. Continue.
@@ -236,8 +238,8 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
                 // The lexical form must be lower case.
                 // if ( s.equals("true") || s.equals("1") ) return s ;
                 // if ( s.equals("false") || s.equals("0") ) return s ;
-                if ( s.equals("true") || s.equals("false") ) {
-                    result.append(s);
+                if ( lex.equals("true") || lex.equals("false") ) {
+                    result.append(lex);
                     return;
                 }
 
@@ -246,7 +248,7 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
         }
 
         result.append("\"");
-        stringEsc(result, s, true);
+        stringEsc(result, lex, true);
         result.append("\"");
 
         if ( NodeUtils.isSimpleString(literal) ) {
@@ -254,6 +256,14 @@ public static void stringForLiteral(StringBuilder result, Node_Literal literal,
             return;
         }
 
+        if ( NodeUtils.isDirLangString(literal) ) {
+            result.append("@");
+            result.append(lang);
+            result.append("--");
+            result.append(textDir.direction());
+            return;
+        }
+
         if ( NodeUtils.isLangString(literal) ) {
             result.append("@");
             result.append(lang);
@@ -340,15 +350,15 @@ public static void stringForNode(StringBuilder result, Node n, SerializationCont
             result.append("?").append(n.getName());
         } else if ( n.equals(Node.ANY) ) {
             result.append("ANY");
-        } else if ( n.isNodeTriple() ) {
+        } else if ( n.isTripleTerm() ) {
             Triple t = n.getTriple();
-            result.append("<< ");
+            result.append("<<( ");
             stringForNode(result, t.getSubject(), context);
             result.append(" ");
             stringForNode(result, t.getPredicate(), context);
             result.append(" ");
             stringForNode(result, t.getObject(), context);
-            result.append(" >>");
+            result.append(" )>>");
         } else if ( n.isNodeGraph() ) {
             Log.warn(FmtUtils.class, "Can not turn a graph term node into a string");
             result.append(" { graph }");
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoAlg.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoAlg.java
index 30bab5708c3..734cf57ea9c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoAlg.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/IsoAlg.java
@@ -247,7 +247,7 @@ private static boolean containsMappable(Tuple<Node> tuple) {
                 return true;
             if ( n.isVariable() )
                 return true;
-            if ( n.isNodeTriple() ) {
+            if ( n.isTripleTerm() ) {
                 Tuple<Node> tuple1 = tripleToTuple.apply(n.getTriple());
                 boolean b = containsMappable(tuple1);
                 if ( b )
@@ -311,8 +311,8 @@ static Mapping gen(Node n1, Node n2, Mapping _mapping, Iso.Mappable mappable, Eq
             return null;
         }
 
-        if ( n1.isNodeTriple() ) {
-            if ( n2.isNodeTriple() ) {
+        if ( n1.isTripleTerm() ) {
+            if ( n2.isTripleTerm() ) {
                 Triple t1 = n1.getTriple();
                 Triple t2 = n2.getTriple();
                 Tuple<Node> tuple1 = tripleToTuple.apply(t1);
@@ -320,7 +320,7 @@ static Mapping gen(Node n1, Node n2, Mapping _mapping, Iso.Mappable mappable, Eq
                 // Whether to records the triple term mapping.
                 return gen(tuple1, tuple2, mapping, mappable, nodeTest);
             }
-        } else if ( n2.isNodeTriple() ) {
+        } else if ( n2.isTripleTerm() ) {
             return null;
         }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java
index 48c698e3a62..2837eafd851 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/ModelUtils.java
@@ -58,7 +58,7 @@ public static RDFNode convertGraphNodeToRDFNode(Node node, Model model) {
         if ( node.isURI() || node.isBlank() )
             return new ResourceImpl(node, null) ;
 
-        if ( node.isNodeTriple() )
+        if ( node.isTripleTerm() )
             return new ResourceImpl(node, null) ;
 
         throw new ARQInternalErrorException("Unknown node type for node: "+node) ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeCmp.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeCmp.java
index 2e121c6df74..884733a21b3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeCmp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeCmp.java
@@ -103,8 +103,8 @@ public static int compareRDFTerms(Node node1, Node node2) {
             return Expr.CMP_LESS;
 
         // -- Triple nodes.
-        if ( node1.isNodeTriple() ) {
-            if ( node2.isNodeTriple() ) {
+        if ( node1.isTripleTerm() ) {
+            if ( node2.isTripleTerm() ) {
                 Triple t1 = node1.getTriple();
                 Triple t2 = node2.getTriple();
                 int x1 = compareRDFTerms(t1.getSubject(), t2.getSubject());
@@ -120,7 +120,7 @@ public static int compareRDFTerms(Node node1, Node node2) {
             }
         }
 
-        if ( node2.isNodeTriple() )
+        if ( node2.isTripleTerm() )
             return Expr.CMP_GREATER;
 
         // No URIs, no blanks, no literals, no triple terms nodes by this point
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeFactoryExtra.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeFactoryExtra.java
index 7e6e760a40a..1ec4d255d30 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeFactoryExtra.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeFactoryExtra.java
@@ -26,6 +26,7 @@
 import org.apache.jena.datatypes.xsd.XSDDatatype ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.graph.impl.LiteralLabel ;
 import org.apache.jena.riot.RiotException ;
 import org.apache.jena.riot.system.PrefixMap ;
@@ -85,8 +86,21 @@ public static Node parseNode(String nodeString, PrefixMap pmap) {
         return node ;
     }
 
-    /** Create a literal Node, when the datatype, if given, is a string */
+    /**
+     * Create a literal Node, when the datatype, if given, is a string.
+     * @deprecated Use {@link NodeFactory#createLiteral(String, String, RDFDatatype)}
+     */
+    @Deprecated(forRemoval = true)
     public static Node createLiteralNode(String lex, String lang, String datatypeURI) {
+        return createLiteralNode(lex, lang, null, datatypeURI);
+    }
+
+    /**
+     * Create a literal Node, when the datatype, if given, is a string.
+     * @deprecated Use {@link NodeFactory#createLiteral(String, String, String, RDFDatatype)}
+     */
+    @Deprecated(forRemoval = true)
+    public static Node createLiteralNode(String lex, String lang, String baseDir, String datatypeURI) {
         if ( datatypeURI != null && datatypeURI.equals("") )
             datatypeURI = null ;
 
@@ -97,7 +111,9 @@ public static Node createLiteralNode(String lex, String lang, String datatypeURI
         if ( datatypeURI != null )
             dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI) ;
 
-        Node n = NodeFactory.createLiteral(lex, lang, dType) ;
+        TextDirection baseDirection = TextDirection.createOrNull(baseDir);
+
+        Node n = NodeFactory.createLiteral(lex, lang, baseDirection, dType) ;
         return n ;
     }
 
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
index d1d50056c2e..c47a59ff0bc 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
@@ -21,16 +21,17 @@
 import java.util.*;
 
 import org.apache.jena.atlas.lib.SetUtils;
-import org.apache.jena.datatypes.RDFDatatype ;
-import org.apache.jena.datatypes.xsd.XSDDatatype ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.xsd.XSDDatatype;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.rdf.model.impl.Util;
-import org.apache.jena.sparql.expr.ExprEvalException ;
-import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.expr.nodevalue.NodeFunctions ;
-import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.WrappedIterator ;
+import org.apache.jena.sparql.expr.ExprEvalException;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
+import org.apache.jena.util.iterator.ExtendedIterator;
+import org.apache.jena.util.iterator.WrappedIterator;
 
 /**
  *  Node utilities.
@@ -40,19 +41,32 @@ public class NodeUtils
 {
     /** IRI string to Node */
     public static Node asNode(String iri) {
-        return NodeFactory.createURI(iri) ;
+        return NodeFactory.createURI(iri);
     }
 
-    /** Return true if the node is a literal and has a language tag */
+    /**
+     * Return true if the node is a literal and has a language tag.
+     * It may be a rdf:langString or rdf:dirLangString.
+     */
     public static boolean hasLang(Node node) {
         if ( !node.isLiteral() )
-            return false ;
-        String x = node.getLiteralLanguage() ;
+            return false;
+        String x = node.getLiteralLanguage();
         if ( x == null )
-            return false ;
+            return false;
         if ( x.equals("") )
-            return false ;
-        return true ;
+            return false;
+        return true;
+    }
+
+    /** Return true if the node is a literal and has an base direction */
+    public static boolean hasLangDir(Node node) {
+        if ( !node.isLiteral() )
+            return false;
+        TextDirection textDir = node.getLiteralBaseDirection();
+        if ( textDir == null )
+            return false;
+        return true;
     }
 
     /** Get lexical form of anything that looks like a string literal.
@@ -61,18 +75,18 @@ public static boolean hasLang(Node node) {
      */
     public static String stringLiteral(Node literal) {
         if ( !literal.isLiteral() )
-            return null ;
-        RDFDatatype dType = literal.getLiteralDatatype() ;
-        String langTag = literal.getLiteralLanguage() ;
+            return null;
+        RDFDatatype dType = literal.getLiteralDatatype();
+        String langTag = literal.getLiteralLanguage();
 
         // Language?
         if ( langTag != null && !langTag.equals("") )
-            return literal.getLiteralLexicalForm() ;
+            return literal.getLiteralLexicalForm();
 
         if ( dType == null || dType.equals(XSDDatatype.XSDstring) )
-            return literal.getLiteralLexicalForm() ;
+            return literal.getLiteralLexicalForm();
 
-        return null ;
+        return null;
     }
 
     public static Node nullToAny(Node n) {
@@ -81,9 +95,9 @@ public static Node nullToAny(Node n) {
 
     /** Convert IRI Nodes to strings.  Skip other kinds of Node */
     public static Iterator<String> nodesToURIs(Iterator<Node> iter) {
-        ExtendedIterator<Node> eIter = WrappedIterator.create(iter) ;
+        ExtendedIterator<Node> eIter = WrappedIterator.create(iter);
         Iterator<String> conv = eIter.filterKeep(Node::isURI).mapWith(Node::getURI);
-        return conv ;
+        return conv;
     }
 
     /** Convert a collection of strings to a set of {@link Node Nodes}. */
@@ -139,25 +153,25 @@ public static List<Node> convertToListNodes(List<String> namedGraphs) {
 
     static Set<RDFDatatype> numericDatatypes = new HashSet<>();
     static {
-        numericDatatypes.add(XSDDatatype.XSDdecimal) ;
-        numericDatatypes.add(XSDDatatype.XSDinteger) ;
+        numericDatatypes.add(XSDDatatype.XSDdecimal);
+        numericDatatypes.add(XSDDatatype.XSDinteger);
 
-        numericDatatypes.add(XSDDatatype.XSDlong) ;
-        numericDatatypes.add(XSDDatatype.XSDint) ;
-        numericDatatypes.add(XSDDatatype.XSDshort) ;
-        numericDatatypes.add(XSDDatatype.XSDbyte) ;
+        numericDatatypes.add(XSDDatatype.XSDlong);
+        numericDatatypes.add(XSDDatatype.XSDint);
+        numericDatatypes.add(XSDDatatype.XSDshort);
+        numericDatatypes.add(XSDDatatype.XSDbyte);
 
-        numericDatatypes.add(XSDDatatype.XSDnonPositiveInteger) ;
-        numericDatatypes.add(XSDDatatype.XSDnegativeInteger) ;
+        numericDatatypes.add(XSDDatatype.XSDnonPositiveInteger);
+        numericDatatypes.add(XSDDatatype.XSDnegativeInteger);
 
-        numericDatatypes.add(XSDDatatype.XSDnonNegativeInteger) ;
-        numericDatatypes.add(XSDDatatype.XSDpositiveInteger) ;
-        numericDatatypes.add(XSDDatatype.XSDunsignedLong) ;
-        numericDatatypes.add(XSDDatatype.XSDunsignedInt) ;
-        numericDatatypes.add(XSDDatatype.XSDunsignedShort) ;
+        numericDatatypes.add(XSDDatatype.XSDnonNegativeInteger);
+        numericDatatypes.add(XSDDatatype.XSDpositiveInteger);
+        numericDatatypes.add(XSDDatatype.XSDunsignedLong);
+        numericDatatypes.add(XSDDatatype.XSDunsignedInt);
+        numericDatatypes.add(XSDDatatype.XSDunsignedShort);
 
-        numericDatatypes.add(XSDDatatype.XSDdouble) ;
-        numericDatatypes.add(XSDDatatype.XSDfloat) ;
+        numericDatatypes.add(XSDDatatype.XSDdouble);
+        numericDatatypes.add(XSDDatatype.XSDfloat);
     }
 
     /**
@@ -176,12 +190,19 @@ public static boolean isXSDNumeric(Node node) {
      * <li>(RDF 1.1) xsd:string
      * </ul>
      */
-    public static boolean isSimpleString(Node n) { return Util.isSimpleString(n) ; }
+    public static boolean isSimpleString(Node n) { return Util.isSimpleString(n); }
+
+    /**
+     * A Node is a language string if it has a language tag.
+     * (RDF 1.0 and RDF 1.1)
+     */
+    public static boolean isLangString(Node n) { return Util.isLangString(n); }
 
     /**
      * A Node is a language string if it has a language tag.
      * (RDF 1.0 and RDF 1.1)
      */
-    public static boolean isLangString(Node n) { return Util.isLangString(n) ; }
+    public static boolean isDirLangString(Node n) { return Util.isDirLangString(n); }
+
 
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/ResultSetUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/ResultSetUtils.java
index 97f3f99cafe..f91e61017b7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/ResultSetUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/ResultSetUtils.java
@@ -23,20 +23,23 @@
 
 import org.apache.jena.query.QuerySolution ;
 import org.apache.jena.query.ResultSet ;
+import org.apache.jena.query.ResultSetRewindable;
 import org.apache.jena.rdf.model.Literal ;
 import org.apache.jena.rdf.model.RDFNode ;
 import org.apache.jena.rdf.model.Resource ;
 import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.resultset.ResultSetMem ;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.ResultSetStream;
+import org.apache.jena.sparql.engine.binding.Binding;
 
 public class ResultSetUtils
 {
     /**
      * Extracts a List filled with the binding of selectElement variable for each
      * query solution as RDFNodes (Resources or Literals).
-     * Exhausts the result set.  Create a rewindable one to use multiple times. 
-     *   
-     * @see org.apache.jena.query.ResultSetFactory   
+     * Exhausts the result set.  Create a rewindable one to use multiple times.
+     *
+     * @see org.apache.jena.query.ResultSetFactory
      */
     public static List<RDFNode> resultSetToList(ResultSet rs, String selectElement)
     {
@@ -50,11 +53,11 @@ public static List<RDFNode> resultSetToList(ResultSet rs, String selectElement)
         }
         return items ;
     }
-    
+
     /**
      * Extracts a List filled with the binding of selectElement variable for each
-     * query solution, turned into a string (URIs or lexical forms).  
-     * Exhausts the result set.  Create a rewindable one to use multiple times. 
+     * query solution, turned into a string (URIs or lexical forms).
+     * Exhausts the result set.  Create a rewindable one to use multiple times.
      * @see org.apache.jena.query.ResultSetFactory
      */
     public static List<String> resultSetToStringList(ResultSet rs,
@@ -75,21 +78,36 @@ else if ( rn.isAnon() )
             {
                 items.add( ((Resource)rn).getId().getLabelString() ) ;
             }
-            else 
+            else
                 throw new ARQException("Unknow thing in results : "+rn) ;
         }
         return items ;
     }
 
     /**
-     * Create an in-memory result set from an array of 
-     * ResulSets. It is assumed that all the ResultSets 
+     * Create an in-memory result set from a number of
+     * ResulSets. It is assumed that all the ResultSets
      * from the array have the same variables.
-     * 
+     * Row order is preserved.
+     * The input ResultSets are exhausted.
+     *
      * @param sets the ResultSets to concatenate.
+     * @returns ResultSetRewindable
      */
-    public static ResultSet union(ResultSet... sets) {
-        return new ResultSetMem(sets);
+    public static ResultSetRewindable merge(ResultSet... sets) {
+        List<Var> vars = new ArrayList<>();
+        List<Binding> rows = new ArrayList<>();
+        for ( ResultSet rs : sets ) {
+            for ( ; rs.hasNext() ; ) {
+                Binding binding = rs.nextBinding();
+                binding.vars().forEachRemaining(v-> {
+                    if ( !vars.contains(v) ) {
+                        vars.add(v);
+                    }
+                });
+                rows.add(binding);
+            }
+        }
+        return ResultSetStream.create(vars, rows.iterator()).rewindable();
     }
-    
 }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
index 7d3abcb7e8d..6312c4155d6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/VarUtils.java
@@ -58,7 +58,7 @@ public static void addVar(Collection<Var> acc, Node n) {
 
         if ( n.isVariable() )
             acc.add(Var.alloc(n));
-        else if ( n.isNodeTriple() ) {
+        else if ( n.isTripleTerm() ) {
             Triple t = n.getTriple();
             addVarsFromTriple(acc, t);
         }
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifestX.java b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifestX.java
index d2351d348fc..b99b8dd1e50 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifestX.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifestX.java
@@ -18,8 +18,6 @@
 
 package org.apache.jena.sparql.vocabulary ;
 
-/* CVS $Id: $ */
-
 import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.rdf.model.ModelFactory ;
 import org.apache.jena.rdf.model.Property ;
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifest_12.java b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifest_12.java
new file mode 100644
index 00000000000..7ceeb01c80b
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/TestManifest_12.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.vocabulary;
+
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.ResourceFactory;
+
+/**
+ * Additional or changed vocabulary for rdf-tests SPARQL area.
+ */
+public class TestManifest_12 {
+
+    /** <p>The namespace of the vocabulary as a string</p> */
+    public static final String NS = "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#";
+
+    public static final Resource PositiveUpdateSyntaxTest = ResourceFactory.createResource(NS+"PositiveUpdateSyntaxTest");
+
+    public static final Resource NegativeUpdateSyntaxTest = ResourceFactory.createResource(NS+"NegativeUpdateSyntaxTest");
+}
diff --git a/jena-arq/src/main/java/org/apache/jena/system/G.java b/jena-arq/src/main/java/org/apache/jena/system/G.java
index 547c19fc1bc..c0b7a66f302 100644
--- a/jena-arq/src/main/java/org/apache/jena/system/G.java
+++ b/jena-arq/src/main/java/org/apache/jena/system/G.java
@@ -71,7 +71,7 @@ public static Node object(Triple triple) {
     public static boolean isBlank(Node n)       { return n != null && n.isBlank(); }
     public static boolean isLiteral(Node n)     { return n != null && n.isLiteral(); }
     public static boolean isResource(Node n)    { return n != null && (n.isURI()||n.isBlank()); }
-    public static boolean isNodeTriple(Node n)  { return n != null && n.isNodeTriple(); }
+    public static boolean isNodeTriple(Node n)  { return n != null && n.isTripleTerm(); }
     public static boolean isNodeGraph(Node n)   { return n != null && n.isNodeGraph(); }
     public static boolean isNullOrAny(Node n)   { return n == null || Node.ANY.equals(n); }
 
@@ -1049,17 +1049,25 @@ public static boolean sameTermMatch(Node match, Node data) {
             // Any mix of node types except both strings with lang tags.
             return match.equals(data);
 
-        // Both nodes with language tags : compare languages case insensitively.
         String lex1 = match.getLiteralLexicalForm();
         String lex2 = data.getLiteralLexicalForm();
         if ( ! lex1.equals(lex2) )
             return false;
+        // Both nodes with language tags and same lexical forms.
+        // Compare languages case insensitively.
         String lang1 = match.getLiteralLanguage();
         String lang2 = data.getLiteralLanguage();
         return lang1.equalsIgnoreCase(lang2);
     }
 
-    /** Contains, and language tags compare case-insentively */
+
+    /**
+     * Contains: language tags compare case-insentively
+     *
+     * @deprecated Jena5: This should not be necessary any more.
+     *             Language tags are normalized during Node creation.
+     */
+    @Deprecated
     public static boolean containsByLang(Graph g, Node s, Node p, Node o) {
         // Try exact.
         if ( g.contains(s, p, o) )
@@ -1079,7 +1087,13 @@ public static boolean containsByLang(Graph g, Node s, Node p, Node o) {
         }
     }
 
-    /** Contains, and language tags match case-insentively */
+    /**
+     * Find: language tags compare case-insentively
+     *
+     * @deprecated Jena5: This should not be necessary any more.
+     *             Language tags are normalized during Node creation.
+     */
+    @Deprecated
     public static ExtendedIterator<Triple> findByLang(Graph g, Node s, Node p, Node o) {
         // No specific value given.
         if ( G.isNullOrAny(o) )
diff --git a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
index 81362968d44..def808c6b2b 100644
--- a/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
+++ b/jena-arq/src/main/java/org/apache/jena/system/RDFStar.java
@@ -263,7 +263,7 @@ private static Quad encode(Quad quad, Cache<Node_Triple, Node> cache, StreamRDF
     }
 
     private static Node nodeReif(Node x, Cache<Node_Triple, Node> cache, StreamRDF output) {
-        if ( ! x.isNodeTriple() )
+        if ( ! x.isTripleTerm() )
             return x;
         Triple t = x.getTriple();
         // Reify any nested triple terms. Reifications sent to stream.
@@ -271,7 +271,7 @@ private static Node nodeReif(Node x, Cache<Node_Triple, Node> cache, StreamRDF o
         // If its a new triple, this node is based on the replacement t2.
         Node_Triple nt = ( t2 == null )
             ? (Node_Triple)x
-            : (Node_Triple)NodeFactory.createTripleNode(t2);
+            : (Node_Triple)NodeFactory.createTripleTerm(t2);
         return cache.get(nt, key->genReif(key, output));
     }
 
@@ -288,7 +288,7 @@ public void triple(Triple triple) {
                 Node s = G.getOneSP(graph, reif, rdfSubject);
                 Node p = G.getOneSP(graph, reif, rdfPredicate);
                 Node o = G.getOneSP(graph, reif, rdfObject);
-                Node tripleTerm = NodeFactory.createTripleNode(s,p,o);
+                Node tripleTerm = NodeFactory.createTripleTerm(s,p,o);
                 map.put(reif, tripleTerm);
             }
         };
@@ -328,7 +328,7 @@ private Node translate(Node x, Map<Node, Node> map) {
                 if ( x1 == null )
                     return x;
                 // Recursively translate
-                if ( x1.isNodeTriple() ) {
+                if ( x1.isTripleTerm() ) {
                     Triple triple = x1.getTriple();
                     Node s = triple.getSubject();
                     Node p = triple.getPredicate();
@@ -337,7 +337,7 @@ private Node translate(Node x, Map<Node, Node> map) {
                     Node o1 = translate(o, map);
                     if ( s == s1 && o == o1 )
                         return x1;
-                    x1 = NodeFactory.createTripleNode(s1, p, o1);
+                    x1 = NodeFactory.createTripleTerm(s1, p, o1);
                 }
                 return x1;
             }
@@ -350,9 +350,9 @@ private Node translate(Node x, Map<Node, Node> map) {
      * Test whether a triple has an triple term as one of its components.
      */
     static boolean tripleHasNodeTriple(Triple triple) {
-        return triple.getSubject().isNodeTriple()
+        return triple.getSubject().isTripleTerm()
                /*|| triple.getPredicate().isNodeTriple()*/
-               || triple.getObject().isNodeTriple();
+               || triple.getObject().isTripleTerm();
     }
 
     private static Graph copyGraph(Graph graph) {
@@ -397,7 +397,7 @@ private static void decode(Graph graph, Triple pReifTriple, List<Triple> deletes
         Node p = pReifTriple.getObject();
         Node o = oReifTriple.getObject();
 
-        Node nodeTriple = NodeFactory.createTripleNode(s, p, o);
+        Node nodeTriple = NodeFactory.createTripleTerm(s, p, o);
         if ( false )
             inserts.add(Triple.create(s, p, o));
 
@@ -481,7 +481,7 @@ private static String reifStr(Node node) {
             // Non-URI character to separate the URI, in case we start using the string without hashing.
             return node.getLiteralLexicalForm()+" "+node.getLiteralDatatypeURI();
         }
-        if ( node.isNodeTriple() )
+        if ( node.isTripleTerm() )
             return reifStr(node.getTriple());
         throw new JenaException("Node type not supported in Node_Triple: "+node);
     }
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java b/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
index 12534c53d1b..85aa7c1b657 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/ARQTestSuite.java
@@ -21,7 +21,6 @@
 import org.apache.jena.atlas.TC_Atlas_ARQ;
 import org.apache.jena.atlas.legacy.BaseTest2;
 import org.apache.jena.external.Scripts_LangSuiteCG;
-import org.apache.jena.external.Scripts_RDFStar;
 import org.apache.jena.external.Scripts_SPARQL11;
 import org.apache.jena.http.auth.TS_HttpAuth;
 import org.apache.jena.rdfs.TS_InfRdfs;
@@ -74,8 +73,9 @@
     Scripts_SPARQL11.class,
 
     Scripts_TIM.class,
-    // rdf-star CG tests
-    Scripts_RDFStar.class
+    Scripts_DatasetMap.class,
+    Scripts_DatasetMapLink.class
+    // [rdf-star CG] tests - no longer valid
 
     // Only runs when src-examples is a source folder, which it isn't in the build.
     //, org.apache.jena.arq.examples.TC_Examples.class
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java
new file mode 100644
index 00000000000..06ec2b567f0
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/LibTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.arq.junit;
+
+import org.apache.jena.atlas.io.IO;
+import org.apache.jena.atlas.lib.IRILib;
+
+public class LibTest {
+
+    /** Print a multiline string, with line numbers. */
+    public static void printString(String str) {
+        System.out.printf("====          1         2         3         4\n");
+        System.out.printf("====  12345789_123456789_123456789_123456789_\n");
+        String[] x = str.split("\n");
+        for ( int i = 0 ; i < x.length ; i++ ) {
+            System.out.printf("%2d -- %s\n", i+1, x[i]);
+        }
+    }
+
+    /** Print a (small) file, with line numbers. The file is read into memory. */
+    public static void printFile(String filenameOrIRI) {
+        String filename = IRILib.IRIToFilename(filenameOrIRI);
+        String x = IO.readWholeFileAsUTF8(filename);
+        printString(x) ;
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java
index 6d68382515f..10f59133e70 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/SparqlTests.java
@@ -30,6 +30,7 @@
 import org.apache.jena.sparql.vocabulary.TestManifestUpdate_11;
 import org.apache.jena.sparql.vocabulary.TestManifestX;
 import org.apache.jena.sparql.vocabulary.TestManifest_11;
+import org.apache.jena.sparql.vocabulary.TestManifest_12;
 import org.apache.jena.vocabulary.TestManifest;
 
 public class SparqlTests {
@@ -70,6 +71,8 @@ public static Runnable makeSPARQLTest(ManifestEntry entry) {
             return new QuerySyntaxTest(entry, querySyntax, true);
         if ( testType.equals(TestManifest_11.PositiveSyntaxTest11) )
             return new QuerySyntaxTest(entry, querySyntax11, true);
+//        if ( testType.equals(TestManifest_12.PositiveSyntaxTest12) )
+//            return new QuerySyntaxTest(entry, querySyntax12, true);
         if ( testType.equals(TestManifestX.PositiveSyntaxTestARQ) )
             return new QuerySyntaxTest(entry, Syntax.syntaxARQ, true);
 
@@ -99,6 +102,11 @@ public static Runnable makeSPARQLTest(ManifestEntry entry) {
         if ( testType.equals(TestManifestX.NegativeUpdateSyntaxTestARQ) )
             return new UpdateSyntaxTest(entry, Syntax.syntaxARQ, false);
 
+        if ( testType.equals(TestManifest_12.PositiveUpdateSyntaxTest) )
+            return new UpdateSyntaxTest(entry, Syntax.syntaxARQ, true);
+        if ( testType.equals(TestManifest_12.NegativeUpdateSyntaxTest) )
+            return new UpdateSyntaxTest(entry, Syntax.syntaxARQ, false);
+
         //---- Query Evaluation Tests
         if ( testType.equals(TestManifest.QueryEvaluationTest) )
             return new QueryEvalTest(entry);
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java
index f64d0657477..d68da06937c 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/QuerySyntaxTest.java
@@ -20,6 +20,7 @@
 
 import static org.junit.Assert.fail;
 
+import org.apache.jena.arq.junit.LibTest;
 import org.apache.jena.arq.junit.manifest.ManifestEntry;
 import org.apache.jena.query.Query;
 
@@ -47,12 +48,17 @@ public void run() {
             if ( !expectLegalSyntax )
                 fail("Expected parse failure");
         } catch (QueryException qEx) {
-            if ( expectLegalSyntax )
+            if ( expectLegalSyntax ) {
+                String filename = SparqlTestLib.queryFile(testEntry);
+                LibTest.printFile(filename);
                 throw qEx;
+            }
             // Expected a failure.
         } catch (Exception ex) {
             ex.printStackTrace();
             fail("Exception: " + ex.getClass().getName() + ": " + ex.getMessage());
         }
     }
+
+
 }
diff --git a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
index d2b43cb218d..47bafb62bf9 100644
--- a/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
+++ b/jena-arq/src/test/java/org/apache/jena/arq/junit/sparql/tests/SparqlTestLib.java
@@ -48,7 +48,7 @@ static void testFailure(String msg) {
         throw new AssertionError(msg);
     }
 
-    static private String queryFile(ManifestEntry entry) {
+    static String queryFile(ManifestEntry entry) {
         Resource r = entry.getAction();
 
         if ( r.hasProperty(VocabTestQuery.query) )
diff --git a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
index 5352f24f8c1..de470ee8b1b 100644
--- a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
+++ b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
@@ -728,6 +728,28 @@ public void test_param_string_lang_4() {
         testAsQuery(query);
     }
 
+    @Test
+    public void test_param_string_dirlang_1() {
+        // Test lang+direction literal injection
+        String cmdText = "SELECT * WHERE { ?s ?p ?o }";
+        ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
+        query.setLiteral("o", "قطة", "ar", "ltr");
+
+        test(query, new String[] { "قطة", "@ar", "--ltr" }, new String[] { "?o" });
+        testAsQuery(query);
+    }
+
+    @Test
+    public void test_param_string_dirlang_2() {
+        // Test lang+direction literal injection
+        String cmdText = "SELECT * WHERE { ?s ?p ? }";
+        ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
+        query.setLiteral(0, "قطة", "ar", "ltr");
+
+        test(query, new String[] { "قطة", "@ar", "--ltr" }, new String[] { "? " });
+        testAsQuery(query);
+    }
+
     @Test(expected = QueryException.class)
     public void test_param_string_bad_1() {
         // Test bad input - not a valid query
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/AbstratTestSPARQL12Eval.java b/jena-arq/src/test/java/org/apache/jena/rdf12/AbstratTestSPARQL12Eval.java
new file mode 100644
index 00000000000..95bb49ea029
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/AbstratTestSPARQL12Eval.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import org.apache.jena.graph.Graph;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.Quad;
+import org.apache.jena.sparql.exec.QueryExec;
+import org.apache.jena.sparql.exec.RowSet;
+import org.apache.jena.sparql.exec.RowSetOps;
+import org.apache.jena.sparql.sse.SSE;
+import org.apache.jena.sparql.sse.SSE_ParseException;
+import org.apache.jena.system.Txn;
+
+/**
+ * Basic evaluation tests.
+ * <p>
+ * Evaluation is properly test by the rdf-tests CG scripted test suite.
+ */
+public abstract class AbstratTestSPARQL12Eval {
+
+    /** Get the dataset implementation. This should be same object each time. */
+    protected abstract DatasetGraph dsg();
+
+    /** Fill the dataset */
+    protected static DatasetGraph data(DatasetGraph dsg) {
+        Graph g = SSE.parseGraph("""
+                (graph
+                   (:s :p :o)
+                   (:s :q <<( :s :p 'TripleTerm' )>> )
+                )""");
+        Txn.executeWrite(dsg,  ()->{
+            addQuad(dsg, "( _ :s :p :o)");
+            addQuad(dsg, "( _ :x :q <<( :s1 :p 'TripleTerm1' )>> )");
+            addQuad(dsg, "( _ :x :q <<( :s2 :p 'TripleTerm2' )>> )");
+            addQuad(dsg, "( _ :r rdf:reifies <<( :x :y :z )>>)");
+        });
+        return dsg;
+    }
+
+    private static void addQuad(DatasetGraph dsg, String str) {
+        try {
+            Quad quad = SSE.parseQuad(str);
+            dsg.add(quad);
+        } catch (SSE_ParseException ex) {
+            System.err.println("Inout: "+str);
+            System.err.println(ex.getMessage());
+            throw ex;
+        }
+    }
+
+    @Test public void eval_sparql12_01() {
+        test("SELECT * { ?s ?p ?o }", 4);
+    }
+
+    @Test public void eval_sparql12_02() {
+        test("SELECT * { ?x ?q <<( ?a ?b ?c )>> }", 3);
+    }
+
+    @Test public void eval_sparql12_03() {
+        test("SELECT * { ?x ?q <<( ?a ?b 'TripleTerm1' )>> }", 1);
+    }
+
+    @Test public void eval_sparql12_04() {
+        test("SELECT * { << ?x ?y ?z >> . }", 1);
+    }
+
+    private void test(String queryString, int expected) {
+        DatasetGraph dsg = dsg();
+        Txn.executeRead(dsg, ()->{
+            try( QueryExec qExec = QueryExec.dataset(dsg).query(queryString).build() ) {
+                RowSet rowSet = qExec.select();
+                long x1 = RowSetOps.count(rowSet);
+                assertEquals(expected, x1);
+            }
+        });
+    }
+
+
+
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/LibTestSPARQL12.java b/jena-arq/src/test/java/org/apache/jena/rdf12/LibTestSPARQL12.java
new file mode 100644
index 00000000000..8821f3806eb
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/LibTestSPARQL12.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QueryParseException;
+import org.apache.jena.query.Syntax;
+
+
+class LibTestSPARQL12 {
+
+    static void testSPARQLSyntax(TEST testType, String label, String queryString, boolean verbose) {
+        try {
+            QueryFactory.create(queryString, Syntax.syntaxSPARQL_12);
+            if ( testType == TEST.BAD )
+                fail("Expected failure");
+            if ( verbose )
+                printString(label, queryString);
+            return;
+        } catch( QueryParseException ex) {
+            if ( testType == TEST.BAD )
+                throw ex;
+            if ( verbose )
+                printString(label, queryString);
+//            String exMsg = parserErrorMessage(ex);
+//            System.out.println("**** "+exMsg);
+            throw ex;
+        } catch( Throwable ex) {
+            if ( verbose )
+                printString(label, queryString);
+            ex.printStackTrace();
+            throw ex;
+        }
+    }
+
+    static String parserErrorMessage(QueryParseException ex) {
+        String exMsg = ex.getMessage();
+        int idx = exMsg.indexOf("\n");
+        if ( idx >= 0 )
+            exMsg = exMsg.substring(0, idx);
+        return exMsg;
+    }
+
+    static void printString(String label, String text) {
+        if ( label != null )
+            System.out.println("====  "+label);
+        System.out.printf("====  12345789 123456789\n");
+        String[] x = text.split("\n");
+        for ( int i = 0 ; i < x.length ; i++ ) {
+            System.out.printf("%2d :: %s\n", i+1, x[i]);
+        }
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/external/Scripts_RDFStar.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TEST.java
similarity index 67%
rename from jena-arq/src/test/java/org/apache/jena/external/Scripts_RDFStar.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/TEST.java
index 75a5aa8bea4..daa3e9e6c3c 100644
--- a/jena-arq/src/test/java/org/apache/jena/external/Scripts_RDFStar.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TEST.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,18 +16,6 @@
  * limitations under the License.
  */
 
-package org.apache.jena.external;
+package org.apache.jena.rdf12;
 
-import org.apache.jena.arq.junit.manifest.Manifests;
-import org.apache.jena.arq.junit.runners.Label;
-import org.apache.jena.arq.junit.runners.RunnerRIOT;
-import org.junit.runner.RunWith ;
-
-/** rdf-star CG tests. */
-@RunWith(RunnerRIOT.class)
-@Label("RDF star")
-@Manifests({
-    "testing/rdf-star-cg/manifest.ttl"
-})
-
-public class Scripts_RDFStar {}
+enum TEST { GOOD, BAD }
\ No newline at end of file
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
new file mode 100644
index 00000000000..1c31c12e1c8
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TS_RDF12.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+import org.apache.jena.rdf12.basic.TS_RDFStar_Basic;
+
+// Currently, RDF1.2 and SPARQL 1.2 specific tests.
+// Split sometime / replace with scripted tests.
+@Suite
+@SelectClasses({
+    // Old - to be removed.
+    TS_RDFStar_Basic.class,
+
+    TestRDF12LangSyntax.class,
+    TestSPARQL12Syntax.class,
+    TestSPARQL12Eval.class,
+    TestSPARQL12Results.class
+})
+public class TS_RDF12 {
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java
new file mode 100644
index 00000000000..f2317c91030
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestRDF12LangSyntax.java
@@ -0,0 +1,358 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.apache.jena.graph.Graph;
+import org.apache.jena.graph.GraphMemFactory;
+import org.apache.jena.riot.*;
+import org.apache.jena.riot.lang.extra.TurtleJCC;
+import org.apache.jena.riot.system.*;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.util.IsoMatcher;
+
+/**
+ * Testing of RDF 1.2 parsing.
+ * Also - compare the output of Lang.TRURLE and TurtleJCC.TTL.JCC.
+ */
+public class TestRDF12LangSyntax {
+    // -- The tests
+
+    // Details of a test entry - it may contain information relevant to only some kinds of test.
+    record OneTest(String label, TEST testType,  Lang[] langs, String str) {};
+
+    static String PREFIXES = """
+            PREFIX  :     <http://example/>
+            PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+            """;
+
+    private static Lang[] langsTurtle = { Lang.TURTLE, TurtleJCC.TTLJCC, Lang.TRIG };
+    private static Lang[] langsTriG = { Lang.TRIG };
+    // Feed to all places where N-triples is legal syntax
+    private static Lang[] langsNTriples = { Lang.NT , Lang.NQ, Lang.TURTLE, TurtleJCC.TTLJCC};
+    private static Lang[] langsNQuads = { Lang.NQ };
+
+    // -- Shorthand functions
+    private static OneTest testTurtle(String label, TEST testType, String str) {
+        String turtleText = PREFIXES + str;
+        return testLangs(label, testType, langsTurtle, turtleText);
+    }
+
+    private static OneTest testTriG(String label, TEST testType, String str) {
+        String text = PREFIXES + str;
+        return testLangs(label, testType, langsTriG, text);
+    }
+
+
+    private static OneTest testNTriples(String label, TEST testType, String str) {
+        return testLangs(label, testType, langsNTriples, str);
+    }
+
+    private static OneTest testNQuads(String label, TEST testType, String str) {
+        return testLangs(label, testType, langsNQuads, str);
+    }
+
+    // -- Shorthand functions
+
+    private static OneTest testLangs(String label, TEST testType, Lang[] langs, String str) {
+        return new OneTest(label, testType, langs, str);
+    }
+
+    /**
+     * All tests, all details.
+     * <p>
+     * These are then converted into parser tests and also output tests that get run by JUnit5.
+     */
+    private static Stream<OneTest> allTests() {
+        return Stream.of(ntuplesTests(), turtleTests(), trigTests()).flatMap(x->x);
+    }
+
+    private static Stream<OneTest> turtleTests() {
+        return Stream.of(
+                 // Triple terms
+                 testTurtle("tt1", TEST.GOOD, ":s :o <<( :x :y :z )>>. "),
+                 testTurtle("tt2", TEST.GOOD, ":s :o <<( :x :y <<( :x1 :y1 :z1 )>> )>>. "),
+
+                 // Reified triple declarations.
+                 testTurtle("ReifierTripleDecl_1", TEST.GOOD, "<< :s :p :o >> ."),
+                 testTurtle("ReifierTripleDecl_2", TEST.GOOD, "<< <<:s :p :o >> :p1 :o1 >> ."),
+                 testTurtle("ReifierTripleDecl_3", TEST.GOOD, "<< :s1 :p1 << :s :p :o >> >> ."),
+                 testTurtle("ReifierTripleDecl_4", TEST.GOOD, "<< :s :p :o ~:r >> ."),
+                 testTurtle("ReifierTripleDecl_5", TEST.GOOD, "<< :s :p :o ~_:b >> ."),
+                 testTurtle("ReifierTripleDecl_6", TEST.GOOD, "<< :s :p :o ~ >> ."),
+                 testTurtle("ReifierTripleDecl_7", TEST.GOOD, "<< :s :p :o ~[] >> ."),
+
+                 testTurtle("ReifierTripleDecl_bad_1", TEST.BAD, "<< :s :p :o ~ :r1 :r2 >> ."),
+                 testTurtle("ReifierTripleDecl_bad_1", TEST.BAD, "<< :s :p :o ~ :r1 ~:r2 >> ."),
+
+                 // Reified triple
+                 testTurtle("ReifiedTriple_1", TEST.GOOD, "<<:s :p :o >> :q :z ."),
+                 testTurtle("ReifiedTriple_2", TEST.GOOD, ":a :b << :s :p :o >> ."),
+                 testTurtle("ReifiedTriple_3", TEST.GOOD, "<< << :s :p :o >> :p1 :o1 >> :q :z ."),
+                 testTurtle("ReifiedTriple_4", TEST.GOOD, "<< :s0 :p0 <<:s :p :o >>  >> :q :z ."),
+
+                 // Reified triple with reifier
+                 testTurtle("ReifiedTriple_5", TEST.GOOD, "<< :s :p :o ~_:b >> :q :z ."),
+                 testTurtle("ReifiedTriple_6", TEST.GOOD, "<< :s :p :o ~ >> :q :z ."),
+                 testTurtle("ReifiedTriple_7", TEST.GOOD, "<< <<:s :p :o ~ :r1 >> :p1 :o1 ~:r2>> ."),
+                 testTurtle("ReifiedTriple_8", TEST.BAD, "<< :s :p :o ~ :r1 :r2 >> :q :z ."),
+
+                 // Annotations
+                 testTurtle("ann1", TEST.GOOD, ":x :y :z ~:r ."),
+                 testTurtle("ann2", TEST.GOOD, ":s :p :o {| :q :z |} ."),
+                 testTurtle("ann3", TEST.GOOD, ":s :p :o ~:r1 {| :q :z |} ."),
+                 testTurtle("ann4", TEST.GOOD, ":x :y :z ~:r1 ~:r2 ."),
+                 testTurtle("ann5", TEST.GOOD, ":s :p :o {| :q :z |} {| :q1 :z1 |} ."),
+                 testTurtle("ann6", TEST.GOOD, ":s :p :o ~:r1 ~:r2 {| :q :z |} ."),
+                 testTurtle("ann7", TEST.GOOD, ":s :p :o ~:r1 ~:r2 {| :q :z |} {| :q1 :z1 |} ."),
+                 testTurtle("ann8", TEST.GOOD, ":s :p :o ~:r1 ~:r2 {| :q :z |} {| :q1 :z1 |} ~:r3 ~:r4  ."),
+
+                 // With spec fix.
+                 testTurtle("Turtle Bad Reification 1", TEST.BAD, "<< :s :p ( 1 2 3 ) >> . "),
+                 testTurtle("Turtle Bad Reification 2", TEST.BAD, "<< ( 1 2 3 ) :p :o >> . "),
+                 testTurtle("Turtle Bad Reification 3", TEST.BAD, "<< :s :p [ :y :z ] >> . "),
+
+                 // Old syntax, not legal.
+                 testTurtle("OldReifierSyntax_1", TEST.BAD, ":s :p :o | :r ."),
+                 testTurtle("OldReifierSyntax_2", TEST.BAD, "<< :s :p :o | :r >> ."),
+
+                 // Test direction
+                 testTurtle("Turtle Text dir 1", TEST.GOOD, "<http://example/s> <http://example/p> \"abc\"@en--ltr ."),
+                 testTurtle("Turtle Text dir bad 1", TEST.BAD, "<http://example/s> <http://example/p> \"abc\"@en-en--LTR ."),
+                 testTurtle("Turtle Text dir bad 2", TEST.BAD, "<http://example/s> <http://example/p> \"abc\"@en-en--ABC ."),
+                 testTurtle("Turtle Text dir bad 3", TEST.BAD, "\"abc\"@en--ltr <http://example/q> <http://example/o> .")
+                 );
+    }
+
+    private static Stream<OneTest> trigTests() {
+        return Stream.of(
+                 testTriG("TriG graph 1" , TEST.GOOD, "GRAPH <http://example/g> {  << :s :p :o >> .}"),
+                 testTriG("TriG graph 2" , TEST.GOOD, "<http://example/g> {  << :s :p :o >> .}"),
+                 testTriG("TriG graph bad 1" , TEST.BAD, "GRAPH <<( :x :y :z )>>. {  :s :p :o  .}"),
+                 testTriG("TriG graph bad 2" , TEST.BAD, "<<( :x :y :z )>>. {  :s :p :o  .}")
+                );
+    }
+
+    private static Stream<OneTest> ntuplesTests() {
+        return Stream.of(
+                 testNTriples("NT TripleTerm 1", TEST.GOOD, "<http://example/s> <http://example/p> <<( <http://example/s> <http://example/p> <http://example/s> )>> ."),
+                 testNTriples("NT TripleTerm 2", TEST.BAD, "<<( <http://example/s> <http://example/p> <http://example/s> )>> <http://example/q> <http://example/o> ."),
+
+                 testNTriples("NT Text dir 1", TEST.GOOD, "<http://example/s> <http://example/p> \"abc\"@en--ltr ."),
+                 testNTriples("NT Text dir bad 1", TEST.BAD, "<http://example/s> <http://example/p> \"abc\"@en-en--LTR ."),
+                 testNTriples("NT Text dir bad 2", TEST.BAD, "<http://example/s> <http://example/p> \"abc\"@en-en--ABC ."),
+                 testNTriples("NT Text dir bad 3", TEST.BAD, "\"abc\"@en--ltr <http://example/q> <http://example/o> ."),
+
+                 testNQuads("NQ 1", TEST.GOOD,
+                         "<http://example/s> <http://example/p> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/g> ."),
+                 testNQuads("NQ 1", TEST.BAD,
+                         "<http://example/s> <http://example/p> <http://example/s>  <<( <http://example/g1> <http://example/g2> <http://example/g3> )>> .")
+                );
+    }
+
+    // Test framework : data syntax parsers
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("allParserTests")
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface TestParsers {}
+
+    // JUnit source for @TestParsers (syntax tests)
+    static Stream<Arguments> allParserTests() {
+        return allTests().flatMap(item->{
+            return Arrays.stream(item.langs).map(lang->parserTestArgs(item, lang));
+        });
+    }
+
+    // Arguments for one syntax test
+    static Arguments parserTestArgs(OneTest item, Lang lang) {
+        String label = String.format("%s (%s)", item.label, lang.getLabel());
+        return Arguments.of(label, item.testType, item.str, lang);
+    }
+
+    @TestParsers
+    public void parseLang12(String label, TEST testType, String str, Lang lang) {
+        testLangParse(testType, label, str, lang, false);
+    }
+
+    // Syntax test for one lang
+    private static void testLangParse(TEST testType, String label, String turtleText, Lang lang, boolean verbose) {
+        try {
+            if ( !verbose ) {
+                if ( RDFLanguages.isQuads(lang) ) {
+                    DatasetGraph dsg = RDFParser.fromString(turtleText, lang).errorHandler(errorHandlerSilent).toDatasetGraph();
+                } else {
+                    Graph graph = RDFParser.fromString(turtleText, lang).errorHandler(errorHandlerSilent).toGraph();
+                }
+            } else {
+                printString(label, lang, turtleText);
+                StreamRDF dest = StreamRDFWriter.getWriterStream(System.out, RDFFormat.TURTLE_FLAT);
+                RDFParser.fromString(turtleText, TurtleJCC.TTLJCC).parse(dest);
+            }
+            if ( testType == TEST.BAD ) {
+                if ( !verbose )
+                    printString(label, lang, turtleText);
+                fail("Expected failure", null);
+            }
+            return;
+        } catch (RiotException ex) {
+            if ( testType == TEST.BAD )
+                // Expected.
+                return;
+            printString(label, lang, turtleText);
+            String exMsg = parserErrorMessage(ex);
+            System.out.println("**** "+exMsg);
+            throw ex;
+        } catch (JenaException ex) {
+            if ( testType == TEST.BAD )
+                // Expected.
+                return;
+            printString(label, lang, turtleText);
+            String exMsg = parserErrorMessage(ex);
+            System.out.println("**** "+exMsg);
+            throw ex;
+
+        } catch (Throwable ex) {
+            if ( verbose )
+                printString(label, lang, turtleText);
+            ex.printStackTrace();
+            throw ex;
+        }
+    }
+
+    // ---- Output tests for Turtle.
+    // Run both Turtle parsers and compare the graphs produced.
+    // Does not cover the case of both throwing an exception.
+
+    // JUnit source for @TestOutput (Turtle: eval and compare both parsers)
+    static Stream<Arguments> allOutputTests() {
+        //Only Turtle
+        return turtleTests().filter(item-> item.testType == TEST.GOOD).map(item->outputTestArgs(item));
+    }
+
+    // Arguments for one output test
+    static Arguments outputTestArgs(OneTest item) {
+        return Arguments.of(item.label, item.str);
+    }
+
+    @ParameterizedTest(name = "{0}")
+    @MethodSource("allOutputTests")
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface TestOutput {}
+
+    @TestOutput
+    public void outputTurtle12(String label, String turtleText) {
+        testTurtleOutput(label, turtleText);
+    }
+
+    // Output test : run Lang.TURLE and TurtleJCC.TTLJCC and compare.
+    private void testTurtleOutput(String label, String turtleText) {
+        Graph graph1 = parse(turtleText, Lang.TURTLE);
+        if ( graph1 == null ) {
+            fail("Parsing with Lang.TURTLE produced an error");
+            return;
+        }
+        Graph graph2 = parse(turtleText,  TurtleJCC.TTLJCC);
+        if ( graph2 == null ) {
+            fail("Parsing with TurtleJCC.TTLJCC produced an error");
+            return;
+        }
+        if ( IsoMatcher.isomorphic(graph1, graph2) ) {
+//            printString(turtleText);
+//            //System.out.println("** Same");
+//            if ( false )
+//                parsePrintOutput(turtleText, Lang.TURTLE);
+//            System.out.println();
+            return;
+        }
+        System.out.println("** Different graphs");
+        printString(turtleText);
+        parsePrintOutput(turtleText, TurtleJCC.TTLJCC);
+        parsePrintOutput(turtleText, Lang.TURTLE);
+        System.out.println();
+        fail("Different graphs");
+    }
+
+    // Parse. Null if bad.
+    private static Graph parse(String parseStr, Lang lang) {
+        try {
+            Graph graph = GraphMemFactory.createDefaultGraph();
+            StreamRDF sink = StreamRDFLib.graph(graph);
+            RDFParser.fromString(parseStr, lang).errorHandler(errorHandlerSilent).parse(graph);
+            return graph;
+        } catch (Exception ex) {
+//            // Failed.
+//            printString(parseStr);
+            parsePrintOutput(parseStr, lang);
+            return null;
+        }
+    }
+
+    // General machinery
+
+    private static ErrorHandler errorHandlerSilent = ErrorHandlerFactory.errorHandlerNoLogging;
+
+    private static String parserErrorMessage(JenaException ex) {
+        String exMsg = ex.getMessage();
+        int idx = exMsg.indexOf("\n");
+        if ( idx >= 0 )
+            exMsg = exMsg.substring(0, idx);
+        return exMsg;
+    }
+
+    // Parse and output
+    private static void parsePrintOutput(String parseStr, Lang lang) {
+        System.out.println("== "+lang);
+        try {
+            StreamRDF dest = StreamRDFWriter.getWriterStream(System.out, RDFFormat.TURTLE_FLAT);
+            RDFParser.fromString(parseStr, lang).errorHandler(errorHandlerSilent).parse(dest);
+        } catch (Exception ex) {
+            System.out.flush();
+            ex.printStackTrace(System.err);
+        }
+    }
+
+    private static void printString(String label, Lang lang, String str) {
+//        if ( label != null && lang != null )
+//            System.out.printf("====  %s (%s)\n", label, lang.getLabel());
+//        else if ( label != null )
+            System.out.printf("====  %s\n", label);
+        printString(str);
+    }
+
+    private static void printString(String str) {
+        System.out.printf("====          1         2\n");
+        System.out.printf("====  12345789_123456789_123456789\n");
+        String[] x = str.split("\n");
+        for ( int i = 0 ; i < x.length ; i++ ) {
+            System.out.printf("%2d :: %s\n", i+1, x[i]);
+        }
+    }
+}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Eval.java
similarity index 64%
rename from jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Eval.java
index dc56f02740b..482e4a4ea82 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorNoRemove.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Eval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,23 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.jena.atlas.iterator;
+package org.apache.jena.rdf12;
 
-import java.util.Iterator;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
 
 /**
- * Wrap an iterator except for remove which throws UnsupportedOperationException.
- * @deprecated Use {@link Iter#noRemove(Iterator)}.
+ * Basic evaluation tests.
+ * <p>
+ * Evaluation is properly test by the rdf-tests CG scripted test suite.
  */
-@Deprecated(forRemoval = true)
-public class IteratorNoRemove<T> extends IteratorWrapper<T> {
 
-    public IteratorNoRemove(int x, Iterator<T> iterator) {
-        super(iterator);
-    }
+public class TestSPARQL12Eval extends AbstratTestSPARQL12Eval {
+
+    static DatasetGraph dsg = data(DatasetGraphFactory.createTxnMem());
 
     @Override
-    public void close() {
-        Iter.close(iterator);
-    }
+    protected DatasetGraph dsg() { return dsg; }
 }
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarExtra.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
similarity index 95%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarExtra.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
index 34e4328a19c..59a93a6a592 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarExtra.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Results.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12;
 
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetFormatter;
@@ -25,8 +25,9 @@
 
 /**
  * Odds and ends for SPARQL*.
+ * CG era.
  */
-public class TestSPARQLStarExtra {
+public class TestSPARQL12Results {
 
     private static String FILES = "testing/ARQ/RDF-star/Other/";
 
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Syntax.java b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Syntax.java
new file mode 100644
index 00000000000..0c413af5471
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/TestSPARQL12Syntax.java
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12;
+
+import static org.apache.jena.rdf12.LibTestSPARQL12.testSPARQLSyntax;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import org.apache.jena.query.QueryParseException;
+import org.apache.jena.sys.JenaSystem;
+
+
+public class TestSPARQL12Syntax {
+
+    static { JenaSystem.init(); }
+
+    // Basics not broken.
+    @Test public void basic_01() { testSyntaxFragment("{ :s :p :o  }") ; }
+    @Test public void basic_02() { testSyntaxFragment("{ :s :p :o . }") ; }
+    @Test public void basic_03() { testSyntaxFragment("{ :s :p :o ; :p2 :o2 }") ; }
+    @Test public void basic_04() { testSyntaxFragment("{ :s :p :o ; :p2 :o2 . }") ; }
+
+    // Triple terms.
+    @Test public void tripleTerm_01() { testSyntaxFragment("{ :s :p <<(:s :p :o )>> }"); }
+    @Test public void tripleTerm_02() { testSyntaxFragment("{ :s :p <<(:s :p :o )>> .}"); }
+    @Test public void tripleTerm_03() { testSyntaxFragment("{ :s :p <<( ?x ?p ?z )>> .}"); }
+    // SPARQL is symmetric, as it is with literals.
+    @Test public void tripleTerm_04() { testSyntaxFragment("{ <<( ?x ?p ?z )>> :p <<( ?x ?p ?z )>> .}"); }
+
+    // Blank node annotation
+    @Test public void annotation_1() { testSyntaxFragment("{ :s :p :o {| :q :r |} . }");}
+    @Test public void annotation_2() { testSyntaxFragment("{ :s :p :o {| :q1 :r1 ; :q2 :r2 ; |} }");}
+    @Test public void annotation_3() { testSyntaxFragment("{ :s :p :o {| :x :y |} ; :q :r . }");}
+    @Test public void annotation_4() { testSyntaxFragment("{ :s :p :o {| :x1 :y1 |} {| :x2 :y2 |} }"); }
+
+    // Now bad syntax
+    @Test public void annotation_bad_empty_1() { testSyntaxFragmentBad("{ :s :p :o {|  |}  }");}
+    @Test public void annotation_bad_empty_2() { testSyntaxFragmentBad("{ :s :p :o {| |} ; :q :r }");}
+
+    // Old syntax
+    @Test public void annotation_bad_1() { testSyntaxFragmentBad("{ :s :p :o ~(:e) . }"); }
+    @Test public void annotation_bad_2() { testSyntaxFragmentBad("{ :s :p/:q :o ~ . }"); }
+    @Test public void annotation_bad_3() { testSyntaxFragmentBad("{ :s :p/:q :o {| :x :y |} }"); }
+    @Test public void annotation_bad_4() { testSyntaxFragmentBad("{ :s :p :o | :e . }"); }
+
+    // Reifier+Annotation
+    @Test public void reifierAnnotation_1() { testSyntaxFragment("{ :s :p :o ~:e . }"); }
+    @Test public void reifierAnnotation_2() { testSyntaxFragment("{ :s :p :o ~ . }"); }
+    @Test public void reifierAnnotation_3() { testSyntaxFragment("{ :s :p :o ~[] . }"); }
+    @Test public void reifierAnnotation_4() { testSyntaxFragment("{ :s :p :o ~:e {| :q :r |} }"); }
+    @Test public void reifierAnnotation_5() { testSyntaxFragment("{ :s :p :o ~ {| :x :y |} ; :q :r . }"); }
+
+    // Multiple reifiers, multiple annotation
+    @Test public void reifierAnnotation_10() { testSyntaxFragment("{ :s :p :o ~:e ~ .}");}
+    @Test public void reifierAnnotation_11() { testSyntaxFragment("{ :s :p :o ~:e ~:r }");}
+    @Test public void reifierAnnotation_12() { testSyntaxFragment("{ :s :p :o ~ ~ {| :y :z|}  }");}
+    @Test public void reifierAnnotation_13() { testSyntaxFragment("{ :s :p :o ~:e {| :q :r |} ~:r {| :q :r |} ~:r } ");}
+    @Test public void reifierAnnotation_14() { testSyntaxFragment("{ :s :p :o {| :q :r |} {| :q :r |} .}"); }
+    @Test public void reifierAnnotation_15() { testSyntaxFragment("{ :s :p :o ~  {| :x :y |} ; :q :r . }");}
+
+    @Test public void reifierVarAnnotation_1() { testSyntaxFragment("{ :s :p :o ~?v .}");}
+    @Test public void reifierVarAnnotation_2() { testSyntaxFragment("{ :s :p :o ~?v ; :q :r }");}
+    @Test public void reifierVarAnnotation_3() { testSyntaxFragment("{ :s :p :o ~?v {| :x :y |} ; :q :r }");}
+
+    // Reified triple
+    @Test public void reifiedTriple_1() { testSyntaxFragment("{ << :s :p :o >> . }");}
+    @Test public void reifiedTriple_2() { testSyntaxFragment("{ << :s :p :o >> :p :r . }");}
+    @Test public void reifiedTriple_3() { testSyntaxFragment("{ :x :y << :s :p :o >> . }");}
+    @Test public void reifiedTriple_4() { testSyntaxFragment("{ :x :y << << :s :p :o1 >> :p :o2 >> . }");}
+    @Test public void reifiedTriple_5() { testSyntaxFragment("{ :x :y << :s1 :p << :s2 :p :o >>  >> . }");}
+
+    @Test public void reifiedTriple_6() { testSyntaxFragment("{ << :s :p :o ~:e >> . }");}
+    @Test public void reifiedTriple_7() { testSyntaxFragment("{ << :s :p :o ~ >> . }");}
+    @Test public void reifiedTriple_8() { testSyntaxFragment("{ << :s :p :o ~ [] >> . }");}
+    @Test public void reifiedTriple_9() { testSyntaxFragment("{ :a :b << :s :p :o ~:e >> . }");}
+
+    @Test public void reifierTriple_bad_1() { testSyntaxFragmentBad("{ << :s :p :o ~:e1 ~:e2 >> . }"); }
+    @Test public void reifierTriple_bad_2() { testSyntaxFragmentBad("{ << :s :p :o ~(:e) >> . }"); }
+    @Test public void reifierTriple_bad_3() { testSyntaxFragmentBad("{ << :s :p :o ~() >> . }"); }
+    @Test public void reifierTriple_bad_4() { testSyntaxFragmentBad("{ << :s :p/:q :o ~() >> . }"); }
+    @Test public void reifierTriple_bad_5() { testSyntaxFragmentBad("{ << :s :p :o | :r >> . }"); }
+
+    // Nesting
+    @Test public void reifierReifiedTriple_nested_1() { testSyntaxFragment("{ << :s :p << :s :p :o >> >> :y :z }");}
+
+    @Test public void reifierVarReifiedTriple_1() { testSyntaxFragment("{ << :s :p :o ~?v >> . }");}
+    @Test public void reifierVarReifiedTriple_2() { testSyntaxFragment("{ :a :b << :s :p :o ~?v >> . }");}
+
+    @Test public void reifierMultipleReifiedTriple_bad_1() { testSyntaxFragmentBad("{ << :s :p :o ~:e1 ~:e2 >> . }");}
+
+    // In larger units.
+    @Test public void reifierData_1() { testSyntaxFragment("{ :x :q << :s :p :o >> . }");}
+    @Test public void reifierData_2() { testSyntaxFragment("{ :x :q << :s :p :o ~:e >> . }");}
+    @Test public void reifierData_3() { testSyntaxFragment("{ :x :q << :s :p :o ~:e >> ; :x :y }");}
+    @Test public void reifierData_4() { testSyntaxFragment("{ :s :p :o . :x :q << :s :p :o ~:e >> ; :x :y }");}
+    @Test public void reifierData_5() { testSyntaxFragment("{ :s :p :o . << :s :p :o ~:e >> . :e :x :y }");}
+
+    // Variables.
+    @Test public void reifierAnnotationVars_1()     { testSyntaxFragment("{ :s :p :o {| ?x ?y |} {| :x2 :y2 |} }"); }
+    @Test public void reifierAnnotationVars_2()     { testSyntaxFragment("{ :s :p :o ~?v1 ~?v2 }"); }
+
+    // Variables.
+    @Test public void reifierReifiedTriplesVars_1()  { testSyntaxFragment("{  << ?s ?p ?o ~?e >> }"); }
+    @Test public void reifierReifiedTriplesVars_2()  { testSyntaxFragment("{  << ?s ?p ?o ~?e >> ?p ?q }"); }
+
+    // Expressions.
+    @Test public void exprTripleTerm_1() { testSyntaxFragment("{ FILTER(?x = <<( :s :p :o )>>) }"); }
+    @Test public void exprTripleterm_2() { testSyntaxFragment("{ FILTER(sameTerm(?x, <<( :s :p :o )>>)) }"); }
+    // Expressions.
+    @Test public void exprTripleTerm_bad_1() { testSyntaxFragmentBad("{ FILTER(?x = << :s :p :o >>) }"); }
+
+    // VALUES
+    @Test public void valuesTripleTerm_1() { testSyntaxFragment("{ VALUES ?x { :x <<( :s :p :o )>> } }"); }
+    @Test public void valuesTripleTerm_2() { testSyntaxFragment("{ VALUES (?x ?y) { (:x <<( :s :p :o )>>) } }"); }
+
+    @Test public void valuesTripleTerm_bad_1() { testSyntaxFragmentBad("{ VALUES ?x { :x << :s :p :o >> } }"); }
+    @Test public void valuesTripleTerm_bad_2() { testSyntaxFragmentBad("{ VALUES ?x { :x <<( ?s ?p ?o )>> } }"); }
+
+    // Old syntax
+    @Test public void oldSyntax_1() { testSyntaxFragmentBad("{ << :r | :s :p :o >> :x : y  }"); }
+    @Test public void oldSyntax_2() { testSyntaxFragmentBad("{ :s :p :o {| :r | : q :x |} }"); }
+
+    @Test public void reifierData_10() { testSyntaxFragment("""
+                    {
+                      :s :p1 1 ;
+                         :p2 22 {| :a 99 |} {| :a 98 |} ~:e ;
+                         :p3 2 ,
+                             3 {| :a 99 |} {| :a 98 |} ~?v ~:e1 ~:e2 ;
+                         :x :y
+                    }
+                    """
+            );}
+
+    // Old alternative.
+    @Test public void annotationReifierList_1() { testSyntaxFragmentBad("{ :s :p :o ~(:e1 :e2) }");}
+    @Test public void annotationReifierList_2() { testSyntaxFragmentBad("{ :s :p :o ~() }");}
+
+    // CONSTRUCT patterns.
+    @Test public void construct_1() { testSyntaxQuery("CONSTRUCT { :s :p :o ~:e } WHERE {}"); }
+    @Test public void construct_2() { testSyntaxQuery("CONSTRUCT { :s :p :o {| :q 'ABC' |} } WHERE {}"); }
+    @Test public void construct_3() { testSyntaxQuery("CONSTRUCT { :s :p <<( :a :b :c )>> } WHERE {}"); }
+    @Test public void construct_4() { testSyntaxQuery("CONSTRUCT { :s :p <<( :a :b  <<( :d :e :f )>> )>> } WHERE {}"); }
+
+    @Test public void construct_10() { testSyntaxQuery("CONSTRUCT { :s :p << :x :y :z >> } WHERE {}"); }
+    @Test public void construct_11() { testSyntaxQuery("CONSTRUCT { << :x :y :z >> :q :z } WHERE {}"); }
+
+    // "a"
+
+    static String PREFIXES = "PREFIX : <http://example/>\n";
+
+    /**
+     * Test a query fragment, expecting a syntax error.
+     * The fragment is wrapped in prefixes and {@code "SELECT * "}.
+     */
+    private void testSyntaxFragmentBad(String queryFragment) {
+        assertThrows(QueryParseException.class, ()->execFragment(TEST.BAD, null, queryFragment, false));
+    }
+
+    /** Test a query fragment. The fragment is wrapped in prefixes and {@code "SELECT * "}. */
+    private void testSyntaxFragment(String queryFragment) {
+        execFragment(TEST.GOOD, null, queryFragment, false);
+    }
+
+    /** Test a complete query string. Prefixes are prepended.*/
+    private void testSyntaxQuery(String queryString) {
+        String qs = PREFIXES+"\n"+queryString;
+        testSPARQLSyntax(TEST.GOOD, null, qs, false);
+    }
+
+    private void execFragment(TEST testType, String label, String queryFragment, boolean verbose) {
+        String qs = PREFIXES+"\nSELECT * "+queryFragment+"\n";
+        testSPARQLSyntax(testType, label, qs, verbose);
+    }
+
+    // The method names are arranged so that the test* (looking up the stack) is immediately before the test itself.
+    private static int unknownCount;
+
+    private static String getTestMethodName() {
+        StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
+        int N = stacktrace.length;
+        boolean seenTestTypeName = false;
+        boolean isBad = false;
+        for ( int i = 0 ; i < N ; i++ ) {
+            StackTraceElement e = stacktrace[i];
+            String methodName = e.getMethodName();
+            if ( seenTestTypeName ) {
+                if ( ! methodName.startsWith("test") ) {
+                    // First name after test*
+                    //return !isBad ? methodName : methodName+"[bad]";
+                    return methodName;
+                }
+                if ( methodName.startsWith("lambda") )
+                    seenTestTypeName = false;
+            } else {
+                if ( methodName.startsWith("test") )
+                    seenTestTypeName = true;
+                isBad = methodName.endsWith("Bad");
+            }
+        }
+        return "Unknown_"+(++unknownCount);
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TS_RDF_Star.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TS_RDFStar_Basic.java
similarity index 87%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TS_RDF_Star.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/basic/TS_RDFStar_Basic.java
index 4da83a79c32..5753d8a4d69 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TS_RDF_Star.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TS_RDFStar_Basic.java
@@ -16,20 +16,21 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12.basic;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
+    // Old basic tests,
+    // ** To be removed.
     TestNQuadsStarParse.class,
     TestNTriplesStarParse.class,
     TestTrigStarParse.class,
     TestTurtleStarParse.class,
-    TestSPARQLStarParse.class,
-    TestSPARQLStarExtra.class
-    // And scripted tests.
+
+//    TestSPARQLStarParse.class,
 })
-public class TS_RDF_Star {
+public class TS_RDFStar_Basic {
 }
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestNQuadsStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNQuadsStarParse.java
similarity index 63%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TestNQuadsStarParse.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNQuadsStarParse.java
index ff0efd68047..f3675fe05ee 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestNQuadsStarParse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNQuadsStarParse.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12.basic;
 
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFParser;
@@ -28,32 +28,34 @@
 import org.junit.Test;
 
 /**
- * Test parsing of RDF-star constructs for N-Triples.
+ * Basic parsing tests of RDF-star constructs for N-Quads
  */
 public class TestNQuadsStarParse {
 
     private ErrorHandler silent = ErrorHandlerFactory.errorHandlerStrictNoLogging;
     private static StreamRDF sink = StreamRDFLib.sinkNull();
 
-    @Test public void parse_nq_good_1()    { parse("<<<x:s> <x:p> <x:o>>> <x:q> '1' . "); }
+    @Test public void parse_nq_good_1()    { parse("<x:s> <x:q> <<( <x:s> <x:p> <x:o> )>> . "); }
 
-    @Test public void parse_nq_good_2()    { parse("<<<x:s> <x:p> <x:o>>> <x:q> '1' <http://example/g> . "); }
+    @Test public void parse_nq_good_2()    { parse("<x:s> <x:p> <<( <x:s> <x:p> <x:o> )>> <http://example/g> . "); }
 
-    @Test public void parse_nq_good_3()    { parse("<http://ex/x> <http://ex/p> <<<x:s> <x:p> <x:o>>> ."); }
+    @Test public void parse_nq_good_3()    { parse("<x:s> <x:q> <<( <x:s> <x:p> <<(<x:s1> <x:p1> <x:o1>)>> )>> . "); }
 
-    @Test public void parse_nq_good_4()    { parse("<http://ex/x> <http://ex/p> <<<x:s> <x:p> <x:o>>> <http://example/g> ."); }
+    @Test public void parse_nq_good_4()    { parse("<x:s> <x:p> <<( <x:s> <x:p> <<(<x:s1> <x:p1> <x:o1>)>> )>> <http://example/g> . "); }
 
-    @Test public void parse_nq_good_5()    { parse("_:b <x:p> <<_:b <x:p> _:o>> _:g . "); }
+    @Test public void parse_nq_good_5()    { parse("_:b <x:p> <<(_:b <x:p> _:o)>> _:g . "); }
 
+    @Test(expected=RiotException.class)
+    public void parse_nq_bad_1()           { parse("<<<x:s> <x:p> <x:o>>> <x:q> <x:z> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_nq_bad_1()           { parse("<<<x:s> <x:p> <x:o>>> . "); }
+    public void parse_nq_bad_2()           { parse("<<(<x:s> <x:p> <x:o>)>> <x:q> 'ABC' . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_nq_bad_2()           { parse("<<<x:s> <x:p> <x:o>>> <http://example/g> . "); }
+    public void parse_nq_bad_3()           { parse("<x:s> <<(<x:s> <x:p> <x:o>)>> <x:o> <http://example/g> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_nq_bad_3()           { parse("<<<x:s> <x:p>' <x:o> <http://example/g> >> <x:p> <x:o>. "); }
+    public void parse_nq_bad_4()           { parse("<x:s> <x:p> <x:o> <<(<x:gs> <x:gp> <x:go> )>> . "); }
 
     private void parse(String string) {
         RDFParser.fromString(string, Lang.NQUADS).errorHandler(silent).parse(sink);
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestNTriplesStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNTriplesStarParse.java
similarity index 67%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TestNTriplesStarParse.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNTriplesStarParse.java
index a92f572264f..467f3637c0f 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestNTriplesStarParse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestNTriplesStarParse.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12.basic;
 
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFParser;
@@ -28,27 +28,28 @@
 import org.junit.Test;
 
 /**
- * Test parsing of RDF-star constructs for N-Triples.
+ * Basic parsing tests of RDF-star constructs for N-Triples
  */
 public class TestNTriplesStarParse {
 
     private ErrorHandler silent = ErrorHandlerFactory.errorHandlerStrictNoLogging;
     private static StreamRDF sink = StreamRDFLib.sinkNull();
 
-    @Test public void parse_nt_good_1()    { parse("<<<x:s> <x:p> <x:o>>> <x:q> '1' . "); }
+    @Test public void parse_nt_good_1()    { parse("<x:s> <x:q> <<( <x:s> <x:p> <x:o>)>> . "); }
 
-    @Test public void parse_nt_good_2()    { parse("<http://ex/x> <http://ex/p> <<<x:s> <x:p> <x:o>>> ."); }
+    @Test public void parse_nt_good_2()    { parse("_:b <x:p> <<(_:b <x:p> _:o)>>. "); }
 
-    @Test public void parse_nt_good_3()    { parse("_:b <x:p> <<_:b <x:p> _:o>>. "); }
-
-    @Test public void parse_nt_good_4()    { parse("<< << <x:s> <x:p> <x:o> >> <x:q> '1' >> <x:q> '2' ."); }
+    @Test public void parse_nt_good_3()    { parse("<x:x> <x:y> <<(<x:s1> <x:p1> <<( <x:s> <x:p> '1' )>> )>> ."); }
 
+    @Test(expected=RiotException.class)
+    // No reified triples.
+    public void parse_nt_bad_1()           { parse("<< <x:s> <x:p> <x:o>>> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_nt_bad_1()           { parse("<<<x:s> <x:p> <x:o>>> . "); }
+    public void parse_nt_bad_2()           { parse("<<( <x:s> <x:p> <x:o>)>> <x:y> <x:z> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_nt_bad_2()           { parse("<<<x:s> 'str' <x:o>>> <x:p> <x:o>. "); }
+    public void parse_nt_bad_3()           { parse("<x:s> <<( <x:s> <x:p> <x:o>)>> <x:x>  . "); }
 
     private void parse(String string) {
         RDFParser.fromString(string, Lang.NTRIPLES).errorHandler(silent).parse(sink);
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestSPARQLStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestSPARQLStarParse.java
new file mode 100644
index 00000000000..99bd5e1a213
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestSPARQLStarParse.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.rdf12.basic;
+
+public class TestSPARQLStarParse {}
+
+//import static org.junit.Assert.assertEquals;
+//import static org.junit.Assert.assertFalse;
+//import static org.junit.Assert.assertTrue;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import org.apache.jena.atlas.lib.StrUtils;
+//import org.apache.jena.graph.Triple;
+//import org.apache.jena.query.Query;
+//import org.apache.jena.query.QueryFactory;
+//import org.apache.jena.query.QueryParseException;
+//import org.apache.jena.query.Syntax;
+//import org.apache.jena.sparql.algebra.Algebra;
+//import org.apache.jena.sparql.algebra.Op;
+//import org.apache.jena.sparql.algebra.OpAsQuery;
+//import org.apache.jena.sparql.algebra.op.OpBGP;
+//import org.apache.jena.sparql.core.BasicPattern;
+//import org.apache.jena.vocabulary.RDF;
+//import org.junit.Test;
+//
+//// RDF Star CG tests
+//
+//public class TestSPARQLStarParse {
+//
+//    // See also testing/ARQ/Syntax/Syntax-ARQ
+//    private static final String PREFIXES = StrUtils.strjoinNL
+//                ("PREFIX rdf: <"+RDF.getURI()+">"
+//                ,"PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>"
+//                ,"PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>"
+//                ,"PREFIX :    <http://example/>"
+//                ,""
+//                );
+//
+//    private static Query parse(String string) {
+//        Query query = QueryFactory.create(PREFIXES+"SELECT * "+string, Syntax.syntaxARQ);
+//        return query;
+//    }
+//
+//    private static void parseVars(String string, String... varNames) {
+//        Query query = parse(string);
+//
+//        List<String> vars = query.getResultVars();
+//        assertEquals("Wrong number of variables: "+Arrays.asList(varNames)+" : query: "+vars, varNames.length, vars.size());
+//        for ( String v : varNames )
+//            assertTrue("Expected variable ?"+v, vars.contains(v));
+//    }
+//
+//    @Test public void parse_good_1()    { parse("{ << :s :p :o >> :q 456 }"); }
+//
+//    @Test public void parse_good_2()    { parse("{ ?X :q << ?s ?p 123 >> }"); }
+//
+//    @Test public void parse_good_3()    { parse("{ << ?s ?p 123 >> :q << ?s ?p 123 >> }"); }
+//
+//    @Test public void parse_good_4()    { parse("{ << << :s :p 12 >> ?p << :s :p 34 >> >> :q << ?s ?p 123 >> }"); }
+//
+//    @Test public void parse_vars_1()    { parseVars("{ ?X :q << ?s ?p 123 >> }", "X", "s", "p"); }
+//
+//    @Test public void parse_vars_2()    { parseVars("{ ?X :q << ?s :p <<:s :q ?q>> >> }", "X", "s", "q"); }
+//
+//    // Test structures created.
+//    @Test public void build_1()    {
+//        Triple t = build("{ << :s :p :o >> :q 456 }");
+//        assertTrue(t.isConcrete());
+//        assertTrue(t.getSubject().isTripleTerm());
+//    }
+//
+//    @Test public void build_2()    {
+//        Triple t = build("{ :x  :q << <<:s ?p :o>> :p 678 >> }");
+//        assertFalse(t.isConcrete());
+//        assertTrue(t.getObject().isTripleTerm());
+//        assertTrue(t.getObject().getTriple().getSubject().isTripleTerm());
+//    }
+//
+//    @Test public void build_3()    {
+//        Triple t = build("{ << :s ?p :o >> :q 456 }");
+//        assertFalse(t.isConcrete());
+//        assertTrue(t.getSubject().isTripleTerm());
+//    }
+//
+//    // OpAsQuery
+//    @Test public void queryToOpToQuery_1()    {
+//        queryToOpToQuery("{ << :s :p :o >> :q 456 }");
+//    }
+//
+//    @Test public void queryToOpToQuery_2()    {
+//        queryToOpToQuery("{ << ?s ?p ?o >> :q 456 }");
+//    }
+//
+//    @Test public void queryToOpToQuery_3()    {
+//        queryToOpToQuery("{ << << :s :p ?x2 >> ?p << :s :p ?x2 >> >> :q << ?s ?p 123 >> }");
+//    }
+//
+//    private static void queryToOpToQuery(String string) {
+//        Query query = parse(string);
+//        Op op = Algebra.compile(query);
+//        query.getPrefixMapping().clearNsPrefixMap();
+//        Query query2 = OpAsQuery.asQuery(op);
+//        assertEquals(query, query2);
+//    }
+//
+//    private static Triple build(String string) {
+//        Query query = parse(string);
+//        Op op = Algebra.compile(query);
+//        BasicPattern bgp = ((OpBGP)op).getPattern();
+//        assertEquals(1, bgp.size());
+//        Triple t = bgp.get(0);
+//        return t ;
+//    }
+//
+//
+//    @Test(expected=QueryParseException.class)
+//    public void parse_bad_1()           { parse("{ <<:s :p :o>> }"); }
+//
+//    @Test(expected=QueryParseException.class)
+//    public void parse_bad_2()           { parse("{ ?X << :s :p 123 >> ?Z }"); }
+//
+//    @Test(expected=QueryParseException.class)
+//    public void parse_bad_3()           { parse("{ << :subject << :s :p 12 >> :object >> :q 123 }"); }
+//
+//}
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestTrigStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTrigStarParse.java
similarity index 59%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TestTrigStarParse.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTrigStarParse.java
index bf568ef5a07..dd6eaa584a2 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestTrigStarParse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTrigStarParse.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12.basic;
 
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFParser;
@@ -35,26 +35,29 @@ public class TestTrigStarParse {
     private ErrorHandler silent = ErrorHandlerFactory.errorHandlerStrictNoLogging;
     private static StreamRDF sink = StreamRDFLib.sinkNull();
 
-    @Test public void parse_trig_good_1()    { parse("<<:s :p :o>> :q 1 . "); }
+    @Test public void parse_trig_good_tripleTerm_1()    { parse(":x :q <<(:s :p :o)>>  . "); }
 
-    @Test public void parse_trig_good_2()    { parse(":x :p <<:s :p :o>> . "); }
+    @Test public void parse_trig_good_tripleTerm_2()    { parse(":x :p <<( :s :p <<( :Ls1 :1p :o1 )>> )>> . "); }
 
-    @Test public void parse_trig_good_3()    { parse(":x :p [ :q <<:s :p :o>> ]. "); }
+    @Test public void parse_trig_good_reifiedTriple_1()    { parse("<<:s :p :o>> :q 1 . "); }
 
-    @Test public void parse_trig_good_4()    { parse("( <<:s :p :o>> ) :p :z . "); }
+    @Test public void parse_trig_good_reifiedTriple_2()    { parse(":x :p <<:s :p :o>> . "); }
 
-    @Test public void parse_trig_good_10()   { parse("<<:s :p <<:x :r :z >>>> :q 1 . "); }
+    @Test public void parse_trig_good_reifiedTriple_3()    { parse(":x :p [ :q <<:s :p :o>> ]. "); }
 
-    @Test public void parse_trig_good_20()   { parse(":a :p <<:s :p <<:x :r :z >>>> . "); }
+    @Test public void parse_trig_good_reifiedTriple_4()    { parse("( <<:s :p :o>> ) :p :z . "); }
 
-    @Test(expected=RiotException.class)
-    public void parse_trig_bad_1()           { parse("<<:s :p :o>> . "); }
+    @Test public void parse_trig_good_reifiedTriple_5()    { parse("<<:s :p :o>> . "); }
+
+    @Test public void parse_trig_good_reifiedTriple_10()   { parse("<<:s :p <<:x :r :z >>>> :q 1 . "); }
+
+    @Test public void parse_trig_good_reifiedTriple_20()   { parse(":a :p <<:s :p <<:x :r :z >>>> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_trig_bad_2()           { parse("GRAPH <<:s :p :o>> {} "); }
+    public void parse_trig_bad_1()           { parse("GRAPH <<(:s :p :o)>> {} "); }
 
     @Test(expected=RiotException.class)
-    public void parse_trig_bad_3()           { parse("<<:s :p :o>> { :s :p :o } "); }
+    public void parse_trig_bad_2()           { parse("<<(:s :p :o)>> { :s :p :o } "); }
 
     private void parse(String string) {
         string = "PREFIX : <http://example/>\n"+string;
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestTurtleStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTurtleStarParse.java
similarity index 84%
rename from jena-arq/src/test/java/org/apache/jena/rdf_star/TestTurtleStarParse.java
rename to jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTurtleStarParse.java
index 260a7581eb8..f9e0f755f44 100644
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestTurtleStarParse.java
+++ b/jena-arq/src/test/java/org/apache/jena/rdf12/basic/TestTurtleStarParse.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.rdf_star;
+package org.apache.jena.rdf12.basic;
 
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFParser;
@@ -50,21 +50,20 @@ public class TestTurtleStarParse {
 
     @Test public void parse_turtle_good_20()   { parse(":a :p <<:s :p <<:x :r :z >>>> . "); }
 
-
-    @Test(expected=RiotException.class)
+    // Reified triple declarations.
     public void parse_turtle_bad_1()           { parse("<<:s :p :o>> . "); }
 
-    @Test(expected=RiotException.class)
-    public void parse_turtle_bad_2()           { parse("<<:s <<:x :y :z>> :o >> :q 1 . "); }
+    // Triple Terms.
+    @Test public void parse_turtle_good_50()   { parse(":a :p <<(:s :p <<(:x :r :z )>>)>> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_turtle_bad_3()           { parse("<<:s :p (3) >> :q 1 . "); }
+    public void parse_turtle_bad_2()           { parse("<<(:s :p :o )>> :q 1 . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_turtle_bad_4()           { parse("<< 3 :p :o >> :q 1 . "); }
+    public void parse_turtle_bad_3()           { parse(":s :q <<:s :p (3) >> . "); }
 
     @Test(expected=RiotException.class)
-    public void parse_turtle_bad_5()           { parse(":s << :x :y :z >> :o . "); }
+    public void parse_turtle_bad_4()           { parse(":s :p <<( 3 :q :t >> . "); }
 
     private void parse(String string) {
         string = "PREFIX : <http://example/>\n"+string;
diff --git a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarParse.java b/jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarParse.java
deleted file mode 100644
index 873a32cdfa4..00000000000
--- a/jena-arq/src/test/java/org/apache/jena/rdf_star/TestSPARQLStarParse.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.rdf_star;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QueryParseException;
-import org.apache.jena.query.Syntax;
-import org.apache.jena.sparql.algebra.Algebra;
-import org.apache.jena.sparql.algebra.Op;
-import org.apache.jena.sparql.algebra.OpAsQuery;
-import org.apache.jena.sparql.algebra.op.OpBGP;
-import org.apache.jena.sparql.core.BasicPattern;
-import org.apache.jena.vocabulary.RDF;
-import org.junit.Test;
-
-public class TestSPARQLStarParse {
-
-    // See also testing/ARQ/Syntax/Syntax-ARQ
-    private static final String PREFIXES = StrUtils.strjoinNL
-                ("PREFIX rdf: <"+RDF.getURI()+">"
-                ,"PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>"
-                ,"PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>"
-                ,"PREFIX :    <http://example/>"
-                ,""
-                );
-
-    private static Query parse(String string) {
-        Query query = QueryFactory.create(PREFIXES+"SELECT * "+string, Syntax.syntaxARQ);
-        return query;
-    }
-
-    private static void parseVars(String string, String... varNames) {
-        Query query = parse(string);
-
-        List<String> vars = query.getResultVars();
-        assertEquals("Wrong number of variables: "+Arrays.asList(varNames)+" : query: "+vars, varNames.length, vars.size());
-        for ( String v : varNames )
-            assertTrue("Expected variable ?"+v, vars.contains(v));
-    }
-
-    @Test public void parse_good_1()    { parse("{ << :s :p :o >> :q 456 }"); }
-
-    @Test public void parse_good_2()    { parse("{ ?X :q << ?s ?p 123 >> }"); }
-
-    @Test public void parse_good_3()    { parse("{ << ?s ?p 123 >> :q << ?s ?p 123 >> }"); }
-
-    @Test public void parse_good_4()    { parse("{ << << :s :p 12 >> ?p << :s :p 34 >> >> :q << ?s ?p 123 >> }"); }
-
-    @Test public void parse_vars_1()    { parseVars("{ ?X :q << ?s ?p 123 >> }", "X", "s", "p"); }
-
-    @Test public void parse_vars_2()    { parseVars("{ ?X :q << ?s :p <<:s :q ?q>> >> }", "X", "s", "q"); }
-
-    // Test structures created.
-    @Test public void build_1()    {
-        Triple t = build("{ << :s :p :o >> :q 456 }");
-        assertTrue(t.isConcrete());
-        assertTrue(t.getSubject().isNodeTriple());
-    }
-
-    @Test public void build_2()    {
-        Triple t = build("{ :x  :q << <<:s ?p :o>> :p 678 >> }");
-        assertFalse(t.isConcrete());
-        assertTrue(t.getObject().isNodeTriple());
-        assertTrue(t.getObject().getTriple().getSubject().isNodeTriple());
-    }
-
-    @Test public void build_3()    {
-        Triple t = build("{ << :s ?p :o >> :q 456 }");
-        assertFalse(t.isConcrete());
-        assertTrue(t.getSubject().isNodeTriple());
-    }
-
-    // OpAsQuery
-    @Test public void queryToOpToQuery_1()    {
-        queryToOpToQuery("{ << :s :p :o >> :q 456 }");
-    }
-
-    @Test public void queryToOpToQuery_2()    {
-        queryToOpToQuery("{ << ?s ?p ?o >> :q 456 }");
-    }
-
-    @Test public void queryToOpToQuery_3()    {
-        queryToOpToQuery("{ << << :s :p ?x2 >> ?p << :s :p ?x2 >> >> :q << ?s ?p 123 >> }");
-    }
-
-    private static void queryToOpToQuery(String string) {
-        Query query = parse(string);
-        Op op = Algebra.compile(query);
-        query.getPrefixMapping().clearNsPrefixMap();
-        Query query2 = OpAsQuery.asQuery(op);
-        assertEquals(query, query2);
-    }
-
-    private static Triple build(String string) {
-        Query query = parse(string);
-        Op op = Algebra.compile(query);
-        BasicPattern bgp = ((OpBGP)op).getPattern();
-        assertEquals(1, bgp.size());
-        Triple t = bgp.get(0);
-        return t ;
-    }
-
-
-    @Test(expected=QueryParseException.class)
-    public void parse_bad_1()           { parse("{ <<:s :p :o>> }"); }
-
-    @Test(expected=QueryParseException.class)
-    public void parse_bad_2()           { parse("{ ?X << :s :p 123 >> ?Z }"); }
-
-    @Test(expected=QueryParseException.class)
-    public void parse_bad_3()           { parse("{ << :subject << :s :p 12 >> :object >> :q 123 }"); }
-
-}
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java
index d67c3c9db98..885cb1747fa 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/Scripts_AltTurtle.java
@@ -36,9 +36,12 @@
     "testing/RIOT/Lang/TurtleStd/manifest.ttl",
     "testing/RIOT/Lang/Turtle2/manifest.ttl",
 
-    "testing/rdf-tests-cg/turtle/manifest.ttl",
-    "testing/rdf-star-cg/turtle/syntax/manifest.ttl",
-    "testing/rdf-star-cg/turtle/eval/manifest.ttl"
+    // rdf-tests CG
+    "testing/rdf-tests-cg/turtle/manifest.ttl"
+    
+    // [rdf-star CG] RDF star CG tests. No longer valid
+//    "testing/rdf-star-cg/turtle/syntax/manifest.ttl",
+//    "testing/rdf-star-cg/turtle/eval/manifest.ttl"
 })
 
 public class Scripts_AltTurtle
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
index 70269b0ee78..cf1bf2745de 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
@@ -29,7 +29,7 @@
 import org.apache.jena.sparql.sse.SSE ;
 import org.junit.Test ;
 
-/** Test the behaviour of the RIOT reader for TriG.  TriG includes checking of terms */
+/** Test the behaviour of the RIOT reader for TriG.  TriG includes checking of terms. */
 public class TestLangTrig
 {
     @Test public void trig_01()     { parse("{}") ; }
@@ -53,34 +53,56 @@ public class TestLangTrig
 
     @Test public void trig_11()
     {
-        DatasetGraph dsg = parse("@prefix ex:  <http://example/> .",
-                                 "{ ex:s ex:p 123 }") ;
+        DatasetGraph dsg = parse("""
+                @prefix ex:  <http://example/> .
+                { ex:s ex:p 123 }
+                """) ;
         assertEquals(1, dsg.getDefaultGraph().size()) ;
         Triple t = dsg.getDefaultGraph().find(null,null,null).next();
         Triple t2 = SSE.parseTriple("(<http://example/s> <http://example/p> 123)") ;
     }
 
-
-    @Test public void trig_12()     { parse("@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .",
-                                            "{ <x> <p> '1'^^xsd:byte }") ; }
+    @Test
+    public void trig_12() {
+        parse("""
+                PREFIX xsd:  <http://www.w3.org/2001/XMLSchema#>
+                { <x> <p> '1'^^xsd:byte }
+              """);
+    }
 
     // Also need to check that the RiotExpection is called in normal use.
 
     // Bad terms.
     @Test (expected=ExError.class)
-    public void trig_20()     { parse("@prefix ex:  <bad iri> .", "{ ex:s ex:p 123 }") ; }
+    public void trig_20() {
+        parse("""
+                @prefix ex:  <bad iri> .
+                { ex:s ex:p 123 }
+              """);
+    }
 
-    @Test (expected=ExError.class)
-    public void trig_21()     { parse("@prefix ex:  <http://example/> .", "{ ex:s <http://example/broken p> 123 }") ; }
+    @Test(expected = ExError.class)
+    public void trig_21() {
+        parse("""
+                @prefix ex:  <http://example/> .
+                { ex:s <http://example/broken p> 123 }
+                """);
+    }
 
-    @Test (expected=ExError.class)
-    public void trig_22()     { parse("{ <x> <p> 'number'^^<bad uri> }") ; }
+    @Test(expected = ExError.class)
+    public void trig_22() {
+        parse("{ <x> <p> 'number'^^<bad uri> }");
+    }
 
-    @Test (expected=ExWarning.class)
-    public void trig_23()     { parse("@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .", "{ <x> <p> 'number'^^xsd:byte }") ; }
+    @Test(expected = ExWarning.class)
+    public void trig_23() {
+        parse("""
+                @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+                { <x> <p> 'number'^^xsd:byte }
+                """);
+    }
 
-    private static DatasetGraph parse(String... strings) {
-        String string = String.join("\n", strings) ;
+    private static DatasetGraph parse(String string) {
         return ParserTests.parser().fromString(string).lang(Lang.TRIG).toDatasetGraph();
     }
 
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java
index 04096991d16..e8f28ff63f9 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXBad.java
@@ -55,13 +55,10 @@ public static Iterable<Object[]> data() {
                   { DIR+"/trix-bad-08.trix" } ,
                   { DIR+"/trix-bad-09.trix" } ,
 
-                  { DIR+"/trix-star-bad-asserted-1.trix" },
-                  { DIR+"/trix-star-bad-asserted-2.trix" },
-                  { DIR+"/trix-star-bad-emb-1.trix" },
-                  { DIR+"/trix-star-bad-emb-2.trix" },
-                  { DIR+"/trix-star-bad-emb-nested-1.trix" },
-                  { DIR+"/trix-star-bad-emb-nested-2.trix" },
-                  { DIR+"/trix-star-bad-emb-nested-3.trix" }
+                  { DIR+"/trix-star-bad-triple-term-1.trix" },
+                  { DIR+"/trix-star-bad-triple-term-2.trix" },
+                  { DIR+"/trix-star-bad-triple-term-3.trix" },
+                  { DIR+"/trix-star-bad-triple-term-4.trix" },
                   });
     }
 
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufResultSet.java b/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufResultSet.java
index b94b3cebf20..4f554154c03 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufResultSet.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufResultSet.java
@@ -40,7 +40,7 @@
 import org.junit.Test;
 
 public class TestProtobufResultSet {
-    // Only datatypes that transmitted perfectly.
+    // Only datatypes that are transmitted perfectly.
     static ResultSetRewindable rs0 = make
         ("(resultset (?x ?y)"
          , "   (row (?x _:a) (?y 3))"
@@ -49,7 +49,7 @@ public class TestProtobufResultSet {
          , "   (row (?x _:a))"
          , "   (row)"
          , "   (row (?x 2) (?y 10))"
-         , "   (row (?x 2) (?y <<_:a :p :o>>))"
+         , "   (row (?x 2) (?y <<(_:a :p :o)>>))"
          , ")"
          ) ;
 
@@ -57,13 +57,13 @@ public class TestProtobufResultSet {
         ("(resultset (?x ?y)"
          , "   (row (?x 1) (?y 3))"
          , "   (row (?x 1) (?y 'a'))"
-         , "   (row (?x 2) (?y <<:s :p :o>>))"
+         , "   (row (?x 2) (?y <<(:s :p :o)>>))"
          , ")"
          ) ;
     static ResultSetRewindable rs2 = make
         ("(resultset (?x ?y)"
          , "   (row (?x 1) (?y 'a'))"
-         , "   (row (?x 2) (?y <<:s :p :o>>))"
+         , "   (row (?x 2) (?y <<(:s :p :o)>>))"
          , "   (row (?x 1) (?y 3))"
          , ")"
          ) ;
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufTerm.java b/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufTerm.java
index 5149e1f4016..b0b6a03c77c 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufTerm.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/protobuf/TestProtobufTerm.java
@@ -25,68 +25,71 @@
 import java.util.Set;
 
 import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
 import org.apache.jena.graph.Triple;
-import org.apache.jena.rdf.model.impl.Util ;
+import org.apache.jena.rdf.model.impl.Util;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.*;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Literal.LiteralKindCase;
 import org.apache.jena.riot.protobuf.wire.PB_RDF.RDF_Term.TermCase;
 import org.apache.jena.riot.system.PrefixMap;
-import org.apache.jena.riot.system.PrefixMapFactory ;
+import org.apache.jena.riot.system.PrefixMapFactory;
 import org.apache.jena.sparql.expr.NodeValue;
-import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.vocabulary.RDF ;
-import org.apache.jena.vocabulary.RDFS ;
-import org.apache.jena.vocabulary.XSD ;
-import org.junit.Test ;
+import org.apache.jena.sparql.sse.SSE;
+import org.apache.jena.sys.JenaSystem;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+import org.apache.jena.vocabulary.XSD;
+import org.junit.Test;
 
 public class TestProtobufTerm {
-    static PrefixMap prefixMap = PrefixMapFactory.create() ;
+    static { JenaSystem.init(); }
+
+    static PrefixMap prefixMap = PrefixMapFactory.create();
     static {
-        prefixMap.add("rdf",    RDF.getURI()) ;
-        prefixMap.add("xsd",    XSD.getURI()) ;
-        prefixMap.add("rdfs",   RDFS.getURI()) ;
-        prefixMap.add("ex",     "http://example.org/") ;
-        prefixMap.add("",       "http://example/") ;
-        prefixMap.add("ns",     "http://namespace/ns#") ;
+        prefixMap.add("rdf",    RDF.getURI());
+        prefixMap.add("xsd",    XSD.getURI());
+        prefixMap.add("rdfs",   RDFS.getURI());
+        prefixMap.add("ex",     "http://example.org/");
+        prefixMap.add("",       "http://example/");
+        prefixMap.add("ns",     "http://namespace/ns#");
     }
 
     // Terms
     @Test public void term_uri_01() {
-        testTerm("<http://hostname/>") ;
+        testTerm("<http://hostname/>");
     }
 
     @Test public void term_uri_02()  {
-        RDF_Term rt = testTerm("<http://example/>") ;
-        assertTrue(rt.hasPrefixName()) ;
-        assertEquals(rt.getPrefixName().getPrefix(), "") ;
-        assertEquals(rt.getPrefixName().getLocalName(),  "") ;
+        RDF_Term rt = testTerm("<http://example/>");
+        assertTrue(rt.hasPrefixName());
+        assertEquals(rt.getPrefixName().getPrefix(), "");
+        assertEquals(rt.getPrefixName().getLocalName(),  "");
     }
 
     @Test public void term_uri_03()  {
-        RDF_Term rt = testTerm("<http://namespace/ns#foobar>") ;
-        assertTrue(rt.hasPrefixName()) ;
-        assertEquals(rt.getPrefixName().getPrefix(), "ns") ;
-        assertEquals(rt.getPrefixName().getLocalName(),  "foobar") ;
+        RDF_Term rt = testTerm("<http://namespace/ns#foobar>");
+        assertTrue(rt.hasPrefixName());
+        assertEquals(rt.getPrefixName().getPrefix(), "ns");
+        assertEquals(rt.getPrefixName().getLocalName(),  "foobar");
     }
 
     @Test public void term_uri_04()  {
-        RDF_Term rt = testTerm("rdf:type") ;
-        assertTrue(rt.hasPrefixName()) ;
-        assertEquals(rt.getPrefixName().getPrefix(), "rdf") ;
-        assertEquals(rt.getPrefixName().getLocalName(),  "type") ;
+        RDF_Term rt = testTerm("rdf:type");
+        assertTrue(rt.hasPrefixName());
+        assertEquals(rt.getPrefixName().getPrefix(), "rdf");
+        assertEquals(rt.getPrefixName().getLocalName(),  "type");
     }
 
     @Test public void term_literal_01() {
-        RDF_Term rt = testTerm("'foo'") ;
+        RDF_Term rt = testTerm("'foo'");
         assertTrue(rt.hasLiteral());
         RDF_Literal lit = rt.getLiteral();
         assertTrue(lit.getSimple());
     }
 
     @Test public void term_literal_02() {
-        RDF_Term rt = testTerm("'foo'@en") ;
+        RDF_Term rt = testTerm("'foo'@en");
         assertFalse(rt.getLiteral().getSimple());
 
         assertTrue(rt.hasLiteral());
@@ -96,22 +99,31 @@ public class TestProtobufTerm {
     }
 
     @Test public void term_literal_03() {
-        RDF_Term rt = testTerm("123") ;
+        RDF_Term rt = testTerm("'foo'@en--ltr");
+        assertFalse(rt.getLiteral().getSimple());
+        assertTrue(rt.hasLiteral());
+        RDF_Literal lit = rt.getLiteral();
+        assertTrue(lit.getLiteralKindCase()==LiteralKindCase.LANGDIR);
+        assertEquals("en--ltr", lit.getLangdir());
+    }
+
+    @Test public void term_literal_04() {
+        RDF_Term rt = testTerm("123");
         assertTrue(rt.getLiteral().hasDtPrefix());
         assertTrue(rt.getLiteral().getLiteralKindCase()==LiteralKindCase.DTPREFIX);
-        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "xsd") ;
-        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "integer") ;
+        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "xsd");
+        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "integer");
     }
 
-    @Test public void term_literal_04() {
-        RDF_Term rt = testTerm("'foo'^^<http://dataype/>") ;
+    @Test public void term_literal_05() {
+        RDF_Term rt = testTerm("'foo'^^<http://dataype/>");
         assertFalse(rt.getLiteral().getSimple());
         RDF_Literal lit = rt.getLiteral();
         assertEquals("http://dataype/", lit.getDatatype());
     }
 
-    @Test public void term_literal_05() {
-        RDF_Term rt = testTerm("'foo'^^<http://example/>") ;
+    @Test public void term_literal_06() {
+        RDF_Term rt = testTerm("'foo'^^<http://example/>");
         assertFalse(rt.getLiteral().getSimple());
         RDF_Literal lit = rt.getLiteral();
         assertEquals("", lit.getDtPrefix().getPrefix());
@@ -119,26 +131,26 @@ public class TestProtobufTerm {
     }
 
     @Test public void term_var_01() {
-        testTerm("?var") ;
+        testTerm("?var");
     }
 
     @Test public void term_bnode_01() {
-        Node n = SSE.parseNode("_:blanknode") ;
-        RDF_Term rt = testTerm(n) ;
-        assertEquals(rt.getBnode().getLabel(), n.getBlankNodeLabel()) ;
+        Node n = SSE.parseNode("_:blanknode");
+        RDF_Term rt = testTerm(n);
+        assertEquals(rt.getBnode().getLabel(), n.getBlankNodeLabel());
     }
 
     @Test public void term_bnode_02() {
-        String label = "abcdefghijklmn" ;
-        Node n = NodeFactory.createBlankNode("abcdefghijklmn") ;
-        RDF_Term rt = testTerm(n) ;
-        assertTrue(rt.hasBnode()) ;
-        assertEquals("abcdefghijklmn", rt.getBnode().getLabel()) ;
+        String label = "abcdefghijklmn";
+        Node n = NodeFactory.createBlankNode("abcdefghijklmn");
+        RDF_Term rt = testTerm(n);
+        assertTrue(rt.hasBnode());
+        assertEquals("abcdefghijklmn", rt.getBnode().getLabel());
     }
 
     @Test public void term_any_1() {
-        RDF_Term rt = testTerm(Node.ANY) ;
-        assertTrue(rt.hasAny()) ;
+        RDF_Term rt = testTerm(Node.ANY);
+        assertTrue(rt.hasAny());
     }
 
     // testTermValue does not chech the round triple because
@@ -146,143 +158,143 @@ public class TestProtobufTerm {
     // Additional value tests needed.
 
     @Test public void term_value_01() {
-        RDF_Term rt = testTermValue("123") ;
+        RDF_Term rt = testTermValue("123");
         assertEquals(rt.getTermCase(), TermCase.VALINTEGER);
-        assertEquals(123, rt.getValInteger()) ;
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_02() {
-        RDF_Term rt = testTermValue("'123'^^xsd:integer") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:integer");
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_03() {
-        RDF_Term rt = testTermValue("'123'^^xsd:long") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:long");
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_04() {
-        RDF_Term rt = testTermValue("'123'^^xsd:int") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:int");
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_05() {
-        RDF_Term rt = testTermValue("'123'^^xsd:short") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:short");
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_06() {
-        RDF_Term rt = testTermValue("'123'^^xsd:byte") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:byte");
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_10() {
-        RDF_Term rt = testTermValue("123.6") ;
-        assertEquals(1236, rt.getValDecimal().getValue()) ;
-        assertEquals(1, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("123.6");
+        assertEquals(1236, rt.getValDecimal().getValue());
+        assertEquals(1, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_11() {
-        RDF_Term rt = testTermValue("0.005") ;
-        assertEquals(5, rt.getValDecimal().getValue()) ;
-        assertEquals(3, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("0.005");
+        assertEquals(5, rt.getValDecimal().getValue());
+        assertEquals(3, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_12() {
-        RDF_Term rt = testTermValue("50.0") ;
-        assertEquals(500, rt.getValDecimal().getValue()) ;
-        assertEquals(1, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("50.0");
+        assertEquals(500, rt.getValDecimal().getValue());
+        assertEquals(1, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_13() {
-        RDF_Term rt = testTermValue("50.05") ;
-        assertEquals(5005, rt.getValDecimal().getValue()) ;
-        assertEquals(2, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("50.05");
+        assertEquals(5005, rt.getValDecimal().getValue());
+        assertEquals(2, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_20() {
-        RDF_Term rt = testTermValue("50e6") ;
-        assertEquals(50e6, rt.getValDouble(), 0.001) ;
+        RDF_Term rt = testTermValue("50e6");
+        assertEquals(50e6, rt.getValDouble(), 0.001);
     }
 
     @Test public void term_value_21() {
-        RDF_Term rt = testTermValue("50e-6") ;
-        assertEquals(50e-6, rt.getValDouble(), 0.001e6) ;
+        RDF_Term rt = testTermValue("50e-6");
+        assertEquals(50e-6, rt.getValDouble(), 0.001e6);
     }
 
     // Test expect roundtrip of values.
     @Test public void term_value_roundtriple_1() {
-        RDF_Term rt = testTermValue("'123'^^xsd:integer") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:integer");
+        assertEquals(123, rt.getValInteger());
         Node n = ProtobufConvert.convert(rt, prefixMap);
         assertEquals(XSDDatatype.XSDinteger, n.getLiteralDatatype());
         assertEquals("123", n.getLiteralLexicalForm());
     }
 
     @Test public void term_value_roundtriple_2() {
-        RDF_Term rt = testTermValue("'123'^^xsd:long") ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:long");
+        assertEquals(123, rt.getValInteger());
         Node n = ProtobufConvert.convert(rt, prefixMap);
         assertEquals(XSDDatatype.XSDinteger, n.getLiteralDatatype());
         assertEquals("123", n.getLiteralLexicalForm());
     }
 
     @Test public void term_value_roundtriple_3() {
-        RDF_Term rt = testTermValue("45.67") ;
-        assertTrue(rt.hasValDecimal()) ;
+        RDF_Term rt = testTermValue("45.67");
+        assertTrue(rt.hasValDecimal());
         Node n = ProtobufConvert.convert(rt, prefixMap);
         assertEquals(XSDDatatype.XSDdecimal, n.getLiteralDatatype());
         assertEquals("45.67", n.getLiteralLexicalForm());
     }
 
     @Test public void term_value_roundtriple_4() {
-        RDF_Term rt = testTermValue("50e6") ;
+        RDF_Term rt = testTermValue("50e6");
         Node n = ProtobufConvert.convert(rt, prefixMap);
         assertEquals(XSDDatatype.XSDdouble, n.getLiteralDatatype());
         assertEquals("5.0E7", n.getLiteralLexicalForm());
     }
 
     private RDF_Term testTermValue(String str) {
-        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, true) ;
-        return rt ;
+        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, true);
+        return rt;
     }
 
     private RDF_Term testTerm(String str) {
-        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, false) ;
-        return rt ;
+        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, false);
+        return rt;
     }
 
     private RDF_Term testTerm(Node node) {
-        return testTerm(node, null, false) ;
+        return testTerm(node, null, false);
     }
 
     private static void assertNullPB(String obj) {
         assertEquals("", obj);
     }
 
-    private static Set<XSDDatatype> integerSubTypes = new HashSet<>() ;
+    private static Set<XSDDatatype> integerSubTypes = new HashSet<>();
     static {
-//        floatingpointSubTypes.add(XSDDatatype.XSDfloat) ;
-//        floatingpointSubTypes.add(XSDDatatype.XSDdouble) ;
-//      decimalSubTypes.add(XSDDatatype.XSDdecimal) ;
-        integerSubTypes.add(XSDDatatype.XSDint) ;
-        integerSubTypes.add(XSDDatatype.XSDlong) ;
-        integerSubTypes.add(XSDDatatype.XSDshort) ;
-        integerSubTypes.add(XSDDatatype.XSDbyte) ;
-        integerSubTypes.add(XSDDatatype.XSDunsignedByte) ;
-        integerSubTypes.add(XSDDatatype.XSDunsignedShort) ;
-        integerSubTypes.add(XSDDatatype.XSDunsignedInt) ;
-        integerSubTypes.add(XSDDatatype.XSDunsignedLong) ;
-        integerSubTypes.add(XSDDatatype.XSDinteger) ;
-        integerSubTypes.add(XSDDatatype.XSDnonPositiveInteger) ;
-        integerSubTypes.add(XSDDatatype.XSDnonNegativeInteger) ;
-        integerSubTypes.add(XSDDatatype.XSDpositiveInteger) ;
-        integerSubTypes.add(XSDDatatype.XSDnegativeInteger) ;
+//        floatingpointSubTypes.add(XSDDatatype.XSDfloat);
+//        floatingpointSubTypes.add(XSDDatatype.XSDdouble);
+//      decimalSubTypes.add(XSDDatatype.XSDdecimal);
+        integerSubTypes.add(XSDDatatype.XSDint);
+        integerSubTypes.add(XSDDatatype.XSDlong);
+        integerSubTypes.add(XSDDatatype.XSDshort);
+        integerSubTypes.add(XSDDatatype.XSDbyte);
+        integerSubTypes.add(XSDDatatype.XSDunsignedByte);
+        integerSubTypes.add(XSDDatatype.XSDunsignedShort);
+        integerSubTypes.add(XSDDatatype.XSDunsignedInt);
+        integerSubTypes.add(XSDDatatype.XSDunsignedLong);
+        integerSubTypes.add(XSDDatatype.XSDinteger);
+        integerSubTypes.add(XSDDatatype.XSDnonPositiveInteger);
+        integerSubTypes.add(XSDDatatype.XSDnonNegativeInteger);
+        integerSubTypes.add(XSDDatatype.XSDpositiveInteger);
+        integerSubTypes.add(XSDDatatype.XSDnegativeInteger);
     }
 
     // Encode a node, see if the RDF_Term is correct.
     private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
-        RDF_Term rt = ProtobufConvert.convert(node, pmap, asValue) ;
+        RDF_Term rt = ProtobufConvert.convert(node, pmap, asValue);
 
         if ( node == null) {
             assertTrue(rt.hasUndefined());
@@ -292,60 +304,66 @@ private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
         switch (rt.getTermCase()) {
 //            message RDF_Term {
 //                oneof term {
-//                  RDF_IRI        iri        = 1 ;
-//                  RDF_BNode      bnode      = 2 ;
-//                  RDF_Literal    literal    = 3 ;
-//                  RDF_PrefixName prefixName = 4 ;
-//                  RDF_VAR        variable   = 5 ;
-//                  RDF_Triple     tripleTerm = 6 ;
-//                  RDF_ANY        any        = 7 ;
-//                  RDF_UNDEF      undefined  = 8 ;
-//                  RDF_REPEAT     repeat     = 9 ;
+//                  RDF_IRI        iri        = 1;
+//                  RDF_BNode      bnode      = 2;
+//                  RDF_Literal    literal    = 3;
+//                  RDF_PrefixName prefixName = 4;
+//                  RDF_VAR        variable   = 5;
+//                  RDF_Triple     tripleTerm = 6;
+//                  RDF_ANY        any        = 7;
+//                  RDF_UNDEF      undefined  = 8;
+//                  RDF_REPEAT     repeat     = 9;
 //
 //                  // Value forms of literals.
-//                  int64          valInteger = 20 ;
-//                  double         valDouble  = 21 ;
-//                  RDF_Decimal    valDecimal = 22 ;
+//                  int64          valInteger = 20;
+//                  double         valDouble  = 21;
+//                  RDF_Decimal    valDecimal = 22;
 //                }
 //              }
             case IRI : {
-                RDF_IRI iri = rt.getIri() ;
-                assertEquals(node.getURI(), iri.getIri()) ;
+                RDF_IRI iri = rt.getIri();
+                assertEquals(node.getURI(), iri.getIri());
                 break;
             }
             case BNODE : {
-                RDF_BNode bnode = rt.getBnode() ;
-                assertEquals(node.getBlankNodeLabel(), bnode.getLabel()) ;
+                RDF_BNode bnode = rt.getBnode();
+                assertEquals(node.getBlankNodeLabel(), bnode.getLabel());
                 break;
             }
             case LITERAL : {
-                RDF_Literal lit = rt.getLiteral() ;
-                assertEquals(node.getLiteralLexicalForm(), lit.getLex()) ;
+                RDF_Literal lit = rt.getLiteral();
+                assertEquals(node.getLiteralLexicalForm(), lit.getLex());
 
                 // RDF 1.1
                 if ( Util.isSimpleString(node) ) {
                     assertTrue(lit.getSimple());
                     // Protobuf default is ""
-                    assertNullPB(lit.getDatatype()) ;
+                    assertNullPB(lit.getDatatype());
                     assertEquals(RDF_PrefixName.getDefaultInstance(), lit.getDtPrefix());
-                    assertNullPB(lit.getLangtag()) ;
+                    assertNullPB(lit.getLangtag());
                 } else if ( Util.isLangString(node) ) {
                     assertFalse(lit.getSimple());
-                    assertNullPB(lit.getDatatype()) ;
+                    assertNullPB(lit.getDatatype());
                     assertEquals(RDF_PrefixName.getDefaultInstance(), lit.getDtPrefix());
-                    assertNotSame("", lit.getLangtag()) ;
-                }
-                else {
+                    assertNotSame("", lit.getLangtag());
+                    assertNullPB(lit.getLangdir());
+                } else if ( Util.isDirLangString(node) ) {
+                    assertFalse(lit.getSimple());
+                    assertNullPB(lit.getDatatype());
+                    assertEquals(RDF_PrefixName.getDefaultInstance(), lit.getDtPrefix());
+                    assertNullPB(lit.getLangtag());
+                    assertNotSame("", lit.getLangdir());
+                } else {
                     assertFalse(lit.getSimple());
                     // Regular typed literal.
                     assertTrue(lit.getDatatype() != null || lit.getDtPrefix() != null );
-                    assertNullPB(lit.getLangtag()) ;
+                    assertNullPB(lit.getLangtag());
                 }
                 break;
             }
             case PREFIXNAME : {
-                assertNotNull(rt.getPrefixName().getPrefix()) ;
-                assertNotNull(rt.getPrefixName().getLocalName()) ;
+                assertNotNull(rt.getPrefixName().getPrefix());
+                assertNotNull(rt.getPrefixName().getLocalName());
                 String x = pmap.expand(rt.getPrefixName().getPrefix(), rt.getPrefixName().getLocalName());
                 assertEquals(node.getURI(),x);
                 break;
@@ -391,9 +409,9 @@ private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
                 NodeValue nv = NodeValue.makeNode(node);
                 assertTrue(nv.isDecimal());
 
-                long value = rt.getValDecimal().getValue() ;
-                int scale =  rt.getValDecimal().getScale() ;
-                BigDecimal d =  BigDecimal.valueOf(value, scale) ;
+                long value = rt.getValDecimal().getValue();
+                int scale =  rt.getValDecimal().getScale();
+                BigDecimal d =  BigDecimal.valueOf(value, scale);
                 assertEquals(nv.getDecimal(), d);
                 break;
             }
@@ -405,7 +423,7 @@ private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
         if ( ! asValue ) {
             // Value based does not preserve exact datatype or lexical form.
             Node n2 = ProtobufConvert.convert(rt, pmap);
-            assertEquals(node, n2) ;
+            assertEquals(node, n2);
         }
 
         return rt;
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/resultset/TestResultSetIO.java b/jena-arq/src/test/java/org/apache/jena/riot/resultset/TestResultSetIO.java
index bef97c41c36..fdd10af50a6 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/resultset/TestResultSetIO.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/resultset/TestResultSetIO.java
@@ -27,6 +27,12 @@
 import java.util.Collection ;
 import java.util.List ;
 
+import org.junit.Before ;
+import org.junit.Test ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Parameterized ;
+import org.junit.runners.Parameterized.Parameters ;
+
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.query.ResultSet ;
 import org.apache.jena.query.ResultSetFactory ;
@@ -36,11 +42,6 @@
 import org.apache.jena.sparql.resultset.ResultSetCompare ;
 import org.apache.jena.sparql.sse.SSE ;
 import org.apache.jena.sparql.sse.builders.BuilderRowSet;
-import org.junit.Before ;
-import org.junit.Test ;
-import org.junit.runner.RunWith ;
-import org.junit.runners.Parameterized ;
-import org.junit.runners.Parameterized.Parameters ;
 
 @RunWith(Parameterized.class)
 public class TestResultSetIO {
@@ -69,6 +70,9 @@ public static Collection<Object[]> data() {
         ,"   (row (?x 1)           )"
         ,"   (row           (?y 2) )"
         ,"   (row )"
+        ,"   (row (?x 'abc'@en--ltr))"
+        ,"   (row (?x 'abc'@en))"
+        ,"   (row (?x 'abc'))"
         ,")"
         ) ;
 
@@ -86,13 +90,15 @@ public TestResultSetIO(String name, Lang lang) {
         ByteArrayOutputStream out1 = new ByteArrayOutputStream() ;
         ResultSetMgr.write(out1, test_rs, lang) ;
         test_rs.reset();
+
         ByteArrayInputStream in = new ByteArrayInputStream(out1.toByteArray()) ;
 
         ResultSet rs = ResultSetMgr.read(in, lang) ;
         ResultSetRewindable rsw = ResultSetFactory.makeRewindable(rs) ;
-        if ( ! lang.equals(RS_CSV) )
+        if ( ! lang.equals(RS_CSV) ) {
             // CSV is not faithful
             assertTrue(ResultSetCompare.equalsByTerm(test_rs, rsw)) ;
+        }
 
         rsw.reset();
         test_rs.reset();
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
index d23b8146eba..b083a95afc3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
@@ -20,223 +20,240 @@
 
 import static org.junit.Assert.*;
 
-import org.apache.jena.graph.Node ;
-import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.impl.Util ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.PrefixMapFactory ;
-import org.apache.jena.riot.thrift.wire.RDF_BNode ;
-import org.apache.jena.riot.thrift.wire.RDF_IRI ;
-import org.apache.jena.riot.thrift.wire.RDF_Literal ;
-import org.apache.jena.riot.thrift.wire.RDF_Term ;
-import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.vocabulary.RDF ;
-import org.apache.jena.vocabulary.RDFS ;
-import org.apache.jena.vocabulary.XSD ;
-import org.junit.Test ;
+import org.apache.jena.graph.Node;
+import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.rdf.model.impl.Util;
+import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMapFactory;
+import org.apache.jena.riot.thrift.wire.RDF_BNode;
+import org.apache.jena.riot.thrift.wire.RDF_IRI;
+import org.apache.jena.riot.thrift.wire.RDF_Literal;
+import org.apache.jena.riot.thrift.wire.RDF_Term;
+import org.apache.jena.sparql.sse.SSE;
+import org.apache.jena.sys.JenaSystem;
+import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.vocabulary.RDFS;
+import org.apache.jena.vocabulary.XSD;
+import org.junit.Test;
 
 public class TestThriftTerm {
-    static PrefixMap prefixMap = PrefixMapFactory.create() ;
+    static { JenaSystem.init(); }
+
+    static PrefixMap prefixMap = PrefixMapFactory.create();
     static {
-        prefixMap.add("rdf",    RDF.getURI()) ;
-        prefixMap.add("xsd",    XSD.getURI()) ;
-        prefixMap.add("rdfs",   RDFS.getURI()) ;
-        prefixMap.add("ex",     "http://example.org/") ;
-        prefixMap.add("",       "http://example/") ;
-        prefixMap.add("ns",     "http://namespace/ns#") ;
+        prefixMap.add("rdf",    RDF.getURI());
+        prefixMap.add("xsd",    XSD.getURI());
+        prefixMap.add("rdfs",   RDFS.getURI());
+        prefixMap.add("ex",     "http://example.org/");
+        prefixMap.add("",       "http://example/");
+        prefixMap.add("ns",     "http://namespace/ns#");
     }
 
     // Terms
     @Test public void term_uri_01() {
-        testTerm("<http://hostname/>") ;
+        testTerm("<http://hostname/>");
     }
 
     @Test public void term_uri_02()  {
-        RDF_Term rt = testTerm("<http://example/>") ;
-        assertTrue(rt.isSetPrefixName()) ;
-        assertEquals(rt.getPrefixName().prefix, "") ;
-        assertEquals(rt.getPrefixName().localName,  "") ;
+        RDF_Term rt = testTerm("<http://example/>");
+        assertTrue(rt.isSetPrefixName());
+        assertEquals(rt.getPrefixName().prefix, "");
+        assertEquals(rt.getPrefixName().localName,  "");
     }
 
     @Test public void term_uri_03()  {
-        RDF_Term rt = testTerm("<http://namespace/ns#foobar>") ;
-        assertTrue(rt.isSetPrefixName()) ;
-        assertEquals(rt.getPrefixName().prefix, "ns") ;
-        assertEquals(rt.getPrefixName().localName,  "foobar") ;
+        RDF_Term rt = testTerm("<http://namespace/ns#foobar>");
+        assertTrue(rt.isSetPrefixName());
+        assertEquals(rt.getPrefixName().prefix, "ns");
+        assertEquals(rt.getPrefixName().localName,  "foobar");
     }
 
     @Test public void term_uri_04()  {
-        RDF_Term rt = testTerm("rdf:type") ;
-        assertTrue(rt.isSetPrefixName()) ;
-        assertEquals(rt.getPrefixName().prefix, "rdf") ;
-        assertEquals(rt.getPrefixName().localName,  "type") ;
+        RDF_Term rt = testTerm("rdf:type");
+        assertTrue(rt.isSetPrefixName());
+        assertEquals(rt.getPrefixName().prefix, "rdf");
+        assertEquals(rt.getPrefixName().localName,  "type");
     }
 
     @Test public void term_literal_01() {
-        RDF_Term rt = testTerm("'foo'") ;
-        assertFalse(rt.getLiteral().isSetDatatype()) ;
-        assertFalse(rt.getLiteral().isSetDtPrefix()) ;
-        assertFalse(rt.getLiteral().isSetLangtag()) ;
+        RDF_Term rt = testTerm("'foo'");
+        assertFalse(rt.getLiteral().isSetDatatype());
+        assertFalse(rt.getLiteral().isSetDtPrefix());
+        assertFalse(rt.getLiteral().isSetLangtag());
+        assertFalse(rt.getLiteral().isSetBaseDirection());
     }
 
     @Test public void term_literal_02() {
-        RDF_Term rt = testTerm("'foo'@en") ;
-        assertFalse(rt.getLiteral().isSetDatatype()) ;
-        assertFalse(rt.getLiteral().isSetDtPrefix()) ;
-        assertTrue(rt.getLiteral().isSetLangtag()) ;
+        RDF_Term rt = testTerm("'foo'@en");
+        assertFalse(rt.getLiteral().isSetDatatype());
+        assertFalse(rt.getLiteral().isSetDtPrefix());
+        assertTrue(rt.getLiteral().isSetLangtag());
+        assertFalse(rt.getLiteral().isSetBaseDirection());
     }
 
     @Test public void term_literal_03() {
-        RDF_Term rt = testTerm("123") ;
-        assertFalse(rt.getLiteral().isSetDatatype()) ;
-        assertTrue(rt.getLiteral().isSetDtPrefix()) ;
-        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "xsd") ;
-        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "integer") ;
+        RDF_Term rt = testTerm("'foo'@en--ltr");
+        assertFalse(rt.getLiteral().isSetDatatype());
+        assertFalse(rt.getLiteral().isSetDtPrefix());
+        assertTrue(rt.getLiteral().isSetLangtag());
+        assertTrue(rt.getLiteral().isSetBaseDirection());
     }
 
+
     @Test public void term_literal_04() {
-        RDF_Term rt = testTerm("'foo'^^<http://dataype/>") ;
-        assertTrue(rt.getLiteral().isSetDatatype()) ;
-        assertFalse(rt.getLiteral().isSetDtPrefix()) ;
-        assertEquals(rt.getLiteral().getDatatype(), "http://dataype/") ;
+        RDF_Term rt = testTerm("123");
+        assertFalse(rt.getLiteral().isSetDatatype());
+        assertTrue(rt.getLiteral().isSetDtPrefix());
+        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "xsd");
+        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "integer");
+        assertFalse(rt.getLiteral().isSetBaseDirection());
     }
 
     @Test public void term_literal_05() {
-        RDF_Term rt = testTerm("'foo'^^<http://example/>") ;
-        assertFalse(rt.getLiteral().isSetDatatype()) ;
-        assertTrue(rt.getLiteral().isSetDtPrefix()) ;
-        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "") ;
-        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "") ;
+        RDF_Term rt = testTerm("'foo'^^<http://dataype/>");
+        assertTrue(rt.getLiteral().isSetDatatype());
+        assertFalse(rt.getLiteral().isSetDtPrefix());
+        assertEquals(rt.getLiteral().getDatatype(), "http://dataype/");
+        assertFalse(rt.getLiteral().isSetBaseDirection());
+    }
+
+    @Test public void term_literal_06() {
+        RDF_Term rt = testTerm("'foo'^^<http://example/>");
+        assertFalse(rt.getLiteral().isSetDatatype());
+        assertTrue(rt.getLiteral().isSetDtPrefix());
+        assertEquals(rt.getLiteral().getDtPrefix().getPrefix(), "");
+        assertEquals(rt.getLiteral().getDtPrefix().getLocalName(), "");
+        assertFalse(rt.getLiteral().isSetBaseDirection());
     }
 
     @Test public void term_var_01() {
-        testTerm("?var") ;
+        testTerm("?var");
     }
 
     @Test public void term_bnode_01() {
-        Node n = SSE.parseNode("_:blanknode") ;
-        RDF_Term rt = testTerm(n) ;
-        assertEquals(rt.getBnode().getLabel(), n.getBlankNodeLabel()) ;
+        Node n = SSE.parseNode("_:blanknode");
+        RDF_Term rt = testTerm(n);
+        assertEquals(rt.getBnode().getLabel(), n.getBlankNodeLabel());
     }
 
     @Test public void term_bnode_02() {
-        String label = "abcdefghijklmn" ;
-        Node n = NodeFactory.createBlankNode("abcdefghijklmn") ;
-        RDF_Term rt = testTerm(n) ;
-        assertTrue(rt.isSetBnode()) ;
-        assertEquals("abcdefghijklmn", rt.getBnode().getLabel()) ;
+        String label = "abcdefghijklmn";
+        Node n = NodeFactory.createBlankNode("abcdefghijklmn");
+        RDF_Term rt = testTerm(n);
+        assertTrue(rt.isSetBnode());
+        assertEquals("abcdefghijklmn", rt.getBnode().getLabel());
     }
 
     @Test public void term_any_1() {
-        RDF_Term rt = testTerm(Node.ANY) ;
-        assertTrue(rt.isSetAny()) ;
+        RDF_Term rt = testTerm(Node.ANY);
+        assertTrue(rt.isSetAny());
     }
 
     @Test public void term_value_01() {
-        RDF_Term rt = testTermValue("123") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("123");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_02() {
-        RDF_Term rt = testTermValue("'123'^^xsd:integer") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:integer");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_03() {
-        RDF_Term rt = testTermValue("'123'^^xsd:long") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:long");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_04() {
-        RDF_Term rt = testTermValue("'123'^^xsd:int") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:int");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_05() {
-        RDF_Term rt = testTermValue("'123'^^xsd:short") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:short");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_06() {
-        RDF_Term rt = testTermValue("'123'^^xsd:byte") ;
-        assertTrue(rt.isSetValInteger()) ;
-        assertEquals(123, rt.getValInteger()) ;
+        RDF_Term rt = testTermValue("'123'^^xsd:byte");
+        assertTrue(rt.isSetValInteger());
+        assertEquals(123, rt.getValInteger());
     }
 
     @Test public void term_value_10() {
-        RDF_Term rt = testTermValue("123.6") ;
-        assertTrue(rt.isSetValDecimal()) ;
-        assertEquals(1236, rt.getValDecimal().getValue()) ;
-        assertEquals(1, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("123.6");
+        assertTrue(rt.isSetValDecimal());
+        assertEquals(1236, rt.getValDecimal().getValue());
+        assertEquals(1, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_11() {
-        RDF_Term rt = testTermValue("0.005") ;
-        assertTrue(rt.isSetValDecimal()) ;
-        assertEquals(5, rt.getValDecimal().getValue()) ;
-        assertEquals(3, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("0.005");
+        assertTrue(rt.isSetValDecimal());
+        assertEquals(5, rt.getValDecimal().getValue());
+        assertEquals(3, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_12() {
-        RDF_Term rt = testTermValue("50.0") ;
-        assertTrue(rt.isSetValDecimal()) ;
-        assertEquals(500, rt.getValDecimal().getValue()) ;
-        assertEquals(1, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("50.0");
+        assertTrue(rt.isSetValDecimal());
+        assertEquals(500, rt.getValDecimal().getValue());
+        assertEquals(1, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_13() {
-        RDF_Term rt = testTermValue("50.05") ;
-        assertTrue(rt.isSetValDecimal()) ;
-        assertEquals(5005, rt.getValDecimal().getValue()) ;
-        assertEquals(2, rt.getValDecimal().getScale()) ;
+        RDF_Term rt = testTermValue("50.05");
+        assertTrue(rt.isSetValDecimal());
+        assertEquals(5005, rt.getValDecimal().getValue());
+        assertEquals(2, rt.getValDecimal().getScale());
     }
 
     @Test public void term_value_20() {
-        RDF_Term rt = testTermValue("50e6") ;
-        assertTrue(rt.isSetValDouble()) ;
-        assertEquals(50e6, rt.getValDouble(), 0.001) ;
+        RDF_Term rt = testTermValue("50e6");
+        assertTrue(rt.isSetValDouble());
+        assertEquals(50e6, rt.getValDouble(), 0.001);
     }
 
     @Test public void term_value_21() {
-        RDF_Term rt = testTermValue("50e-6") ;
-        assertTrue(rt.isSetValDouble()) ;
-        assertEquals(50e-6, rt.getValDouble(), 0.001e6) ;
+        RDF_Term rt = testTermValue("50e-6");
+        assertTrue(rt.isSetValDouble());
+        assertEquals(50e-6, rt.getValDouble(), 0.001e6);
     }
 
     private RDF_Term testTermValue(String str) {
-        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, true) ;
-        return rt ;
+        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, true);
+        return rt;
     }
 
     private RDF_Term testTerm(String str) {
-        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, false) ;
-        return rt ;
+        RDF_Term rt = testTerm(SSE.parseNode(str), prefixMap, false);
+        return rt;
     }
 
     private RDF_Term testTerm(Node node) {
-        return testTerm(node, null, false) ;
+        return testTerm(node, null, false);
     }
 
     private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
-        RDF_Term rt = ThriftConvert.convert(node, pmap, asValue) ;
-        assertTrue(rt.isSet()) ;
+        RDF_Term rt = ThriftConvert.convert(node, pmap, asValue);
+        assertTrue(rt.isSet());
 
         if ( node == null) {
             assertTrue(rt.isSetUndefined());
         } else if ( node.isURI() ) {
-            assertTrue(rt.isSetIri() || rt.isSetPrefixName() ) ;
+            assertTrue(rt.isSetIri() || rt.isSetPrefixName() );
             if ( rt.isSetIri() ) {
-                RDF_IRI iri = rt.getIri() ;
-                assertEquals(node.getURI(), iri.getIri()) ;
+                RDF_IRI iri = rt.getIri();
+                assertEquals(node.getURI(), iri.getIri());
             }
             if ( rt.isSetPrefixName() ) {
-                assertTrue(rt.getPrefixName().isSetPrefix()) ;
-                assertTrue(rt.getPrefixName().isSetLocalName()) ;
+                assertTrue(rt.getPrefixName().isSetPrefix());
+                assertTrue(rt.getPrefixName().isSetLocalName());
             }
         } else if ( rt.isSetValDecimal() ||
                     rt.isSetValDouble() ||
@@ -244,56 +261,62 @@ private RDF_Term testTerm(Node node, PrefixMap pmap, boolean asValue) {
         {
             // Nothing specific to check.
             // And not reversible.
-            return rt ;
+            return rt;
         } else if ( node.isLiteral() ) {
-            assertTrue(rt.isSetLiteral()) ;
-            RDF_Literal lit = rt.getLiteral() ;
-            assertTrue(lit.isSetLex()) ;
-            assertEquals(node.getLiteralLexicalForm(), lit.getLex()) ;
+            assertTrue(rt.isSetLiteral());
+            RDF_Literal lit = rt.getLiteral();
+            assertTrue(lit.isSetLex());
+            assertEquals(node.getLiteralLexicalForm(), lit.getLex());
 
             // RDF 1.1
             if ( Util.isSimpleString(node) ) {
-                assertFalse(lit.isSetDatatype()) ;
-                assertFalse(lit.isSetDtPrefix()) ;
-                assertFalse(lit.isSetLangtag()) ;
+                assertFalse(lit.isSetDatatype());
+                assertFalse(lit.isSetDtPrefix());
+                assertFalse(lit.isSetLangtag());
+                assertFalse(lit.isSetBaseDirection());
             } else if ( Util.isLangString(node) ) {
-                assertFalse(lit.isSetDatatype()) ;
-                assertFalse(lit.isSetDtPrefix()) ;
-                assertTrue(lit.isSetLangtag()) ;
-            }
-            else {
+                assertFalse(lit.isSetDatatype());
+                assertFalse(lit.isSetDtPrefix());
+                assertTrue(lit.isSetLangtag());
+                assertFalse(lit.isSetBaseDirection());
+            } else if ( Util.isDirLangString(node) ) {
+                assertFalse(lit.isSetDatatype());
+                assertFalse(lit.isSetDtPrefix());
+                assertTrue(lit.isSetLangtag());
+                assertTrue(lit.isSetBaseDirection());
+            } else {
                 // Regular typed literal.
-                assertTrue(lit.isSetDatatype() || lit.isSetDtPrefix()) ;
-                assertFalse(lit.isSetLangtag()) ;
+                assertTrue(lit.isSetDatatype() || lit.isSetDtPrefix());
+                assertFalse(lit.isSetLangtag());
             }
         } else if ( node.isBlank() ) {
-            assertTrue(rt.isSetBnode()) ;
-            RDF_BNode bnode = rt.getBnode() ;
-            assertEquals(node.getBlankNodeLabel(), bnode.getLabel()) ;
+            assertTrue(rt.isSetBnode());
+            RDF_BNode bnode = rt.getBnode();
+            assertEquals(node.getBlankNodeLabel(), bnode.getLabel());
         } else if ( node.isVariable() ) {
-            assertTrue(rt.isSetVariable()) ;
-            assertEquals(node.getName(), rt.getVariable().getName()) ;
+            assertTrue(rt.isSetVariable());
+            assertEquals(node.getName(), rt.getVariable().getName());
         } else if ( Node.ANY.equals(node) ) {
-            assertTrue(rt.isSetAny()) ;
+            assertTrue(rt.isSetAny());
         } else
-            fail("Unknown node type") ;
+            fail("Unknown node type");
 
         // And reverse
-        Node n2 = ThriftConvert.convert(rt,pmap) ;
-        assertEquals(node, n2) ;
-        return rt ;
+        Node n2 = ThriftConvert.convert(rt,pmap);
+        assertEquals(node, n2);
+        return rt;
     }
 
     @Test public void rdfterm_01() {
-            RDF_Term rt = TRDF.tANY ;
-            Node n = ThriftConvert.convert(rt) ;
-            assertEquals(Node.ANY, n) ;
+            RDF_Term rt = TRDF.tANY;
+            Node n = ThriftConvert.convert(rt);
+            assertEquals(Node.ANY, n);
        }
 
     @Test public void rdfterm_02() {
-        RDF_Term rt = TRDF.tUNDEF ;
-        Node n = ThriftConvert.convert(rt) ;
-        assertNull(n) ;
+        RDF_Term rt = TRDF.tUNDEF;
+        Node n = ThriftConvert.convert(rt);
+        assertNull(n);
     }
 
     @Test public void round_trip_01() {
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMap.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMap.java
new file mode 100644
index 00000000000..c543b927818
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMap.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql;
+
+import org.apache.jena.arq.junit.manifest.Manifests;
+import org.apache.jena.arq.junit.manifest.Prefix;
+import org.apache.jena.arq.junit.runners.Label;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.expr.E_Function;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.junit.RunnerSPARQL_DatasetMap;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+@RunWith(RunnerSPARQL_DatasetMap.class)
+@Label("SPARQL [dataset Map]")
+@Prefix("DS_Map-")
+@Manifests
+({
+    "testing/ARQ/manifest-arq.ttl"
+    // [rdf-star CG]
+    //, "testing/rdf-star-cg/sparql/eval/manifest.ttl"
+})
+
+public class Scripts_DatasetMap
+{
+    @BeforeClass static public void beforeClass() {
+        ARQ.setNormalMode();
+        NodeValue.VerboseWarnings = false;
+        E_Function.WarnOnUnknownFunction = false;
+    }
+
+    @AfterClass static public void afterClass() {
+        NodeValue.VerboseWarnings = true;
+        E_Function.WarnOnUnknownFunction = true;
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMapLink.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMapLink.java
new file mode 100644
index 00000000000..1bc28106bcc
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_DatasetMapLink.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql;
+
+import org.apache.jena.arq.junit.manifest.Manifests;
+import org.apache.jena.arq.junit.manifest.Prefix;
+import org.apache.jena.arq.junit.runners.Label;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.expr.E_Function;
+import org.apache.jena.sparql.expr.NodeValue;
+import org.apache.jena.sparql.junit.RunnerSPARQL_TIM;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+
+
+
+@RunWith(RunnerSPARQL_TIM.class)
+@Label("SPARQL [dataset MapLink]")
+@Prefix("DS_MapLink-")
+@Manifests
+({
+    "testing/ARQ/manifest-arq.ttl"
+    // [rdf-star CG]
+    //, "testing/rdf-star-cg/sparql/eval/manifest.ttl"
+})
+
+public class Scripts_DatasetMapLink
+{
+    @BeforeClass static public void beforeClass() {
+        ARQ.setNormalMode();
+        NodeValue.VerboseWarnings = false;
+        E_Function.WarnOnUnknownFunction = false;
+    }
+
+    @AfterClass static public void afterClass() {
+        NodeValue.VerboseWarnings = true;
+        E_Function.WarnOnUnknownFunction = true;
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_TIM.java b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_TIM.java
index 8921ea8df5f..b86fd563c25 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_TIM.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/Scripts_TIM.java
@@ -34,8 +34,9 @@
 @Prefix("TIM-")
 @Manifests
 ({
-    "testing/ARQ/manifest-arq.ttl" ,
-    "testing/rdf-star-cg/sparql/eval/manifest.ttl"
+    "testing/ARQ/manifest-arq.ttl"
+    // [rdf-star CG]
+    //, "testing/rdf-star-cg/sparql/eval/manifest.ttl"
 })
 
 public class Scripts_TIM
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java b/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
index de6d68cec29..4048ca23b96 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/TC_ARQ.java
@@ -19,7 +19,7 @@
 package org.apache.jena.sparql;
 
 import org.apache.jena.query.TS_Query;
-import org.apache.jena.rdf_star.TS_RDF_Star;
+import org.apache.jena.rdf12.TS_RDF12;
 import org.apache.jena.sparql.algebra.TS_Algebra ;
 import org.apache.jena.sparql.algebra.optimize.TS_Optimization ;
 import org.apache.jena.sparql.api.TS_API ;
@@ -97,7 +97,9 @@
 
     // Outside org.apache.jena.sparql
     , TS_Query.class
-    , TS_RDF_Star.class
+    
+    // RDF 1.2 tests. These track the working group.
+    , TS_RDF12.class
     // And scripted tests.
 })
 
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestVarRename.java b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestVarRename.java
index 5a96d003fd0..bfe85728cbd 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestVarRename.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/algebra/optimize/TestVarRename.java
@@ -20,290 +20,302 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.HashSet ;
-import java.util.Set ;
-
-import org.apache.jena.atlas.lib.StrUtils;
-import org.apache.jena.query.Query ;
-import org.apache.jena.query.QueryFactory ;
-import org.apache.jena.sparql.algebra.Algebra ;
-import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.core.Var ;
-import org.apache.jena.sparql.engine.Rename ;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.sparql.algebra.Algebra;
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.core.Var;
+import org.apache.jena.sparql.engine.Rename;
 import org.apache.jena.sparql.expr.Expr;
-import org.apache.jena.sparql.sse.SSE ;
+import org.apache.jena.sparql.sse.SSE;
 import org.junit.Assert;
 import org.junit.Rule;
-import org.junit.Test ;
+import org.junit.Test;
 import org.junit.rules.TestName;
 
 public class TestVarRename
 {
     @Rule public TestName name = new TestName();
-    
-    @Test public void rename_01() { rename("(bgp (<s> <p> <o>))", "(bgp (<s> <p> <o>))", true) ; }
-    @Test public void rename_02() { rename("(bgp (<s> ?p <o>))", "(bgp (<s> ?/p <o>))", true) ; }
-    @Test public void rename_03() { rename("(bgp (?s ?p <o>))", "(bgp (?s ?/p <o>))", true, "s") ; }
-    @Test public void rename_04() { rename("(filter (+ ?s ?x) (bgp (?s ?p <o>)))", "(filter (+ ?s ?/x) (bgp (?s ?/p <o>)))", true, "s") ; }
+
+    @Test public void rename_01() { rename("(bgp (<s> <p> <o>))", "(bgp (<s> <p> <o>))", true); }
+    @Test public void rename_02() { rename("(bgp (<s> ?p <o>))", "(bgp (<s> ?/p <o>))", true); }
+    @Test public void rename_03() { rename("(bgp (?s ?p <o>))", "(bgp (?s ?/p <o>))", true, "s"); }
+    @Test public void rename_04() { rename("(filter (+ ?s ?x) (bgp (?s ?p <o>)))", "(filter (+ ?s ?/x) (bgp (?s ?/p <o>)))", true, "s"); }
 
     @Test public void rename_05() { rename("(group ((?.1 (str ?x))) ((?.0 (count))) (bgp (triple ?x :p ?v)))",
                                            "(group ((?/.1 (str ?x))) ((?/.0 (count))) (bgp (triple ?x :p ?/v)))",
-                                           true, "x" ) ; }
-    
+                                           true, "x" ); }
+
     @Test public void rename_06() { rename("(group ((?.1 (str ?x))) ((?.0 (max ?v))) (bgp (triple ?x :p ?v)))",
                                            "(group ((?/.1 (str ?x))) ((?/.0 (max ?/v))) (bgp (triple ?x :p ?/v)))",
-                                           true, "x" ) ; }
+                                           true, "x" ); }
 
-    @Test public void rename_07() { rename("(assign ((?x (+ ?/a ?/b))) (table unit))", 
+    @Test public void rename_07() { rename("(assign ((?x (+ ?/a ?/b))) (table unit))",
                                            "(assign ((?/x (+ ?//a ?//b))) (table unit))",
-                                           true) ; }
-    @Test public void rename_08() { rename("(assign ((?x (+ ?/a ?/b))) (table unit))", 
+                                           true); }
+    @Test public void rename_08() { rename("(assign ((?x (+ ?/a ?/b))) (table unit))",
                                            "(assign ((?/x (+ ?/a ?//b))) (table unit))",
-                                           false, "/a") ; }
-    
-    @Test public void rename_09() { rename("(project (?s ?p) (bgp (?s ?p ?o)))",  
+                                           false, "/a"); }
+
+    @Test public void rename_09() { rename("(project (?s ?p) (bgp (?s ?p ?o)))",
                                            "(project (?s ?/p) (bgp (?s ?/p ?/o)))",
                                            true,
-                                           "s") ; }
-    
-    @Test public void rename_10() { rename("(order (?s ?p) (bgp (?s ?p ?o)))",  
+                                           "s"); }
+
+    @Test public void rename_10() { rename("(order (?s ?p) (bgp (?s ?p ?o)))",
                                            "(order (?s ?/p) (bgp (?s ?/p ?/o)))",
                                            true,
-                                           "s") ; }
-    
-    @Test public void rename_11() { rename("(project (?s) (order (?s ?p) (bgp (?s ?p ?o))))",  
+                                           "s"); }
+
+    @Test public void rename_11() { rename("(project (?s) (order (?s ?p) (bgp (?s ?p ?o))))",
                                            "(project (?s) (order (?s ?/p) (bgp (?s ?/p ?/o))))",
                                            true,
-                                           "s") ; }
-    
+                                           "s"); }
+
     @Test public void rename_12() { rename("(leftjoin (bgp (?s ?p ?o)) (bgp (?s ?p ?o1)) () )",
                                            "(leftjoin (bgp (?s ?/p ?o)) (bgp (?s ?/p ?/o1)) () )",
                                            true,
-                                           "s", "o") ; }
-    
+                                           "s", "o"); }
+
     // JENA-502 : failure to rewrite (table) in var rename.
     @Test public void rename_13() { rename("(project (?s) (project (?s) (table (vars ?obj) (row [?obj 123])) ))",
                                            "(project (?s) (project (?s) (table (vars ?/obj) (row [?/obj 123])) ))",
                                            true,
-                                           "s") ; }
-    
+                                           "s"); }
+
     // JENA-494 : sub-query and service interaction
     @Test public void rename_14() { rename("(project (?z) (project (?z) (sequence (service <http://foo> (bgp (?c ?p ?z)) ) (bgp (?c ?q ?z)) ) ) )",
                                            "(project (?z) (project (?z) (sequence (service <http://foo> (bgp (?/c ?/p ?z)) ) (bgp (?/c ?/q ?z)) ) ) )",
                                            true,
-                                           "z") ; }
+                                           "z"); }
+
 
-    
     @Test public void rename_reverse_01() { reverse("(project (?s ?/p) (bgp (?s ?/p ?/o)))",
-                                                    "(project (?s ?p) (bgp (?s ?p ?o)))", true ) ; }  
+                                                    "(project (?s ?p) (bgp (?s ?p ?o)))", true ); }
 
     @Test public void rename_reverse_02() { reverse("(assign ((?/x (+ ?//a ?///b))) (table unit))",
-                                                    "(assign ((?x (+ ?a ?b))) (table unit))", 
-                                                    true ) ; }  
-    
+                                                    "(assign ((?x (+ ?a ?b))) (table unit))",
+                                                    true ); }
+
     @Test public void query_rename_01()
     {
-        String queryString =  
-            "SELECT ?x { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }" ;
-        String opExpectedString =
-            "(project (?x)\n" + 
-            "  (join\n" + 
-            "    (bgp (triple ?s ?p ?o))\n" + 
-            "    (slice _ 50\n" + 
-            "      (project (?v)\n" + 
-            "        (join\n" + 
-            "          (bgp (triple ?/x ?/y ?v))\n" + 
-            "          (project (?/w)\n" + 
-            "            (bgp (triple ?//a ?//y ?/w))))))))";
-        checkRename(queryString, opExpectedString) ;
+        String queryString =
+            "SELECT ?x { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }";
+        String opExpectedString = """
+            (project (?x)
+              (join
+                (bgp (triple ?s ?p ?o))
+                (slice _ 50
+                  (project (?v)
+                    (join
+                      (bgp (triple ?/x ?/y ?v))
+                      (project (?/w)
+                        (bgp (triple ?//a ?//y ?/w))))))))
+                     """;
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_02()
     {
-        String queryString = 
-            "SELECT ?x { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT * { ?a ?y ?w }}} LIMIT 50 } }"  ;  
-        String opExpectedString = 
-            "(project (?x)\n" + 
-            "  (join\n" + 
-            "    (bgp (triple ?s ?p ?o))\n" + 
-            "    (slice _ 50\n" + 
-            "      (project (?v)\n" + 
-            "        (join (bgp (triple ?/x ?/y ?v)) (bgp (triple ?/a ?/y ?/w))))" +
-            ")))" ; 
-        checkRename(queryString, opExpectedString) ;
+        String queryString =
+            "SELECT ?x { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT * { ?a ?y ?w }}} LIMIT 50 } }" ;
+        String opExpectedString = """
+            (project (?x)
+              (join
+                (bgp (triple ?s ?p ?o))
+                (slice _ 50
+                  (project (?v)
+                    (join (bgp (triple ?/x ?/y ?v)) (bgp (triple ?/a ?/y ?/w))))\
+            )))""";
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_03()
     {
-        String queryString = "SELECT ?x { ?s ?p ?o . { SELECT * { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }" ;  
-        String opExpectedString = 
-            "(project (?x)\n" + 
-            "  (join\n" + 
-            "    (bgp (triple ?s ?p ?o))\n" + 
-            "    (slice _ 50\n" + 
-            "      (join\n" + 
-            "        (bgp (triple ?x ?y ?v))\n" + 
-            "        (project (?w)\n" + 
-            "          (bgp (triple ?/a ?/y ?w)))))))" ;
-        checkRename(queryString, opExpectedString) ;
+        String queryString = "SELECT ?x { ?s ?p ?o . { SELECT * { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }";
+        String opExpectedString = """
+            (project (?x)
+              (join
+                (bgp (triple ?s ?p ?o))
+                (slice _ 50
+                  (join
+                    (bgp (triple ?x ?y ?v))
+                    (project (?w)
+                      (bgp (triple ?/a ?/y ?w)))))))
+                      """;
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_04()
     {
-        String queryString = "SELECT * { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }" ;  
-        String opExpectedString = 
-            "(join\n" + 
-            "  (bgp (triple ?s ?p ?o))\n" + 
-            "  (slice _ 50\n" + 
-            "    (project (?v)\n" + 
-            "      (join\n" + 
-            "        (bgp (triple ?/x ?/y ?v))\n" + 
-            "        (project (?/w)\n" + 
-            "          (bgp (triple ?//a ?//y ?/w)))))))" ;
-        checkRename(queryString, opExpectedString) ;
+        String queryString = "SELECT * { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }";
+        String opExpectedString = """
+            (join
+              (bgp (triple ?s ?p ?o))
+              (slice _ 50
+                (project (?v)
+                  (join
+                    (bgp (triple ?/x ?/y ?v))
+                    (project (?/w)
+                      (bgp (triple ?//a ?//y ?/w)))))))
+                      """;
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_05()
     {
-        String queryString = "SELECT ?v { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }"    ;  
-        String opExpectedString = 
-            "(project (?v)\n" + 
-            "  (join\n" + 
-            "    (bgp (triple ?s ?p ?o))\n" + 
-            "    (slice _ 50\n" + 
-            "      (project (?v)\n" + 
-            "        (join\n" + 
-            "          (bgp (triple ?/x ?/y ?v))\n" + 
-            "          (project (?/w)\n" + 
-            "            (bgp (triple ?//a ?//y ?/w))))))))" ;
-        checkRename(queryString, opExpectedString) ;
+        String queryString = "SELECT ?v { ?s ?p ?o . { SELECT ?v { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} LIMIT 50 } }"   ;
+        String opExpectedString = """
+            (project (?v)
+              (join
+                (bgp (triple ?s ?p ?o))
+                (slice _ 50
+                  (project (?v)
+                    (join
+                      (bgp (triple ?/x ?/y ?v))
+                      (project (?/w)
+                        (bgp (triple ?//a ?//y ?/w))))))))
+                        """;
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_06()
     {
-        String queryString = "SELECT ?w { ?s ?p ?o . { SELECT ?w { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} } } LIMIT 50" ;  
-        String opExpectedString = 
-            "(slice _ 50\n" + 
-            "  (project (?w)\n" + 
-            "    (join\n" + 
-            "      (bgp (triple ?s ?p ?o))\n" + 
-            "      (project (?w)\n" + 
-            "        (join\n" + 
-            "          (bgp (triple ?/x ?/y ?/v))\n" + 
-            "          (project (?w)\n" + 
-            "            (bgp (triple ?//a ?//y ?w))))))))\n" + 
-            "" ;
-        checkRename(queryString, opExpectedString) ;
+        String queryString = "SELECT ?w { ?s ?p ?o . { SELECT ?w { ?x ?y ?v {SELECT ?w { ?a ?y ?w }}} } } LIMIT 50";
+        String opExpectedString = """
+            (slice _ 50
+              (project (?w)
+                (join
+                  (bgp (triple ?s ?p ?o))
+                  (project (?w)
+                    (join
+                      (bgp (triple ?/x ?/y ?/v))
+                      (project (?w)
+                        (bgp (triple ?//a ?//y ?w))))))))
+                        """;
+        checkRename(queryString, opExpectedString);
     }
 
     @Test public void query_rename_07()
     {
-        String queryString = "SELECT * { ?s ?p ?o . { SELECT ?w { ?x ?y ?v }}}"  ;  
-        String opExpectedString = 
-            "(join\n" + 
-            "  (bgp (triple ?s ?p ?o))\n" + 
-            "  (project (?w)\n" + 
-            "    (bgp (triple ?/x ?/y ?/v))))" ;
-        checkRename(queryString, opExpectedString) ;
+        String queryString = "SELECT * { ?s ?p ?o . { SELECT ?w { ?x ?y ?v }}}" ;
+        String opExpectedString = """
+                (join
+                  (bgp (triple ?s ?p ?o))
+                  (project (?w)
+                    (bgp (triple ?/x ?/y ?/v))))
+                """;
+        checkRename(queryString, opExpectedString);
     }
 
 
     // JENA-2132 : Renaming must descend into RDFStar TripleNodes
     @Test public void query_rename_08()
     {
-        String queryString
-                = "SELECT COUNT(*) {\n"
-                + "  SELECT ?src {\n"
-                + "    ?src  <urn:connectedTo>  ?tgt .\n"
-                + "    << ?src <urn:connectedTo> ?tgt >>\n"
-                + "                  <urn:hasValue>  ?v\n"
-                + "  }\n"
-                + "}";
-
-        String opExpectedString
-                = "(project (?.1)\n"
-                + "  (extend ((?.1 ?.0))\n"
-                + "    (group () ((?.0 (count)))\n"
-                + "      (project (?src)\n"
-                + "        (bgp\n"
-                + "          (triple ?src <urn:connectedTo> ?/tgt)\n"
-                + "          (triple << ?src <urn:connectedTo> ?/tgt >> <urn:hasValue> ?/v)\n"
-                + "        )))))";
-
-        checkRename(queryString, opExpectedString) ;
+        String queryString = """
+            SELECT COUNT(*) {
+              SELECT ?src {
+                ?src  <urn:connectedTo>  ?tgt .
+                << ?src <urn:connectedTo> ?tgt >>
+                              <urn:hasValue>  ?v
+              }
+            }""";
+
+        String opExpectedString = """
+            (project (?.1)
+              (extend ((?.1 ?.0))
+                (group () ((?.0 (count)))
+                  (project (?src)
+                    (bgp
+                      (triple ?src <urn:connectedTo> ?/tgt)
+                      (triple ?/?0 rdf:reifies (tripleterm ?src <urn:connectedTo> ?/tgt))\
+                      (triple ?/?0 <urn:hasValue> ?/v)
+                    )))))""";
+
+        checkRename(queryString, opExpectedString);
     }
-    
+
     // JENA-1275
     @Test
     public void filter_not_exists_scoping_03() {
         //@formatter:off
-        Op orig = SSE.parseOp(StrUtils.strjoinNL("(project (?triangles ?openTriplets)",
-                                       "  (project (?openTriplets)",
-                                       "    (extend ((?openTriplets ?.0))",
-                                       "      (group () ((?.0 (count ?x)))",
-                                       "        (filter (notexists",
-                                       "                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))",
-                                       "          (quadpattern",
-                                       "            (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)",
-                                       "            (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)",
-                                       "          ))))))"));
-        Op expected = SSE.parseOp(StrUtils.strjoinNL("(project (?triangles ?openTriplets)",
-                "  (project (?openTriplets)",
-                "    (extend ((?openTriplets ?/.0))",
-                "      (group () ((?/.0 (count ?/x)))",
-                "        (filter (notexists",
-                "                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?/z ?/c ?/x)))",
-                "          (quadpattern",
-                "            (quad <urn:x-arq:DefaultGraphNode> ?/x ?/a ?/y)",
-                "            (quad <urn:x-arq:DefaultGraphNode> ?/y ?/b ?/z)",
-                "          ))))))"));
+        String origStr = """
+                (project (?triangles ?openTriplets)
+                  (project (?openTriplets)
+                    (extend ((?openTriplets ?.0))
+                      (group () ((?.0 (count ?x)))
+                        (filter (notexists
+                                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))
+                          (quadpattern
+                            (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)
+                            (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)
+                          ))))))
+                """;
+        Op orig = SSE.parseOp(origStr);
+        String expectedStr = """
+                (project (?triangles ?openTriplets)
+                  (project (?openTriplets)
+                    (extend ((?openTriplets ?/.0))
+                      (group () ((?/.0 (count ?/x)))
+                        (filter (notexists
+                                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?/z ?/c ?/x)))
+                          (quadpattern
+                            (quad <urn:x-arq:DefaultGraphNode> ?/x ?/a ?/y)
+                            (quad <urn:x-arq:DefaultGraphNode> ?/y ?/b ?/z)
+                          ))))))
+                          """;
         //@formatter:on
-        
+        Op expected = SSE.parseOp(expectedStr);
         Op transformed = TransformScopeRename.transform(orig);
-        
+
         Assert.assertEquals(transformed, expected);
     }
-    
+
     // JENA-1275
     @Test
     public void filter_not_exists_scoping_04() {
-        //@formatter:off
-        Op orig = SSE.parseOp(StrUtils.strjoinNL(
-                                       "  (project (?openTriplets)",
-                                       "    (extend ((?openTriplets ?.0))",
-                                       "      (group () ((?.0 (count ?x)))",
-                                       "        (filter (notexists",
-                                       "                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))",
-                                       "          (quadpattern",
-                                       "            (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)",
-                                       "            (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)",
-                                       "          )))))"));
-        Op expected = SSE.parseOp(StrUtils.strjoinNL(
-                "  (project (?openTriplets)",
-                "    (extend ((?openTriplets ?.0))",
-                "      (group () ((?.0 (count ?x)))",
-                "        (filter (notexists",
-                "                   (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))",
-                "          (quadpattern",
-                "            (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)",
-                "            (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)",
-                "          )))))"));
-        //@formatter:on
-        
+        String origStr = """
+                         (project (?openTriplets)
+                           (extend ((?openTriplets ?.0))
+                             (group () ((?.0 (count ?x)))
+                                (filter (notexists
+                                           (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))
+                                  (quadpattern
+                                     (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)
+                                     (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)
+                                  )))))
+                                  """;
+        Op orig = SSE.parseOp(origStr);
+        String expectedStr = """
+                (project (?openTriplets)
+                  (extend ((?openTriplets ?.0))
+                    (group () ((?.0 (count ?x)))
+                      (filter (notexists
+                                 (quadpattern (quad <urn:x-arq:DefaultGraphNode> ?z ?c ?x)))
+                        (quadpattern
+                          (quad <urn:x-arq:DefaultGraphNode> ?x ?a ?y)
+                          (quad <urn:x-arq:DefaultGraphNode> ?y ?b ?z)
+                        )))))
+                """;
+        Op expected = SSE.parseOp(expectedStr);
+
         Op transformed = TransformScopeRename.transform(orig);
-        
+
         Assert.assertEquals(transformed, expected);
     }
-    
+
     @Test public void renameExpr_01() {
         renameExpr("(exists (triple ?z ?p ?x))",
                    "(exists (triple ?/z ?/p ?x))",
                    "x");
     }
-    
+
     @Test public void renameExpr_02() {
-        renameExpr("(exists (filter (= ?a ?x) (triple ?z ?p ?x)) )", 
-                   "(exists (filter (= ?/a ?x) (triple ?/z ?/p ?x)))", 
+        renameExpr("(exists (filter (= ?a ?x) (triple ?z ?p ?x)) )",
+                   "(exists (filter (= ?/a ?x) (triple ?/z ?/p ?x)))",
                    "x");
     }
 
@@ -316,14 +328,14 @@ public void filter_not_exists_scoping_04() {
 
     // FAILURE
     @Test public void rename_X_02() {
-        String str1 = "(project (?C ?x) (extend ((?C ?.0))  (group (?x) ((?.0 (count)))  (bgp (triple ?s ?p ?x)))))" ;
-        String str2 = "(project (?/C ?x) (extend ((?/C ?/.0))  (group (?x) ((?/.0 (count)))  (bgp (triple ?/s ?/p ?x)))))" ;
+        String str1 = "(project (?C ?x) (extend ((?C ?.0))  (group (?x) ((?.0 (count)))  (bgp (triple ?s ?p ?x)))))";
+        String str2 = "(project (?/C ?x) (extend ((?/C ?/.0))  (group (?x) ((?/.0 (count)))  (bgp (triple ?/s ?/p ?x)))))";
         rename(str1, str2, "x");
     }
-    
+
     @Test public void rename_X_02a() {
-        String str1 = "(project (?C ?s) (extend ((?C ?.0))  (group (?s) ((?.0 (count)))  (bgp (triple ?s ?p ?x)))))" ;
-        String str2 = "(project (?/C ?/s) (extend ((?/C ?/.0))  (group (?/s) ((?/.0 (count)))  (bgp (triple ?/s ?/p ?x)))))" ;
+        String str1 = "(project (?C ?s) (extend ((?C ?.0))  (group (?s) ((?.0 (count)))  (bgp (triple ?s ?p ?x)))))";
+        String str2 = "(project (?/C ?/s) (extend ((?/C ?/.0))  (group (?/s) ((?/.0 (count)))  (bgp (triple ?/s ?/p ?x)))))";
         rename(str1, str2, "x");
     }
 
@@ -363,17 +375,25 @@ public void filter_not_exists_scoping_04() {
         rename(str1, str2, "x");
     }
 
-    
+
     private void checkRename(String queryString, String opExpectedString)
     {
-        Op opExpected = SSE.parseOp(opExpectedString) ;
-        queryString = "PREFIX : <http://example/>\n"+queryString ;
-        Query query = QueryFactory.create(queryString) ;
-        Op op = Algebra.compile(query) ;
-        Op opRenamed = TransformScopeRename.transform(op) ;
-        assertEquals(opExpected, opRenamed) ;
+        Op opExpected = SSE.parseOp(opExpectedString);
+        queryString = "PREFIX : <http://example/>\n"+queryString;
+        Query query = QueryFactory.create(queryString);
+        Op op = Algebra.compile(query);
+        Op opRenamed = TransformScopeRename.transform(op);
+
+        if ( ! opExpected.equals(opRenamed) ) {
+            System.out.println("Expected:");
+            System.out.println(opExpected);
+            System.out.println("Got:");
+            System.out.println(opRenamed);
+        }
+
+        assertEquals(opExpected, opRenamed);
     }
-    
+
     private void reverse(String string, String string2, boolean repeatedly) {
         Op opOrig = SSE.parseOp(string);
         Op opExpected = SSE.parseOp(string2);
@@ -390,7 +410,7 @@ private void rename(String inputStr, String expectedStr, boolean reversable, Set
         Op opOrig = SSE.parseOp(inputStr);
         Op opExpected = SSE.parseOp(expectedStr);
         Op opActual = Rename.renameVars(opOrig, constant);
-    
+
         if ( DEV && !opExpected.equals(opActual) ) {
             System.err.println("**** Test: " + name.getMethodName());
             System.err.println("::Expected::");
@@ -398,9 +418,9 @@ private void rename(String inputStr, String expectedStr, boolean reversable, Set
             System.err.println("::Got::");
             System.err.print(opActual);
         }
-    
+
         assertEquals(opExpected, opActual);
-    
+
         if ( reversable ) {
             // Undo.
             Op opRebuilt = Rename.reverseVarRename(opActual, false);
@@ -413,10 +433,10 @@ private void rename(String inputStr, String expectedStr, boolean reversable, Set
 
     private void renameExpr(String inputStr, String expectedStr, String ... varNames) {
         Set<Var> s = set(varNames);
-        Expr exOrig = SSE.parseExpr(inputStr) ;
-        Expr exExpected = SSE.parseExpr(expectedStr) ;
+        Expr exOrig = SSE.parseExpr(inputStr);
+        Expr exExpected = SSE.parseExpr(expectedStr);
         Expr exprActual = Rename.renameVars(exOrig, s);
-        
+
         if ( DEV && ! exExpected.equals(exprActual) ) {
             System.err.println("**** Test: "+name.getMethodName());
             System.err.println("::Expected::");
@@ -424,13 +444,13 @@ private void renameExpr(String inputStr, String expectedStr, String ... varNames
             System.err.println("::Got::");
             System.err.println(exprActual);
         }
-        assertEquals(exExpected, exprActual) ;
+        assertEquals(exExpected, exprActual);
     }
     private static Set<Var> set(String[] varNames) {
-        Set<Var> s = new HashSet<>() ;
+        Set<Var> s = new HashSet<>();
         for ( String vn : varNames )
-            s.add(Var.alloc(vn)) ;
-        return s ;
+            s.add(Var.alloc(vn));
+        return s;
     }
     private void rename(String inputStr, String expectedStr, String... varNames) {
         rename(inputStr, expectedStr, true, varNames);
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
index 245307a9827..b644393b665 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
@@ -349,11 +349,23 @@ public class TestExpressions
 
     @Test public void lang_01() { testString("LANG('tea time'@en)", "en") ; }
     // Aside For some strange reason, the language code is GB not UK.
-    // The state is UK! "The United Kingdom of Great Britain and Norther Ireland."
+    // "The United Kingdom of Great Britain and Norther Ireland."
     // The four countries England, Scotland, Wales and Northern Ireland (since 1922).
     // It's complicated: https://en.wikipedia.org/wiki/United_Kingdom
     @Test public void lang_02() { testString("LANG('tea time'@en-gb)", "en-GB") ; }
     @Test public void lang_03() { testString("LANG('tea time')", "") ; }
+    @Test public void lang_04() { testBoolean("hasLANG('tea time'@en-gb)", true) ; }
+    @Test public void lang_05() { testBoolean("hasLANG('tea time')", false) ; }
+
+    // hasLANG  hasLANGDIR  LANG  LANGDIR  STRLANGDIR
+    @Test public void langdir_01() { testBoolean("hasLANGDIR('coffee time')", false) ; }
+    @Test public void langdir_02() { testString("LANGDIR('coffee time')", "") ; }
+    @Test public void langdir_03() { testSyntax("STRLANGDIR('abc', 'fr', 'ltr')"); }
+
+    @Test public void langdir_04() { testBoolean("hasLANGDIR( STRLANGDIR('abc', 'fr', 'ltr') )", true); }
+    @Test public void langdir_05() { testString("LANGDIR( STRLANGDIR('abc', 'fr', 'ltr') )", "ltr"); }
+    @Test public void langdir_06() { testString("LANG( STRLANGDIR('abc', 'fr', 'ltr') )", "fr"); }
+    @Test public void langdir_07() { testString("LANGDIR( STRLANG('abc', 'fr--ltr') )", ""); }
 
     @Test public void langmatches_01() { testBoolean("LANGMATCHES('EN', 'en')", true) ; }
     @Test public void langmatches_02() { testBoolean("LANGMATCHES('en', 'en')", true) ; }
@@ -369,6 +381,16 @@ public class TestExpressions
     @Test public void langmatches_10() { testBoolean("LANGMATCHES('', '*')", false) ; }
     @Test public void langmatches_11() { testBoolean("LANGMATCHES('en-us', '*')", true) ; }
 
+    // RDF 1.2: triple terms.
+    @Test public void tripleterm_01() { testEval("TRIPLE(<x:s>, <x:p>, 123)"); }
+    @Test public void tripleterm_02() { testURI("SUBJECT( TRIPLE(<x:s>, <x:p>, 123) )", "x:s"); }
+    @Test public void tripleterm_03() { testURI("PREDICATE( TRIPLE(<x:s>, <x:p>, 123) )", "x:p"); }
+
+    @Test(expected=QueryParseException.class)
+    public void tripleterm_03a() { testURI("PROPERTY( TRIPLE(<x:s>, <x:p>, 123) )", "x:p"); }
+
+    @Test public void tripleterm_04() { testNumeric("OBJECT( TRIPLE(<x:s>, <x:p>, 123) )", 123); }
+
     @Test public void boolean_129() { testBoolean("isURI(?x)", true, env) ; }
     @Test public void boolean_130() { testBoolean("isURI(?a)", false, env) ; }
     @Test public void boolean_131() { testBoolean("isURI(?b)", false, env) ; }
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
index 20ba140f2d4..60e096cf0b5 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions2.java
@@ -195,17 +195,17 @@ private static Expr expr(String parserBase, String exprStr) {
 
     // RDF-star
     @Test public void triple_term_cmp_01()
-    { eval("<<<ex:s> <ex:p> <ex:p>>> = <<<ex:s> <ex:p> <ex:p>>>"); }
+    { eval("<<(<ex:s> <ex:p> <ex:p>)>> = <<(<ex:s> <ex:p> <ex:p>)>>"); }
 
     @Test public void triple_term_cmp_02()
-    { eval("<<<ex:s> <ex:p> <ex:o1>>> != <<<ex:s> <ex:p> <ex:o2>>>"); }
+    { eval("<<(<ex:s> <ex:p> <ex:o1>)>> != <<(<ex:s> <ex:p> <ex:o2>)>>"); }
 
     @Test public void triple_term_cmp_03()
-    { eval("<<<ex:s> <ex:p> 1>> < <<<ex:s> <ex:p> 2>>"); }
+    { eval("<<(<ex:s> <ex:p> 1)>> < <<(<ex:s> <ex:p> 2)>>"); }
 
     @Test (expected=ExprEvalException.class)
     public void triple_term_cmp_04()
-    { eval("<<<ex:s> <ex:p1> 2>> < <<<ex:s> <ex:p2> 2>>"); }
+    { eval("<<(<ex:s> <ex:p1> 2)>> < <<(<ex:s> <ex:p2> 2)>>"); }
 
     // XSD casts
 
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
index e7be2b36e8f..ab46dbb9380 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
@@ -23,6 +23,7 @@
 import org.apache.jena.datatypes.xsd.XSDDatatype;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
+import org.apache.jena.graph.TextDirection;
 import org.apache.jena.query.ARQ;
 import org.apache.jena.sparql.expr.nodevalue.NodeFunctions;
 import org.apache.jena.sparql.graph.NodeConst;
@@ -101,36 +102,36 @@ public void testRDFtermEquals4() {
 
     @Test
     public void testRDFtermEquals5() {
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
-        Node n2 = SSE.parseNode("<<:s :p 123>>");
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p 123)>>");
         assertTrue(NodeFunctions.rdfTermEquals(n1, n2));
     }
 
     @Test
     public void testRDFtermEquals6() {
-        Node n1 = SSE.parseNode("<<:s :p1 123>>");
-        Node n2 = SSE.parseNode("<<:s :p2 123>>");
+        Node n1 = SSE.parseNode("<<(:s :p1 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p2 123)>>");
         assertFalse(NodeFunctions.rdfTermEquals(n1, n2));
     }
 
     @Test(expected=ExprEvalException.class)
     public void testRDFtermEquals7() {
-        Node n1 = SSE.parseNode("<<:s :p <<:a :b 'abc'>>>>");
-        Node n2 = SSE.parseNode("<<:s :p <<:a :b 123>>>>");
+        Node n1 = SSE.parseNode("<<(:s :p <<(:a :b 'abc')>>)>>");
+        Node n2 = SSE.parseNode("<<(:s :p <<(:a :b 123)>>)>>");
         NodeFunctions.rdfTermEquals(n1, n2);
     }
 
     @Test(expected=ExprEvalException.class)
     public void testRDFtermEquals8() {
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
-        Node n2 = SSE.parseNode("<<:s :p 'xyz'>>");
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p 'xyz')>>");
         assertFalse(NodeFunctions.rdfTermEquals(n1, n2));
         assertFalse(NodeFunctions.rdfTermEquals(n2, n1));
     }
 
     @Test
     public void testRDFtermEquals9() {
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
         Node n2 = SSE.parseNode("'xyz'");
         assertFalse(NodeFunctions.rdfTermEquals(n1, n2));
         assertFalse(NodeFunctions.rdfTermEquals(n2, n1));
@@ -259,6 +260,22 @@ public void testLang5() {
         NodeValue r = NodeFunctions.lang(nv);
     }
 
+
+    @Test public void testDirLang1() {
+        Node n = NodeFactory.createLiteralDirLang("abc",  "en", TextDirection.LTR);
+        NodeValue nv = NodeValue.makeNode(n);
+        NodeValue lang = NodeFunctions.lang(nv);
+        NodeValue dir = NodeFunctions.langdir(nv);
+        assertEquals("en", lang.getString());
+        assertEquals("ltr", dir.getString());
+    }
+
+    @Test public void testDirLang2() {
+        Node n = NodeFactory.createLiteralDirLang("abc",  "en", "ltr");
+        NodeValue nv = NodeValue.makeDirLangString("abc", "en", "ltr");
+        assertEquals(nv.asNode(), n);
+    }
+
     @Test public void testLangMatches1() {
         NodeValue nv = NodeValue.makeString("en");
         NodeValue pat = NodeValue.makeString("en");
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeValue.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeValue.java
index 0f0cc62156c..8e1bf78ffc3 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeValue.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeValue.java
@@ -104,7 +104,7 @@ public void testFloat3() {
         assertTrue("Not same float: " + v1 + " & " + v2, v1.getFloat() == v2.getFloat());
         assertTrue("Not same float as double: " + v1 + " & " + v2, v1.getDouble() == v2.getDouble());
     }
-    
+
     @Test
     public void testFloat4() {
         NodeValue v1 = NodeValue.makeNodeFloat("5.7");
@@ -1233,8 +1233,8 @@ public void testNotEquals3() { // Literals and URIs are different.
 
     @Test
     public void testTripleTerms1() {
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
-        Node n2 = SSE.parseNode("<<:s :p 456>>");
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p 456)>>");
         NodeValue nv1 = NodeValue.makeNode(n1);
         NodeValue nv2 = NodeValue.makeNode(n2);
         int xa = NodeValue.compare(nv1, nv2);
@@ -1245,8 +1245,8 @@ public void testTripleTerms1() {
 
     @Test(expected=ExprNotComparableException.class)
     public void testTripleTerms2() {
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
-        Node n2 = SSE.parseNode("<<:s :p 'abc'>>");
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p 'abc')>>");
         NodeValue nv1 = NodeValue.makeNode(n1);
         NodeValue nv2 = NodeValue.makeNode(n2);
         NodeValue.compare(nv1, nv2);
@@ -1254,13 +1254,12 @@ public void testTripleTerms2() {
 
     @Test
     public void testTripleTerms3() {
-        // Jena 4.6.0 :: 'abc' < before 123
-        Node n1 = SSE.parseNode("<<:s :p 123>>");
-        Node n2 = SSE.parseNode("<<:s :p 'abc'>>");
+        // General (sort) comparison. 'abc' < before 123
+        Node n1 = SSE.parseNode("<<(:s :p 123)>>");
+        Node n2 = SSE.parseNode("<<(:s :p 'abc')>>");
         NodeValue nv1 = NodeValue.makeNode(n1);
         NodeValue nv2 = NodeValue.makeNode(n2);
         int x = NodeValue.compareAlways(nv1, nv2);
         assertEquals(Expr.CMP_GREATER, x);
     }
-
 }
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
index 111be28a8c9..70b47c6743e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
@@ -311,9 +311,9 @@ public void test_variable5() {
     }
 
     @Test
-    public void test_nodeTriple_1() {
-        Node x = SSE.parseNode("<<:s :p 1>>");
-        Node y = SSE.parseNode("<<:s :p 2>>");
+    public void test_tripleterm_1() {
+        Node x = SSE.parseNode("<<(:s :p 1)>>");
+        Node y = SSE.parseNode("<<(:s :p 2)>>");
         int res = NodeCmp.compareRDFTerms(x, y);
         assertTrue(Expr.CMP_LESS == res);
         res = NodeCmp.compareRDFTerms(y, x);
@@ -321,9 +321,9 @@ public void test_nodeTriple_1() {
     }
 
     @Test
-    public void test_nodeTriple_2() {
-        Node x = SSE.parseNode("<<:s2 :p 1>>");
-        Node y = SSE.parseNode("<<:s1 :p 2>>");
+    public void test_tripleterm_2() {
+        Node x = SSE.parseNode("<<(:s2 :p 1)>>");
+        Node y = SSE.parseNode("<<(:s1 :p 2)>>");
         int res = NodeCmp.compareRDFTerms(x, y);
         assertTrue(Expr.CMP_GREATER == res);
         res = NodeCmp.compareRDFTerms(y, x);
@@ -331,17 +331,17 @@ public void test_nodeTriple_2() {
     }
 
     @Test
-    public void test_nodeTriple_3() {
-        Node x = SSE.parseNode("<<:s :p 2>>");
-        Node y = SSE.parseNode("<<:s :p 2>>");
+    public void test_tripleterm_3() {
+        Node x = SSE.parseNode("<<(:s :p 2)>>");
+        Node y = SSE.parseNode("<<(:s :p 2)>>");
         int res = NodeCmp.compareRDFTerms(x, y);
         assertTrue(Expr.CMP_EQUAL == res);
     }
 
     @Test
-    public void test_nodeTriple_4() {
+    public void test_tripleterm_4() {
         Node x = SSE.parseNode("'abc'");
-        Node y = SSE.parseNode("<<:s :p 2>>");
+        Node y = SSE.parseNode("<<(:s :p 2)>>");
         int res = NodeCmp.compareRDFTerms(x, y);
         // After literals.
         assertTrue(Expr.CMP_LESS == res);
@@ -350,9 +350,9 @@ public void test_nodeTriple_4() {
     }
 
     @Test
-    public void test_nodeTriple_5() {
+    public void test_tripleterm_5() {
         Node x = SSE.parseNode("<uri>");
-        Node y = SSE.parseNode("<<:s :p 2>>");
+        Node y = SSE.parseNode("<<(:s :p 2)>>");
         int res = NodeCmp.compareRDFTerms(x, y);
         // After URIs
         assertTrue(Expr.CMP_LESS == res);
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSortOrdering.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSortOrdering.java
index 724623d45e9..b51dce36e55 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSortOrdering.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestSortOrdering.java
@@ -102,30 +102,30 @@ public class TestSortOrdering {
 //    }
 
     @Test public void ordering_20() {
-        String s1 = "<<:s1 :p :o>>";
-        String s2 = "<<:s2 :p :o>>";
-        String s3 = "<<:s3 :p :o>>";
+        String s1 = "<<(:s1 :p :o)>>";
+        String s2 = "<<(:s2 :p :o)>>";
+        String s3 = "<<(:s3 :p :o)>>";
         test(s1, s2, s3);
     }
 
     @Test public void ordering_21() {
-        String s1 = "<<:s :p :o>>";
-        String s2 = "<<:s :p :o1>>";
-        String s3 = "<<:s :p1 :o1>>";
+        String s1 = "<<(:s :p :o)>>";
+        String s2 = "<<(:s :p :o1)>>";
+        String s3 = "<<(:s :p1 :o1)>>";
         test(s1, s2, s3);
     }
 
     @Test public void ordering_22() {
-        String s1 = "<<:s :p 1>>";
-        String s2 = "<<:s :p 2>>";
-        String s3 = "<<:s :p 3>>";
+        String s1 = "<<(:s :p 1)>>";
+        String s2 = "<<(:s :p 2)>>";
+        String s3 = "<<(:s :p 3)>>";
         test(s1, s2, s3);
     }
 
     @Test public void ordering_23() {
-        String s1 = "<<:s :p '1'>>";
-        String s2 = "<<:s :p '1'@en>>";
-        String s3 = "<<:s :p 1>>";
+        String s1 = "<<(:s :p '1')>>";
+        String s2 = "<<(:s :p '1'@en)>>";
+        String s3 = "<<(:s :p 1)>>";
         test(s1, s2, s3);
     }
 
@@ -153,7 +153,7 @@ public class TestSortOrdering {
     @Test public void ordering_53() {
         String s1 = "'2022-12-28T10:11:12'^^xsd:dateTime";
         String s2 = "'3033-12-28T10:11:12'^^xsd:dateTime";
-        String s3 = "<<:s :p :o>>";
+        String s3 = "<<(:s :p :o)>>";
         test(s1, s2, s3);
     }
 
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMap.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMap.java
new file mode 100644
index 00000000000..1a466bf8d94
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMap.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.junit;
+
+import java.util.function.Function;
+
+import org.apache.jena.arq.junit.manifest.ManifestEntry;
+import org.apache.jena.arq.junit.runners.AbstractRunnerOfTests;
+import org.apache.jena.arq.junit.sparql.SparqlTests;
+import org.apache.jena.atlas.lib.Creator;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.junit.runners.model.InitializationError;
+
+/**
+ * Run scripted tests using DatasetGraphMap (self contained set of graphs).
+ */
+public class RunnerSPARQL_DatasetMap extends AbstractRunnerOfTests {
+
+    public RunnerSPARQL_DatasetMap(Class<? > klass) throws InitializationError {
+        super(klass, testMaker());
+    }
+
+    private static Function<ManifestEntry, Runnable> testMaker() {
+        Creator<Dataset> creator = ()->DatasetFactory.create();
+        return
+            (manifestEntry) ->
+                SparqlTests.makeSPARQLTestExecOnly(manifestEntry, creator);
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMapLink.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMapLink.java
new file mode 100644
index 00000000000..1bb3e64539c
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_DatasetMapLink.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.junit;
+
+import java.util.function.Function;
+
+import org.apache.jena.arq.junit.manifest.ManifestEntry;
+import org.apache.jena.arq.junit.runners.AbstractRunnerOfTests;
+import org.apache.jena.arq.junit.sparql.SparqlTests;
+import org.apache.jena.atlas.lib.Creator;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.junit.runners.model.InitializationError;
+
+/**
+ * Run scripted tests using DatasetGraphMapLink (holds links to existing graphs).
+ */
+public class RunnerSPARQL_DatasetMapLink extends AbstractRunnerOfTests {
+
+    public RunnerSPARQL_DatasetMapLink(Class<? > klass) throws InitializationError {
+        super(klass, testMaker());
+    }
+
+    private static Function<ManifestEntry, Runnable> testMaker() {
+        Creator<Dataset> creator = ()->DatasetFactory.createGeneral();
+        return
+            (manifestEntry) ->
+                SparqlTests.makeSPARQLTestExecOnly(manifestEntry, creator);
+    }
+}
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_TIM.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_TIM.java
index 5f1f5b1da59..44041f0a9df 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_TIM.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/RunnerSPARQL_TIM.java
@@ -28,6 +28,9 @@
 import org.apache.jena.query.DatasetFactory;
 import org.junit.runners.model.InitializationError;
 
+/**
+ * Run scripted tests using TIM (Transaction InMemory) dataset implementation.
+ */
 public class RunnerSPARQL_TIM extends AbstractRunnerOfTests {
 
     public RunnerSPARQL_TIM(Class<? > klass) throws InitializationError {
@@ -35,7 +38,7 @@ public RunnerSPARQL_TIM(Class<? > klass) throws InitializationError {
     }
 
     private static Function<ManifestEntry, Runnable> testMaker() {
-        Creator<Dataset> creator = ()->DatasetFactory.create();
+        Creator<Dataset> creator = ()->DatasetFactory.createTxnMem();
         return
             (manifestEntry) ->
                 SparqlTests.makeSPARQLTestExecOnly(manifestEntry, creator);
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
index 107d50ecff3..1f2cbd9450c 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/resultset/TestResultSet.java
@@ -26,9 +26,14 @@
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import org.apache.jena.atlas.lib.StrUtils;
 import org.apache.jena.graph.Node;
 import org.apache.jena.graph.NodeFactory;
@@ -41,20 +46,17 @@
 import org.apache.jena.sparql.engine.ResultSetStream;
 import org.apache.jena.sparql.engine.binding.Binding;
 import org.apache.jena.sparql.engine.binding.BindingFactory;
-import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper;
 import org.apache.jena.sparql.engine.iterator.QueryIterSingleton;
 import org.apache.jena.sparql.sse.SSE;
 import org.apache.jena.sparql.util.Context;
 import org.apache.jena.sparql.util.NodeFactoryExtra;
 import org.apache.jena.sparql.util.ResultSetUtils;
 import org.apache.jena.sys.JenaSystem;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
 
-public class TestResultSet
-{
-    static { JenaSystem.init(); }
+public class TestResultSet {
+    static {
+        JenaSystem.init();
+    }
 
     @BeforeClass
     public static void setup() {
@@ -223,14 +225,7 @@ public void test_RS_union_1() {
         ResultSet rs1 = make("x", org.apache.jena.graph.NodeFactory.createURI("tag:local"));
         ResultSet rs2 = make("x", org.apache.jena.graph.NodeFactory.createURI("tag:local"));
         ResultSet rs3 = make2("x", org.apache.jena.graph.NodeFactory.createURI("tag:local"));
-        assertTrue(ResultSetCompare.equalsByTerm(rs3, ResultSetUtils.union(rs1, rs2)));
-    }
-
-    @Test(expected = ResultSetException.class)
-    public void test_RS_union_2() {
-        ResultSet rs1 = make("x", org.apache.jena.graph.NodeFactory.createURI("tag:local"));
-        ResultSet rs2 = make("y", org.apache.jena.graph.NodeFactory.createURI("tag:local"));
-        ResultSetUtils.union(rs1, rs2);
+        assertTrue(ResultSetCompare.equalsByTerm(rs3, ResultSetUtils.merge(rs1, rs2)));
     }
 
     private void test_RS_fmt(ResultSet rs, ResultsFormat fmt, boolean ordered) {
@@ -335,24 +330,26 @@ public void test_RS_cmp_value_1() {
     // Peeking
     @Test
     public void test_RS_peeking_1() {
-        ResultSetPeekable rs = makePeekable("x",  NodeFactory.createURI("tag:local"));
+        ResultSetPeekable rs = makePeekable("x", NodeFactory.createURI("tag:local"));
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
 
-        // Peeking should not move the result set onwards so hasNext() should still report true
+        // Peeking should not move the result set onwards so hasNext() should still
+        // report true
         assertTrue(rs.hasNext());
 
         assertNotNull(rs.next());
         assertFalse(rs.hasNext());
     }
 
-    @Test(expected=NoSuchElementException.class)
+    @Test(expected = NoSuchElementException.class)
     public void test_RS_peeking_2() {
-        ResultSetPeekable rs = makePeekable("x",  NodeFactory.createURI("tag:local"));
+        ResultSetPeekable rs = makePeekable("x", NodeFactory.createURI("tag:local"));
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
 
-        // Peeking should not move the result set onwards so hasNext() should still report true
+        // Peeking should not move the result set onwards so hasNext() should still
+        // report true
         assertTrue(rs.hasNext());
 
         assertNotNull(rs.next());
@@ -365,25 +362,27 @@ public void test_RS_peeking_2() {
     @Test
     public void test_RS_peeking_3() {
         // Expect that a rewindable result set will be peekable
-        ResultSetPeekable rs = (ResultSetPeekable)makeRewindable("x",  NodeFactory.createURI("tag:local"));
+        ResultSetPeekable rs = (ResultSetPeekable)makeRewindable("x", NodeFactory.createURI("tag:local"));
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
 
-        // Peeking should not move the result set onwards so hasNext() should still report true
+        // Peeking should not move the result set onwards so hasNext() should still
+        // report true
         assertTrue(rs.hasNext());
 
         assertNotNull(rs.next());
         assertFalse(rs.hasNext());
     }
 
-    @Test(expected=NoSuchElementException.class)
+    @Test(expected = NoSuchElementException.class)
     public void test_RS_peeking_4() {
         // Expect that a rewindable result set will be peekable
-        ResultSetPeekable rs = (ResultSetPeekable) makeRewindable("x",  NodeFactory.createURI("tag:local"));
+        ResultSetPeekable rs = (ResultSetPeekable)makeRewindable("x", NodeFactory.createURI("tag:local"));
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
 
-        // Peeking should not move the result set onwards so hasNext() should still report true
+        // Peeking should not move the result set onwards so hasNext() should still
+        // report true
         assertTrue(rs.hasNext());
 
         assertNotNull(rs.next());
@@ -395,8 +394,9 @@ public void test_RS_peeking_4() {
 
     @Test
     public void test_RS_peeking_5() {
-        // Peeking should be able to cope with people moving on the underlying result set independently
-        ResultSet inner = new ResultSetMem(make("x", NodeFactory.createURI("tag:local")), make("x", NodeFactory.createURI("tag:local")));
+        // Peeking should be able to cope with people moving on the underlying result
+        // set independently
+        ResultSet inner = make(List.of("x"), row("x", NodeFactory.createURI("tag:local")), row("x", NodeFactory.createURI("tag:local")));
         ResultSetPeekable rs = ResultSetFactory.makePeekable(inner);
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
@@ -404,14 +404,17 @@ public void test_RS_peeking_5() {
         // Move on the inner result set independently
         inner.next();
 
-        // Since we fiddled with the underlying result set there won't be further elements available anymore
+        // Since we fiddled with the underlying result set there won't be further
+        // elements available anymore
         assertFalse(rs.hasNext());
     }
 
     @Test
     public void test_RS_peeking_6() {
-        // Peeking should be able to cope with people moving on the underlying result set independently
-        ResultSet inner = new ResultSetMem(make("x", NodeFactory.createURI("tag:local")), make("x", NodeFactory.createURI("tag:local")), make("x", NodeFactory.createURI("tag:local")));
+        // Peeking should be able to cope with people moving on the underlying result
+        // set independently
+        ResultSet inner = make(List.of("x"), row("x", NodeFactory.createURI("tag:local")), row("x", NodeFactory.createURI("tag:local")),
+                               row("x", NodeFactory.createURI("tag:local")));
         ResultSetPeekable rs = ResultSetFactory.makePeekable(inner);
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
@@ -424,6 +427,10 @@ public void test_RS_peeking_6() {
         assertTrue(rs.hasNext());
     }
 
+    private static Binding row(String var, Node node) {
+        return BindingFactory.binding(Var.alloc(var), node);
+    }
+
     @Test
     public void test_RS_peeking_7() {
         // Peeking may fail if someone moves backwards in the result set
@@ -436,16 +443,19 @@ public void test_RS_peeking_7() {
         // Reset the inner result set independently
         inner.reset();
 
-        // Since we moved the underlying result set backwards but we hadn't gone anywhere
+        // Since we moved the underlying result set backwards but we hadn't gone
+        // anywhere
         // we should still be able to safely access the underlying results
         assertTrue(rs.hasNext());
     }
 
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void test_RS_peeking_8() {
         // Peeking may fail if someone moves backwards in the result set
         // If we had moved past the first item this should be an error
-        ResultSetRewindable inner = new ResultSetMem(make("x", NodeFactory.createURI("tag:local")), make("x", NodeFactory.createURI("tag:local")));
+        ResultSet resultSet0 = make(List.of("x"), row("x", NodeFactory.createURI("tag:local")),
+                                    row("x", NodeFactory.createURI("tag:local")));
+        ResultSetRewindable inner = ResultSetFactory.makeRewindable(resultSet0);
         ResultSetPeekable rs = ResultSetFactory.makePeekable(inner);
         assertTrue(rs.hasNext());
         assertNotNull(rs.peek());
@@ -454,19 +464,21 @@ public void test_RS_peeking_8() {
         // Reset the inner result set independently
         inner.reset();
 
-        // Since we moved the underlying result set backwards and had moved somewhere we
+        // Since we moved the underlying result set backwards and had moved somewhere
+        // we
         // are now in an illegal state
         rs.hasNext();
     }
 
     @Test
     public void test_RS_peeking_9() {
-        // Check that peeking causes the correct row to be returned when we actually access the rows
+        // Check that peeking causes the correct row to be returned when we actually
+        // access the rows
         Node first = NodeFactory.createURI("tag:first");
         Node second = NodeFactory.createURI("tag:second");
         Var x = Var.alloc("x");
 
-        ResultSet inner = new ResultSetMem(make("x", first), make("x", second));
+        ResultSet inner = make(List.of("x"), row("x", first), row("x", second));
         ResultSetPeekable rs = ResultSetFactory.makePeekable(inner);
         assertTrue(rs.hasNext());
 
@@ -491,50 +503,32 @@ public void test_RS_peeking_9() {
 
     // ---- Isomorphism.
 
-    /* This is from the DAWG test suite.
-     * Result set 1:
-     *   ---------------
-     *   | x    | y    |
-     *   ===============
-     *   | _:b0 | _:b1 |
-     *   | _:b2 | _:b3 |
-     *   | _:b1 | _:b0 |
-     *   ---------------
-     * Result set 2:
-     *   ---------------
-     *   | x    | y    |
-     *   ===============
-     *   | _:b1 | _:b0 |
-     *   | _:b3 | _:b2 |
-     *   | _:b2 | _:b3 |
-     *   ---------------
-     */
+    /* This is from the DAWG test suite. Result set 1: --------------- | x | y |
+     * =============== | _:b0 | _:b1 | | _:b2 | _:b3 | | _:b1 | _:b0 |
+     * --------------- Result set 2: --------------- | x | y | =============== | _:b1
+     * | _:b0 | | _:b3 | _:b2 | | _:b2 | _:b3 | --------------- */
 
     // nasty result set.
-    // These are the same but the first row of rs2$ throws in a wrong mapping of b0/c1
+    // These are the same but the first row of rs2$ throws in a wrong mapping of
+    // b0/c1
 
     // Right mapping is:
     // b0->c3, b1->c2, b2->c1, b3->c0
     // Currently we get, working simply top to bottom, no backtracking:
-    // b0->c1, b1->c0, b2->c3, b3->c2, then last row fails as _:b1 is mapped to c0, b0 to c1 not (c2, c3)
-
-    private static String[] rs1$ = {
-        "(resultset (?x ?y)",
-        "   (row (?x _:b0) (?y _:b1))",
-        "   (row (?x _:b2) (?y _:b3))",
-        "   (row (?x _:b1) (?y _:b0))",
-        ")"};
-    private static String[] rs2$ = {
-        "(resultset (?x ?y)",
-        "   (row (?x _:c1) (?y _:c0))",
-        "   (row (?x _:c3) (?y _:c2))",
-        "   (row (?x _:c2) (?y _:c3))",
-        ")"};
-
-    @Test public void test_RS_iso_1()       { isotest(rs1$, rs2$); }
-
-    private void isotest(String[] rs1$2, String[] rs2$2)
-    {
+    // b0->c1, b1->c0, b2->c3, b3->c2, then last row fails as _:b1 is mapped to c0,
+    // b0 to c1 not (c2, c3)
+
+    private static String[] rs1$ = {"(resultset (?x ?y)", "   (row (?x _:b0) (?y _:b1))", "   (row (?x _:b2) (?y _:b3))",
+        "   (row (?x _:b1) (?y _:b0))", ")"};
+    private static String[] rs2$ = {"(resultset (?x ?y)", "   (row (?x _:c1) (?y _:c0))", "   (row (?x _:c3) (?y _:c2))",
+        "   (row (?x _:c2) (?y _:c3))", ")"};
+
+    @Test
+    public void test_RS_iso_1() {
+        isotest(rs1$, rs2$);
+    }
+
+    private void isotest(String[] rs1$2, String[] rs2$2) {
         ResultSetRewindable rs1 = make(StrUtils.strjoinNL(rs1$));
         ResultSetRewindable rs2 = make(StrUtils.strjoinNL(rs2$));
 
@@ -554,23 +548,26 @@ private static ResultSetRewindable make(String x) {
     // -- BNode preservation
 
     static Context cxt;
-    static{
+    static {
         cxt = new Context();
         cxt.set(ARQ.inputGraphBNodeLabels, true);
         cxt.set(ARQ.outputGraphBNodeLabels, true);
     }
 
-    @Test public void preserve_bnodes_1() {
+    @Test
+    public void preserve_bnodes_1() {
         preserve_bnodes(ResultSetLang.RS_JSON, cxt, true);
         preserve_bnodes(ResultSetLang.RS_JSON, ARQ.getContext(), false);
     }
 
-    @Test public void preserve_bnodes_2() {
+    @Test
+    public void preserve_bnodes_2() {
         preserve_bnodes(ResultSetLang.RS_XML, cxt, true);
         preserve_bnodes(ResultSetLang.RS_XML, ARQ.getContext(), false);
     }
 
-    @Test public void preserve_bnodes_3() {
+    @Test
+    public void preserve_bnodes_3() {
         preserve_bnodes(ResultSetLang.RS_Thrift, cxt, true);
         preserve_bnodes(ResultSetLang.RS_Thrift, ARQ.getContext(), true);
     }
@@ -582,9 +579,7 @@ private static void preserve_bnodes(Lang sparqlresultlang, Context cxt, boolean
         ResultsWriter.create().context(cxt).lang(sparqlresultlang).write(x, rs1);
         ByteArrayInputStream y = new ByteArrayInputStream(x.toByteArray());
 
-        ResultSetRewindable rs2 = ResultSetFactory.copyResults(
-            ResultsReader.create().context(cxt).lang(sparqlresultlang).read(y)
-            );
+        ResultSetRewindable rs2 = ResultSetFactory.copyResults(ResultsReader.create().context(cxt).lang(sparqlresultlang).read(y));
         rs1.reset();
         rs2.reset();
         if ( same )
@@ -593,53 +588,38 @@ private static void preserve_bnodes(Lang sparqlresultlang, Context cxt, boolean
             assertFalse(ResultSetCompare.equalsExact(rs1, rs2));
     }
 
-
     // -------- Support functions
 
-    private ResultSet make(String var, Node val)
-    {
-        Binding b = BindingFactory.binding(Var.alloc(var), val);
-        List<String> vars = new ArrayList<>();
-        vars.add(var);
-        QueryIterator qIter = QueryIterSingleton.create(b, null);
-        ResultSet rs = ResultSetStream.create(vars, null, qIter);
-        return rs;
+    static class RowSetBuilder {
     }
 
-    private ResultSet make2(String var, Node val)
-    {
-        Binding b1 = BindingFactory.binding(Var.alloc(var), val);
-        Binding b2 = BindingFactory.binding(Var.alloc(var), val);
-
-        List<String> vars = new ArrayList<>();
-        vars.add(var);
-
-        List<Binding> solutions = new ArrayList<>();
-        solutions.add(b1);
-        solutions.add(b2);
+    private ResultSet make(String var, Node val) {
+        return make(List.of(var), row(var, val));
+    }
 
-        QueryIterator qIter = QueryIterPlainWrapper.create(solutions.iterator(), null);
-        ResultSet rs = ResultSetStream.create(vars, null, qIter);
-        return rs;
+    private ResultSet make(List<String> varNames, Binding...rows) {
+        List<Binding> listRows = Arrays.asList(rows);
+        List<Var> vars = varNames.stream().map(Var::alloc).toList();
+        return new ResultSetMem(ResultSetStream.create(vars, listRows.iterator()));
     }
 
+    private ResultSet make2(String var, Node val) {
+        return make(List.of(var), row(var, val), row(var, val));
+    }
 
-    private ResultSetRewindable makeRewindable(String var, Node val)
-    {
+    private ResultSetRewindable makeRewindable(String var, Node val) {
         ResultSet rs = make(var, val);
         ResultSetRewindable rsw = ResultSetFactory.makeRewindable(rs);
         return rsw;
     }
 
-    private ResultSetRewindable make2Rewindable(String var, Node val)
-    {
+    private ResultSetRewindable make2Rewindable(String var, Node val) {
         ResultSet rs = make2(var, val);
         ResultSetRewindable rsw = ResultSetFactory.makeRewindable(rs);
         return rsw;
     }
 
-    private ResultSet make(String var1, Node val1, String var2, Node val2 )
-    {
+    private ResultSet make(String var1, Node val1, String var2, Node val2) {
         Binding b = BindingFactory.binding(Var.alloc(var1), val1, Var.alloc(var2), val2);
 
         List<String> vars = new ArrayList<>();
@@ -651,8 +631,7 @@ private ResultSet make(String var1, Node val1, String var2, Node val2 )
         return rs;
     }
 
-    private ResultSetRewindable makeRewindable(String var1, Node val1, String var2, Node val2 )
-    {
+    private ResultSetRewindable makeRewindable(String var1, Node val1, String var2, Node val2) {
         ResultSet rs = make(var1, val1, var2, val2);
         ResultSetRewindable rsw = ResultSetFactory.makeRewindable(rs);
         return rsw;
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/sse/TestSSE_Basic.java b/jena-arq/src/test/java/org/apache/jena/sparql/sse/TestSSE_Basic.java
index bf0f7f74ff3..9b77457cac3 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/sse/TestSSE_Basic.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/sse/TestSSE_Basic.java
@@ -237,27 +237,27 @@ public void testVar_11() {
     @Test public void testMisc_11()    { testNotEquals("(a)", "()"); }
     @Test public void testMisc_12()    { testNotEquals("(a)", "(<a>)"); }
 
-    @Test public void testTripleTerm_1()  { testNode("<< :s :p :o >>"); }
-    @Test public void testTripleTerm_2()  { testNode("<<:s :p :o>>"); }
-    @Test public void testTripleTerm_3()  { testNode("<< ?s ?p ?o >>"); }
-    @Test public void testTripleTerm_4()  { testNode("<<<< :s :p :o >> :q << :s :p :o >>>>"); }
-
-    @Test public void testTripleTerm_10()  { parseBad("<< :s :p :o "); }
-    @Test public void testTripleTerm_11()  { parseBad("<< :s >>"); }
-    @Test public void testTripleTerm_12()  { parseBad("<< :s :p >>"); }
-    @Test public void testTripleTerm_13()  { parseBad("<< <<:s :p :o >> :q >> "); }
-
-    @Test public void testQuotedTriple_1()  { testNode("(qtriple :s :p :o)"); }
-    @Test public void testQuotedTriple_2()  { testNode("(qtriple :s :p :o)"); }
-    @Test public void testQuotedTriple_3()  { testNode("(qtriple ?s ?p ?o)"); }
-    @Test public void testQuotedTriple_4()  { testNode("(qtriple (qtriple :s :p :o ) :q (qtriple :s :p :o))"); }
-    @Test public void testQuotedTriple_5()  { testNode("(qtriple << :s :p :o >> :q << :s :p :o >>)"); }
+    @Test public void testTripleTerm_1()  { testNode("<<( :s :p :o )>>"); }
+    @Test public void testTripleTerm_2()  { testNode("<<(:s :p :o)>>"); }
+    @Test public void testTripleTerm_3()  { testNode("<<( ?s ?p ?o )>>"); }
+    @Test public void testTripleTerm_4()  { testNode("<<(<<( :s :p :o )>> :q <<( :s :p :o )>>)>>"); }
+
+    @Test public void testTripleTerm_10()  { parseBad("<<( :s :p :o "); }
+    @Test public void testTripleTerm_11()  { parseBad("<<( :s )>>"); }
+    @Test public void testTripleTerm_12()  { parseBad("<<( :s :p )>>"); }
+    @Test public void testTripleTerm_13()  { parseBad("<<( <<(:s :p :o )>> :q )>> "); }
+
+    @Test public void testTripleTermTag_1()  { testNode("(tripleterm :s :p :o)"); }
+    @Test public void testTripleTermTag_2()  { testNode("(tripleterm :s :p :o)"); }
+    @Test public void testTripleTermTag_3()  { testNode("(tripleterm ?s ?p ?o)"); }
+    @Test public void testTripleTermTag_4()  { testNode("(tripleterm (tripleterm :s :p :o ) :q (tripleterm :s :p :o))"); }
+    @Test public void testTripleTermTag_5()  { testNode("(tripleterm <<( :s :p :o )>> :q <<( :s :p :o )>>)"); }
 
     // Legal as  structure, can't be lifted.
-    @Test public void testQuotedTriple_11()  { parseBadNoLift("(qtriple :s)"); }
-    @Test public void testQuotedTriple_12()  { parseBadNoLift("(qtriple :s :p)"); }
-    @Test public void testQuotedTriple_13()  { parseBadNoLift("(qtriple (qtriple :s :p :o) :q "); }
-    @Test public void testQuotedTriple_14()  { parseBadNoLift("(qtriple <<:s :p :o >> :q "); }
+    @Test public void testTripleTermTag_11()  { parseBadNoLift("(tripleterm :s)"); }
+    @Test public void testTripleTermTag_12()  { parseBadNoLift("(tripleterm :s :p)"); }
+    @Test public void testTripleTermTag_13()  { parseBadNoLift("(tripleterm (tripleterm :s :p :o) :q "); }
+    @Test public void testTripleTermTag_14()  { parseBadNoLift("(tripleterm <<(:s :p :o )>> :q "); }
 
 
     @Test
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIsoMatcher.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIsoMatcher.java
index 98e1f266daa..c590dcd39a3 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIsoMatcher.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestIsoMatcher.java
@@ -147,50 +147,49 @@ public class TestIsoMatcher
                                                  "(<_:a> :p1 <_:b>) (<_:b> :p2 <_:a>)",
                                                  true); }
 
-
     // RDF-star terms
-    @Test public void iso_graph_40() { testGraphIso("(<<:s :p :o>> :q1 :z1) (<<_:a :p :o>> :q2 :z2)",
-                                                    "(<<_:a :p :o>> :q2 :z2) (<<:s :p :o>> :q1 :z1)",
+    @Test public void iso_graph_40() { testGraphIso("(<<(:s :p :o)>> :q1 :z1) (<<(_:a :p :o)>> :q2 :z2)",
+                                                    "(<<(_:a :p :o)>> :q2 :z2) (<<(:s :p :o)>> :q1 :z1)",
                                                     true); }
 
-    @Test public void iso_graph_41() { testGraphIso("(<< _:a :p :o>> :q1 :z1) (<< _:a :p :o>> :q2 :z2) (_:a :p :o)",
-                                                    "(<< _:a :p :o>> :q2 :z2) (<< _:a :p :o>> :q1 :z1) (_:a :p :o)",
+    @Test public void iso_graph_41() { testGraphIso("(<<( _:a :p :o)>> :q1 :z1) (<<( _:a :p :o)>> :q2 :z2) (_:a :p :o)",
+                                                    "(<<( _:a :p :o)>> :q2 :z2) (<<( _:a :p :o)>> :q1 :z1) (_:a :p :o)",
                                                     true); }
 
-    @Test public void iso_graph_42() { testGraphIso("(<<<_:a> :p :o>> :q1 :z1) (<<<_:a> :p :o>> :q2 :z2)",
-                                                    "(<<<_:a> :p :o>> :q2 :z2) (<<<_:b> :p :o>> :q1 :z1)",
+    @Test public void iso_graph_42() { testGraphIso("(<<(<_:a> :p :o)>> :q1 :z1) (<<(<_:a> :p :o)>> :q2 :z2)",
+                                                    "(<<(<_:a> :p :o)>> :q2 :z2) (<<(<_:b> :p :o)>> :q1 :z1)",
                                                     false); }
 
-    @Test public void iso_graph_43() { testGraphIso("(<< << _:a :p :o >> :q1 :z1>> :q2 :z2)",
-                                                    "(<< << _:a :p :o >> :q1 :z1>> :q2 :z2)",
+    @Test public void iso_graph_43() { testGraphIso("(<<( <<( _:a :p :o )>> :q1 :z1)>> :q2 :z2)",
+                                                    "(<<( <<( _:a :p :o )>> :q1 :z1)>> :q2 :z2)",
                                                     true); }
 
-    @Test public void iso_graph_44() { testGraphIso("(<< :a1 :q1 << :s :p _:o >> >> :q2 :z2)",
-                                                    "(<< :a1 :q1 << :s :p _:o >> >> :q2 :z2)",
+    @Test public void iso_graph_44() { testGraphIso("(<<( :a1 :q1 <<( :s :p _:o )>> )>> :q2 :z2)",
+                                                    "(<<( :a1 :q1 <<( :s :p _:o )>> )>> :q2 :z2)",
                                                     true); }
 
-    @Test public void iso_triple_terms_1() { testTripleTerms("<< <_:a1> :p :o>>",
-                                                             "<< <_:a2> :p :o>>",
+    @Test public void iso_triple_terms_1() { testTripleTerms("<<( <_:a1> :p :o)>>",
+                                                             "<<( <_:a2> :p :o)>>",
                                                              true);}
 
-    @Test public void iso_triple_terms_2() { testTripleTerms("<< <_:a1> :p :o>>",
-                                                             "<<:s :p <_:a3> >>",
+    @Test public void iso_triple_terms_2() { testTripleTerms("<<( <_:a1> :p :o)>>",
+                                                             "<<(:s :p <_:a3> )>>",
                                                              false);}
 
-    @Test public void iso_triple_terms_3() { testTripleTerms("<< <_:a4> :p <_:a4> >>",
-                                                             "<< <_:a5> :p <_:a5> >>",
+    @Test public void iso_triple_terms_3() { testTripleTerms("<<( <_:a4> :p <_:a4> )>>",
+                                                             "<<( <_:a5> :p <_:a5> )>>",
                                                              true ); }
 
-    @Test public void iso_triple_terms_4() { testTripleTerms("<< <_:a4> :p <_:a4> >>",
-                                                             "<< <_:a6> :p <_:b6> >>",
+    @Test public void iso_triple_terms_4() { testTripleTerms("<<( <_:a4> :p <_:a4> )>>",
+                                                             "<<( <_:a6> :p <_:b6> )>>",
                                                              false); }
 
-    @Test public void iso_triple_terms_5() { testTripleTerms("<< <_:a7> :p << <_:b7> :q :o >> >>",
-                                                             "<< <_:a8> :p << <_:b8> :q :o >> >>",
+    @Test public void iso_triple_terms_5() { testTripleTerms("<<( <_:a7> :p <<( <_:b7> :q :o )>> )>>",
+                                                             "<<( <_:a8> :p <<( <_:b8> :q :o )>> )>>",
                                                              true); }
 
-    @Test public void iso_triple_terms_6() { testTripleTerms("<< <_:a7> :p << <_:b7> :q :o >> >>",
-                                                             "<< <_:a9> :p << :s :q :o >>>>",
+    @Test public void iso_triple_terms_6() { testTripleTerms("<<( <_:a7> :p <<( <_:b7> :q :o )>> )>>",
+                                                             "<<( <_:a9> :p <<( :s :q :o )>>)>>",
                                                              false); }
 
     @Test public void iso_dsg_50() { testDSG("(graph (_:a <p> _:a)) (graph <g> (<s> <q> _:a))" ,
@@ -202,8 +201,8 @@ public class TestIsoMatcher
                                          "(graph (_:a <p> _:a)) (graph <g> (<s> <q> _:b))" ,
                                          false) ; }
 
-    @Test public void iso_dsg_52() { testDSG("(:g << << _:a :p :o >> :q1 :z1>> :q2 :z2)",
-                                             "(:g << << _:a :p :o >> :q1 :z1>> :q2 :z2)",
+    @Test public void iso_dsg_52() { testDSG("(:g <<( <<( _:a :p :o )>> :q1 :z1)>> :q2 :z2)",
+                                             "(:g <<( <<( _:a :p :o )>> :q1 :z1)>> :q2 :z2)",
                                              true); }
 
     // List based tests
diff --git a/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java b/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
index 22a68512531..920c32de258 100644
--- a/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
+++ b/jena-arq/src/test/java/org/apache/jena/system/TestRDFStarTranslation.java
@@ -68,76 +68,76 @@ private static boolean isomorphic(Graph g1, Graph g2) {
 
     @Test public void rdfx_01() {
         // One term
-        Graph graph = data("(graph (<<:s :p :o>> :q :z) (:s1 :p1 :o1) )");
+        Graph graph = data("(graph (<<(:s :p :o)>> :q :z) (:s1 :p1 :o1) )");
         testEncode(graph, 5, (g)-> G.getOnePO(g, q, z));
     }
 
     @Test public void rdfx_02() {
         // One term, used twice, subj/subj
-        Graph graph = data("(graph (<<:s :p :o>> :q :z) (<<:s :p :o>> :q2 :z2) )");
+        Graph graph = data("(graph (<<(:s :p :o)>> :q :z) (<<(:s :p :o)>> :q2 :z2) )");
         testEncode(graph, 5, (g)-> G.getOnePO(g, q, z));
     }
 
     @Test public void rdfx_03() {
         // One term, used twice, subj/obj
-        Graph graph = data("(graph (<<:s :p :o>> :q :z) (:a :q <<:s :p :o>>) )");
+        Graph graph = data("(graph (<<(:s :p :o)>> :q :z) (:a :q <<(:s :p :o)>>) )");
         testEncode(graph, 5, (g)-> G.getOnePO(g, q, z));
     }
 
     @Test public void rdfx_04() {
         // One term, used subj/obj same triple.
-        Graph graph = data("(graph (<<:s :p :o>> :q <<:s :p :o>>) (<<:s :p :o>> :q :z) )");
+        Graph graph = data("(graph (<<(:s :p :o)>> :q <<(:s :p :o)>>) (<<(:s :p :o)>> :q :z) )");
         testEncode(graph, 5, (g)-> G.getOnePO(g, q, z));
     }
 
     @Test public void rdfx_05() {
         // Two terms
-        Graph graph = data("(graph (<<:s :p :o>> :q <<:s1 :p1 :o1>>) (<<:s :p :o>> :q :z) )");
+        Graph graph = data("(graph (<<(:s :p :o)>> :q <<(:s1 :p1 :o1)>>) (<<(:s :p :o)>> :q :z) )");
         testEncode(graph, 8, (g)-> G.getOnePO(g, q, z));
     }
 
     @Test public void rdfx_10() {
         // One term
-        testEncodeDecode("(graph (<<:s :p :o>> :q :z) (:s1 :p1 :o1) )");
+        testEncodeDecode("(graph (<<(:s :p :o)>> :q :z) (:s1 :p1 :o1) )");
     }
 
     @Test public void rdfx_11() {
         // One term, used twice, subj/subj
-        testEncodeDecode("(graph (<<:s :p :o>> :q :z) (<<:s :p :o>> :q2 :z2) )");
+        testEncodeDecode("(graph (<<(:s :p :o)>> :q :z) (<<(:s :p :o)>> :q2 :z2) )");
     }
 
     @Test public void rdfx_12() {
         // One term, used twice, subj/obj
-        testEncodeDecode("(graph (<<:s :p :o>> :q :z) (:a :q <<:s :p :o>>) )");
+        testEncodeDecode("(graph (<<(:s :p :o)>> :q :z) (:a :q <<(:s :p :o)>>) )");
     }
 
     @Test public void rdfx_13() {
         // One term, used subj/obj same triple.
-        testEncodeDecode("(graph (<<:s :p :o>> :q <<:s :p :o>>) (<<:s :p :o>> :q :z) )");
+        testEncodeDecode("(graph (<<(:s :p :o)>> :q <<(:s :p :o)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_14() {
         // Two terms, used subj/obj same triple.
-        testEncodeDecode("(graph (<<:s :p :o>> :q <<:s1 :p1 :o1>>) (<<:s :p :o>> :q :z) )");
+        testEncodeDecode("(graph (<<(:s :p :o)>> :q <<(:s1 :p1 :o1)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_15() {
-        testEncodeDecode("(graph (<< <<:s :p :o>> :r :z>> :q :a) )");
+        testEncodeDecode("(graph (<<( <<(:s :p :o)>> :r :z)>> :q :a) )");
     }
 
     @Test public void rdfx_18() {
         String data = StrUtils.strjoinNL
             ("(graph"
-            ,"  (<<:s :p :o>> :q :z)"
-            ,"  (<<:s :p :o>> :r <<:s :p :o>>)"
-            ,"  (:a :q <<:s :p :o>>)"
+            ,"  (<<(:s :p :o)>> :q :z)"
+            ,"  (<<(:s :p :o)>> :r <<(:s :p :o)>>)"
+            ,"  (:a :q <<(:s :p :o)>>)"
             ,"  (:s :p :o)"
             ,")");
         testEncodeDecode(data);
     }
 
     @Test public void rdfx_19() {
-        testEncodeDecode("(graph (<< <<:s :p :o>> :r <<:s1 :p1 :o1>>>> :q <<:s :p :o>>) )");
+        testEncodeDecode("(graph (<<( <<(:s :p :o)>> :r <<(:s1 :p1 :o1)>>)>> :q <<(:s :p :o)>>) )");
     }
 
     static Graph data(String dataStr) {
@@ -210,71 +210,71 @@ private void testInPlace(String str) {
 
     @Test public void rdfx_inplace_01() {
         // One term
-        testInPlace("(graph (<<:s :p :o>> :q :z) (:s1 :p1 :o1) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (:s1 :p1 :o1) )");
     }
 
     @Test public void rdfx_inplace_02() {
         // One term, used twice, subj/subj
-        testInPlace("(graph (<<:s :p :o>> :q :z) (<<:s :p :o>> :q2 :z2) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (<<(:s :p :o)>> :q2 :z2) )");
     }
 
     @Test public void rdfx_inplace_03() {
         // One term, used twice, subj/obj
-        testInPlace("(graph (<<:s :p :o>> :q :z) (:a :q <<:s :p :o>>) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (:a :q <<(:s :p :o)>>) )");
     }
 
     @Test public void rdfx_inplace_04() {
         // One term, used subj/obj same triple.
-        testInPlace("(graph (<<:s :p :o>> :q <<:s :p :o>>) (<<:s :p :o>> :q :z) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q <<(:s :p :o)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_inplace_05() {
         // Two terms
-        testInPlace("(graph (<<:s :p :o>> :q <<:s1 :p1 :o1>>) (<<:s :p :o>> :q :z) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q <<(:s1 :p1 :o1)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_inplace_10() {
         // One term
-        testInPlace("(graph (<<:s :p :o>> :q :z) (:s1 :p1 :o1) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (:s1 :p1 :o1) )");
     }
 
     @Test public void rdfx_inplace_11() {
         // One term, used twice, subj/subj
-        testInPlace("(graph (<<:s :p :o>> :q :z) (<<:s :p :o>> :q2 :z2) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (<<(:s :p :o)>> :q2 :z2) )");
     }
 
     @Test public void rdfx_inplace_12() {
         // One term, used twice, subj/obj
-        testInPlace("(graph (<<:s :p :o>> :q :z) (:a :q <<:s :p :o>>) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q :z) (:a :q <<(:s :p :o)>>) )");
     }
 
     @Test public void rdfx_inplace_13() {
         // One term, used subj/obj same triple.
-        testInPlace("(graph (<<:s :p :o>> :q <<:s :p :o>>) (<<:s :p :o>> :q :z) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q <<(:s :p :o)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_inplace_14() {
         // Two terms, used subj/obj same triple.
-        testInPlace("(graph (<<:s :p :o>> :q <<:s1 :p1 :o1>>) (<<:s :p :o>> :q :z) )");
+        testInPlace("(graph (<<(:s :p :o)>> :q <<(:s1 :p1 :o1)>>) (<<(:s :p :o)>> :q :z) )");
     }
 
     @Test public void rdfx_inplace_15() {
-        testInPlace("(graph (<< <<:s :p :o>> :r :z>> :q :a) )");
+        testInPlace("(graph (<<( <<(:s :p :o)>> :r :z)>> :q :a) )");
     }
 
     @Test public void rdfx_inplace_18() {
         String data = StrUtils.strjoinNL
             ("(graph"
-            ,"  (<<:s :p :o>> :q :z)"
-            ,"  (<<:s :p :o>> :r <<:s :p :o>>)"
-            ,"  (:a :q <<:s :p :o>>)"
+            ,"  (<<(:s :p :o)>> :q :z)"
+            ,"  (<<(:s :p :o)>> :r <<(:s :p :o)>>)"
+            ,"  (:a :q <<(:s :p :o)>>)"
             ,"  (:s :p :o)"
             ,")");
         testInPlace(data);
     }
 
     @Test public void rdfx_inplace_19() {
-        testEncodeDecode("(graph (<< <<:s :p :o>> :r <<:s1 :p1 :o1>>>> :q <<:s :p :o>>) )");
+        testEncodeDecode("(graph (<<( <<(:s :p :o)>> :r <<(:s1 :p1 :o1)>>)>> :q <<(:s :p :o)>>) )");
     }
 }
 
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.nq
index 9ddf23b6dc0..ab79dd66382 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.nq
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.nq
@@ -1,2 +1,3 @@
 <http://example/s> <http://example.org/p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<< <http://example/s> <http://example.org/p> <http://example.org/o> >> <http://example.org/embedded> << <http://example/s> <http://example.org/p> <http://example.org/o> >> .
+<http://example/s> <http://example.org/tripleTerm> <<( <http://example/s> <http://example.org/p> <http://example.org/o> )>> .
+<http://example/s> <http://example.org/tripleTermNested> <<( <http://example/s> <http://example.org/p> <<( <http://example/s> <http://example.org/p> <http://example.org/o> )>> )>> .
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.trix
index 36e8c8a99f0..2f01c38e4e2 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-1.trix
@@ -11,16 +11,25 @@
       <typedLiteral datatype="http://www.w3.org/2001/XMLSchema#integer">123</typedLiteral>
     </triple>
     <triple>
+      <uri>http://example/s</uri>
+      <qname>ex:tripleTerm</qname>
       <triple>
         <uri>http://example/s</uri>
         <qname>ex:p</qname>
         <qname>ex:o</qname>
       </triple>
-      <qname>ex:embedded</qname>
+    </triple>
+    <triple>
+      <uri>http://example/s</uri>
+      <qname>ex:tripleTermNested</qname>
       <triple>
         <uri>http://example/s</uri>
         <qname>ex:p</qname>
-        <qname>ex:o</qname>
+        <triple>
+          <uri>http://example/s</uri>
+          <qname>ex:p</qname>
+          <qname>ex:o</qname>
+        </triple>
       </triple>
     </triple>
   </graph>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.nq
index 9ddf23b6dc0..ab79dd66382 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.nq
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.nq
@@ -1,2 +1,3 @@
 <http://example/s> <http://example.org/p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<< <http://example/s> <http://example.org/p> <http://example.org/o> >> <http://example.org/embedded> << <http://example/s> <http://example.org/p> <http://example.org/o> >> .
+<http://example/s> <http://example.org/tripleTerm> <<( <http://example/s> <http://example.org/p> <http://example.org/o> )>> .
+<http://example/s> <http://example.org/tripleTermNested> <<( <http://example/s> <http://example.org/p> <<( <http://example/s> <http://example.org/p> <http://example.org/o> )>> )>> .
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.trix
index 26d00ace49a..4a207260f45 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-ns-2.trix
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Trix with namespaces -->
 <trix:trix xmlns:trix="http://www.w3.org/2004/03/trix/trix-1/"
-           xmlns:ex="http://example.org/"
-           xmlns="http://example/">
+      xmlns:ex="http://example.org/"
+      xmlns:ns="http://example/ns#"
+      xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
   <trix:graph>
     <trix:triple>
-      <trix:qname>:s</trix:qname>
+      <trix:uri>http://example/s</trix:uri>
       <trix:qname>ex:p</trix:qname>
       <trix:typedLiteral datatype="http://www.w3.org/2001/XMLSchema#integer">123</trix:typedLiteral>
     </trix:triple>
     <trix:triple>
+      <trix:uri>http://example/s</trix:uri>
+      <trix:qname>ex:tripleTerm</trix:qname>
       <trix:triple>
-        <trix:qname>:s</trix:qname>
+        <trix:uri>http://example/s</trix:uri>
         <trix:qname>ex:p</trix:qname>
         <trix:qname>ex:o</trix:qname>
       </trix:triple>
-      <trix:qname>ex:embedded</trix:qname>
+    </trix:triple>
+    <trix:triple>
+      <trix:uri>http://example/s</trix:uri>
+      <trix:qname>ex:tripleTermNested</trix:qname>
       <trix:triple>
-        <trix:qname>:s</trix:qname>
+        <trix:uri>http://example/s</trix:uri>
         <trix:qname>ex:p</trix:qname>
-        <trix:qname>ex:o</trix:qname>
+        <trix:triple>
+          <trix:uri>http://example/s</trix:uri>
+          <trix:qname>ex:p</trix:qname>
+          <trix:qname>ex:o</trix:qname>
+        </trix:triple>
       </trix:triple>
     </trix:triple>
   </trix:graph>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.nq
index 4c2729bfffb..f508e59621f 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.nq
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.nq
@@ -1,2 +1 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/subjectEmbedded> <http://example/o> .
-<http://example/s> <http://example/objectEmbedded> << <http://example/s> <http://example/p> <http://example/o> >> .
+<http://example/s> <http://example/tripleTerm> <<( <http://example/s> <http://example/p> <http://example/o> )>> .
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.trix
index b0631fc5306..9385adc9872 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-1.trix
@@ -1,17 +1,8 @@
 <trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
-  <graph>
-    <triple>
-      <triple>
-        <uri>http://example/s</uri>
-        <uri>http://example/p</uri>
-        <uri>http://example/o</uri>
-      </triple>
-      <uri>http://example/subjectEmbedded</uri>
-      <uri>http://example/o</uri>
-    </triple>
+  <graph> 
     <triple>
       <uri>http://example/s</uri>
-      <uri>http://example/objectEmbedded</uri>
+      <uri>http://example/tripleTerm</uri>
       <triple>
         <uri>http://example/s</uri>
         <uri>http://example/p</uri>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.nq
index 37493023781..e98bb206209 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.nq
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.nq
@@ -1,4 +1 @@
-<http://example/rightNestObj> <http://example/right> << <http://example/s> <http://example/p> << <http://example/s1> <http://example/p1> <http://example/o1> >> >> .
-<http://example/leftNestObj> <http://example/left> << << <http://example/s2> <http://example/p2> <http://example/o2> >> <http://example/p> <http://example/o> >> .
-<< <http://example/s> <http://example/p> << <http://example/s1> <http://example/p1> <http://example/o1> >> >> <http://example/right> <http://example/rightNestSubject> <http://example.org/g> .
-<< << <http://example/s2> <http://example/p2> <http://example/o2> >> <http://example/p> <http://example/o> >> <http://example/left> <http://example/leftNestSubject> <http://example.org/g> .
+<http://example/s> <http://example/tripleTermNested> <<( <http://example/s1> <http://example/p1> <<( <http://example/s2> <http://example/p2> <http://example/o2> )>> )>> <http://example.org/g> .
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.trix
index 988c8845064..0d85ff8d9bc 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-2.trix
@@ -1,62 +1,18 @@
 <trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
-
-  <graph>
-    <triple>
-      <uri>http://example/rightNestObj</uri>
-      <uri>http://example/right</uri>
-      <triple>
-        <uri>http://example/s</uri>
-        <uri>http://example/p</uri>
-        <triple>
-          <uri>http://example/s1</uri>
-          <uri>http://example/p1</uri>
-          <uri>http://example/o1</uri>
-        </triple>
-      </triple>
-    </triple>
-    <triple>
-      <uri>http://example/leftNestObj</uri>
-      <uri>http://example/left</uri>
-      <triple>
-        <triple>
-          <uri>http://example/s2</uri>
-          <uri>http://example/p2</uri>
-          <uri>http://example/o2</uri>
-        </triple>
-        <uri>http://example/p</uri>
-        <uri>http://example/o</uri>
-      </triple>
-    </triple>
-  </graph>
-  
   <graph>
     <uri>http://example.org/g</uri>
     <triple>
+      <uri>http://example/s</uri>
+      <uri>http://example/tripleTermNested</uri>
       <triple>
-        <uri>http://example/s</uri>
-        <uri>http://example/p</uri>
-        <triple>
-          <uri>http://example/s1</uri>
-          <uri>http://example/p1</uri>
-          <uri>http://example/o1</uri>
-        </triple>
-      </triple>
-      <uri>http://example/right</uri>
-      <uri>http://example/rightNestSubject</uri>
-    </triple>
-    <triple>
-      <triple>
+        <uri>http://example/s1</uri>
+        <uri>http://example/p1</uri>
         <triple>
           <uri>http://example/s2</uri>
           <uri>http://example/p2</uri>
           <uri>http://example/o2</uri>
         </triple>
-        <uri>http://example/p</uri>
-        <uri>http://example/o</uri>
       </triple>
-      <uri>http://example/left</uri>
-      <uri>http://example/leftNestSubject</uri>
     </triple>
   </graph>
-  
 </trix>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-1.trix
deleted file mode 100644
index 222742f135b..00000000000
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-1.trix
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- Too many terms -->
-<trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
-  <graph>
-    <triple>
-      <triple>
-        <triple>
-          <uri>http://example/EX-1</uri>
-          <uri>http://example/EX-2</uri>
-          <uri>http://example/EX-3</uri>
-          <uri>http://example/EX-4</uri>
-          <uri>http://example/EX-5</uri>
-        </triple>
-        <uri>http://example/p</uri>
-        <uri>http://example/o2</uri>
-      </triple>
-      <uri>http://example/p</uri>
-      <uri>http://example/o1</uri>
-    </triple>
-  </graph>
-</trix>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-2.trix
deleted file mode 100644
index c3f26f65749..00000000000
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-2.trix
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- Too few terms -->
-<trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
-  <graph>
-    <triple>
-      <triple>
-        <triple>
-          <uri>http://example/EX-1</uri>
-        </triple>
-        <uri>http://example/p</uri>
-        <uri>http://example/o2</uri>
-      </triple>
-      <uri>http://example/p</uri>
-      <uri>http://example/o1</uri>
-    </triple>
-  </graph>
-</trix>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-3.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-3.trix
deleted file mode 100644
index f8687a614a7..00000000000
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-nested-3.trix
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- Intermediate too many terms -->
-<trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
-  <graph>
-    <triple>
-      <triple>
-        <triple>
-          <uri>http://example/s</uri>
-          <uri>http://example/p</uri>
-          <uri>http://example/o</uri>
-        </triple>
-        <uri>http://example/P1</uri>
-        <uri>http://example/P2</uri>
-        <uri>http://example/o2</uri>
-      </triple>
-      <uri>http://example/p</uri>
-      <uri>http://example/o1</uri>
-    </triple>
-  </graph>
-</trix>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-asserted-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-1.trix
similarity index 100%
rename from jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-asserted-1.trix
rename to jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-1.trix
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-asserted-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-2.trix
similarity index 100%
rename from jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-asserted-2.trix
rename to jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-2.trix
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-3.trix
similarity index 51%
rename from jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-1.trix
rename to jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-3.trix
index a7e66f0864e..f676211df19 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-1.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-3.trix
@@ -3,13 +3,12 @@
   <graph>
     <triple>
       <triple>
-        <uri>http://example/EX-1</uri>
-        <uri>http://example/EX-2</uri>
-        <uri>http://example/EX-3</uri>
-        <uri>http://example/EX-4</uri>
+        <uri>http://example/s1</uri>
+        <uri>http://example/p1</uri>
+        <uri>http://example/o1</uri>
       </triple>
       <uri>http://example/p</uri>
-      <uri>http://example/o1</uri>
+      <uri>http://example/o</uri>
     </triple>
   </graph>
 </trix>
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-4.trix
similarity index 51%
rename from jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-2.trix
rename to jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-4.trix
index 3237f7b93eb..084d5ae8878 100644
--- a/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-emb-2.trix
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-star-bad-triple-term-4.trix
@@ -2,16 +2,17 @@
 <trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
   <graph>
     <triple>
+      <uri>http://example/s</uri>
+      <uri>http://example/p</uri>
       <triple>
         <triple>
-          <uri>http://example/EX-1</uri>
-          <uri>http://example/EX-2</uri>
+          <uri>http://example/s2</uri>
+          <uri>http://example/p2</uri>
+          <uri>http://example/o2</uri>
         </triple>
-        <uri>http://example/p</uri>
-        <uri>http://example/o2</uri>
+	      <uri>http://example/p1</uri>
+	      <uri>http://example/o1</uri>
       </triple>
-      <uri>http://example/p</uri>
-      <uri>http://example/o1</uri>
     </triple>
   </graph>
 </trix>
diff --git a/jena-arq/testing/rdf-star-cg/manifest.ttl b/jena-arq/testing/rdf-star-cg/manifest.ttl
deleted file mode 100644
index ce59ab01244..00000000000
--- a/jena-arq/testing/rdf-star-cg/manifest.ttl
+++ /dev/null
@@ -1,33 +0,0 @@
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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#>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-  rdfs:label "RDF-star test suite"@en ;
-  skos:prefLabel "La suite des tests pour RDF-star"@fr;
-  skos:prefLabel "Conjunto de pruebas para RDF-star"@es;
-  dct:issued "2021-06-21"^^xsd:date ;
-  rdfs:seeAlso <https://w3c.github.io/rdf-tests/> ;
-  dct:modified "2021-07-18"^^xsd:date ;
-  dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-  dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    mf:include (
-      <nt/syntax/manifest.ttl>
-      ### <semantics/manifest.ttl>
-      <sparql/eval/manifest.ttl>
-      <sparql/syntax/manifest.ttl>
-      <trig/eval/manifest.ttl>
-      <trig/syntax/manifest.ttl>
-      <turtle/eval/manifest.ttl>
-      <turtle/syntax/manifest.ttl>
-    ) .
-
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/manifest.ttl b/jena-arq/testing/rdf-star-cg/nt/syntax/manifest.ttl
deleted file mode 100644
index d03fd67d97d..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/manifest.ttl
+++ /dev/null
@@ -1,112 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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#>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/nt/syntax#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:    <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-   rdfs:label "N-Triples-star Syntax Tests"@en ;
-   skos:prefLabel "La suite des tests pour N-Triples-star"@fr;
-   skos:prefLabel "Conjunto de pruebas para N-Triples-star"@es;
-   dct:issued "2021-06-21"^^xsd:date ;
-   dct:modified "2021-07-18"^^xsd:date ;
-   dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-   dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-   rdfs:seeAlso <README>;
-    mf:entries
-    (
-        trs:ntriples-star-1
-        trs:ntriples-star-2
-        trs:ntriples-star-3
-        trs:ntriples-star-4
-        trs:ntriples-star-5
-
-        trs:ntriples-star-bnode-1
-        trs:ntriples-star-bnode-2
-
-        trs:ntriples-star-nested-1
-        trs:ntriples-star-nested-2
-
-        trs:ntriples-star-bad-1
-        trs:ntriples-star-bad-2
-        trs:ntriples-star-bad-3
-        trs:ntriples-star-bad-4
-    ) .
-
-trs:ntriples-star-1 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - subject quoted triple" ;
-   mf:action    <ntriples-star-syntax-1.nt> ;
-   .
-
-trs:ntriples-star-2 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - object quoted triple" ;
-   mf:action    <ntriples-star-syntax-2.nt> ;
-   .
-
-trs:ntriples-star-3 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - subject and object quoted triples" ;
-   mf:action    <ntriples-star-syntax-3.nt> ;
-   .
-
-trs:ntriples-star-4 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - whitespace and terms" ;
-   mf:action    <ntriples-star-syntax-4.nt> ;
-   .
-
-trs:ntriples-star-5 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - Nested, no whitespace" ;
-   mf:action    <ntriples-star-syntax-5.nt> ;
-   .
-
-# Blank nodes
-
-trs:ntriples-star-bnode-1 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - Blank node subject" ;
-   mf:action    <ntriples-star-bnode-1.nt> ;
-   .
-
-trs:ntriples-star-bnode-2 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - Blank node object" ;
-   mf:action    <ntriples-star-bnode-2.nt> ;
-   .
-
-trs:ntriples-star-nested-1 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - Nested subject term" ;
-   mf:action    <ntriples-star-nested-1.nt> ;
-   .
-
-trs:ntriples-star-nested-2 rdf:type rdft:TestNTriplesPositiveSyntax ;
-   mf:name      "N-Triples-star - Nested object term" ;
-   mf:action    <ntriples-star-nested-2.nt> ;
-   .
-
-## Bad syntax
-
-trs:ntriples-star-bad-1 rdf:type rdft:TestNTriplesNegativeSyntax ;
-    mf:name      "N-Triples-star - Bad - quoted triple as predicate" ;
-    mf:action    <ntriples-star-bad-syntax-1.nt> ;
-    .
-
-trs:ntriples-star-bad-2 rdf:type rdft:TestNTriplesNegativeSyntax ;
-    mf:name      "N-Triples-star - Bad - quoted triple, literal subject" ;
-    mf:action    <ntriples-star-bad-syntax-2.nt> ;
-    .
-
-trs:ntriples-star-bad-3 rdf:type rdft:TestNTriplesNegativeSyntax ;
-    mf:name      "N-Triples-star - Bad - quoted triple, literal predicate" ;
-    mf:action    <ntriples-star-bad-syntax-3.nt> ;
-    .
-
-trs:ntriples-star-bad-4 rdf:type rdft:TestNTriplesNegativeSyntax ;
-    mf:name      "N-Triples-star - Bad - quoted triple, blank node predicate" ;
-    mf:action    <ntriples-star-bad-syntax-4.nt> ;
-    .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-1.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-1.nt
deleted file mode 100644
index 401f4b86147..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-1.nt
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/a> << <http://example/s> <http://example/p>  <http://example/o> >>  <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-2.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-2.nt
deleted file mode 100644
index 1e47b360026..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-2.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< "XYZ" <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-3.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-3.nt
deleted file mode 100644
index eaeb6f2a598..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-3.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> "XYZ" <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-4.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-4.nt
deleted file mode 100644
index af41d206413..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bad-syntax-4.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> _:label <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-1.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-1.nt
deleted file mode 100644
index 2d94448ce1a..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-1.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-_:b0 <http://example/p> <http://example/o> .
-<< _:b0 <http://example/p> <http://example/o> >> <http://example/q> "ABC" .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-2.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-2.nt
deleted file mode 100644
index 2dc337a9326..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-bnode-2.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> _:b1 .
-<< <http://example/s> <http://example/p> _:b1 >> <http://example/q> "456"^^<http://www.w3.org/2001/XMLSchema#integer> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-1.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-1.nt
deleted file mode 100644
index d6a50cbee9f..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-1.nt
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> .
-<< << <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> >> <http://example/q> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-2.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-2.nt
deleted file mode 100644
index 7a8d3131ba1..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-nested-2.nt
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> .
-<< <http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> >> <http://example/r> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-1.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-1.nt
deleted file mode 100644
index 7f2be99c35e..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-1.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-2.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-2.nt
deleted file mode 100644
index 5aa2cb20018..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-2.nt
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/x> <http://example/p> << <http://example/s> <http://example/p> <http://example/o> >> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-3.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-3.nt
deleted file mode 100644
index 16b9420af3d..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-3.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s1> <http://example/p1> <http://example/o1> >> <http://example/q> << <http://example/s2> <http://example/p2> <http://example/o2> >> .
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-4.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-4.nt
deleted file mode 100644
index 6dc18c359bf..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-4.nt
+++ /dev/null
@@ -1 +0,0 @@
-<<<http://example/s1><http://example/p1><http://example/o1>>><http://example/q><<<http://example/s2><http://example/p2><http://example/o2>>>.
diff --git a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-5.nt b/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-5.nt
deleted file mode 100644
index 041b857392b..00000000000
--- a/jena-arq/testing/rdf-star-cg/nt/syntax/ntriples-star-syntax-5.nt
+++ /dev/null
@@ -1 +0,0 @@
-<<<<<http://example/s1><http://example/p1><http://example/o1>>><http://example/q1><<<http://example/s2><http://example/p2><http://example/o2>>>>><http://example/q2><<<<<http://example/s3><http://example/p3><http://example/o3>>><http://example/q3><<<http://example/s4><http://example/p4><http://example/o4>>>>>.
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-0.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-0.ttl
deleted file mode 100644
index a5aa81eb29e..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-0.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-PREFIX : <http://example/>
-
-<<:a :b :c>> :q :z .
-:a :q <<:a :b :c>> .
-
-:f :g << <<:x1 :y1 123 >> :p :o >> .
-
-:f :g << :s :p <<:x2 :y3 123 >> >> .
-
-<< :s1 :p1 :o1 >> :q << :s1 :p1 :o1 >> .
-
-:a :b :c {| :q1 :z1 |} .
-
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-2.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-2.ttl
deleted file mode 100644
index 0c9b126d404..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-2.ttl
+++ /dev/null
@@ -1,16 +0,0 @@
-PREFIX :       <http://example/>
-
-:s :p1 :o .
-<<:s :p1 :o>> :q :z .
-
-# pattern-3
-:a1 :b <<:s :p1 :o>>  .
-<<:s :p1 :o>> :b :a2 .
-
-# pattern-5
-:s :p2 :o .
-<<:s :p2 :o>> :sym <<:s :p2 :o>> .
-
-# pattern-6
-<<:s :p2 :o>> :p3 :z .
-<< <<:s :p2 :o>> :p3 :z >> :q :o .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-3.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-3.ttl
deleted file mode 100644
index 1bb5863d3ca..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-3.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:a :b :c {| :q :z |} .
-:s :p :o .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-4.trig b/jena-arq/testing/rdf-star-cg/sparql/eval/data-4.trig
deleted file mode 100644
index 1ec9eed402f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-4.trig
+++ /dev/null
@@ -1,13 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o1 .
-
-GRAPH :g {
-     <<:s :p :o1 >> :q1 :z1 .
-     <<:s :p :o2 >> :q2 :z2 .
-}
-
-GRAPH :g1 { _:b :r :o3 . _:b :r :o4 . }
-
-GRAPH :g2 { << _:b :r :o3 >> :pb "abc" . }
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-5.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-5.ttl
deleted file mode 100644
index c5bc4b592f0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-5.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :       <http://example/>
-
-<<:s1 :p :o>> :q :z .
-<<:s2 :p :o>> :p "same-p" .
-<<:s3 :p :o>> : "same-p" .
-
-
-:z1 :q << :s1 :p :o >> .
-:z2 :p << :s2 :p :o >> .
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-6.trig b/jena-arq/testing/rdf-star-cg/sparql/eval/data-6.trig
deleted file mode 100644
index cff131d415b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-6.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX :       <http://example/>
-
-GRAPH :g1 { :s1 :p1 :o1 }
-GRAPH :g2 { :s2 :p2 :o2 }
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-7.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-7.ttl
deleted file mode 100644
index 92efa10dc1f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-7.ttl
+++ /dev/null
@@ -1,24 +0,0 @@
-PREFIX : <http://example/>
-
-:x1 :left  << :a :b 123 >> .
-:x1 :right << :a :b 123.0 >> .
-
-:x2 :left  << :a :b 123 >> .
-:x2 :right << :a :b 123 >> .
-
-:x3 :left  << << :a :b 123 >> :q 999 >> .
-:x3 :right << << :a :b 123.0 >> :q 999 >> .
-
-:x4 :left  << :a :b 123 >> .
-:x4 :right << :c :d 123 >> .
-
-:x5 :left  << _:bnode1 :b 123 >> .
-:x5 :right << _:bnode1 :b 123 >> .
-
-:x6 :left  << _:bnode2 :b 123e0 >> .
-:x6 :right << _:bnode2 :b 123 >> .
-
-:x7 :left  << :a :b 9 >> .
-:x7 :right << :a :b 123 >> .
-
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-order-kind.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-order-kind.ttl
deleted file mode 100644
index 80174f090e3..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-order-kind.ttl
+++ /dev/null
@@ -1,18 +0,0 @@
-PREFIX : <http://example/>
-
-# The different kinds of orderable items.
-# (Not in collation order).
-
-:item :p :x .
-
-:item :p << :s :p :o >> .
-
-:item :p "abc" .
-
-:item :p _:b .
-
-##     (Lowest) no value assigned to the variable or expression in this solution.
-##     Blank nodes
-##     IRIs
-##     RDF literals
-##     RDF-star embedded triple terms
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-order.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/data-order.ttl
deleted file mode 100644
index 6b7bc8fd0fa..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-order.ttl
+++ /dev/null
@@ -1,26 +0,0 @@
-PREFIX :        <http://example.com/>
-
-# Items that can be ordered
-# The test query deals with up to 20 items.
-# The integer in the subject does not correspond to expected order.
-
-:s-01 :p <<:s :p 123>> .
-:s-02 :p <<:s :p -456>> .
-
-:s-03 :p _:blank-node .
-
-:s-04 :p <<:s2 :p 900>> .
-:s-05 :p <<:s1 :p 999>> .
-:s-06 :p <<:s1 :a 999>> .
-
-:s-07  :p "string" .
-
-:s-08 :p << <<:x :y :z >> :q :r >> .
-:s-09 :p << :s :p <<:x :y :z>> >> .
-:s-10 :p << <<:x :y :z>> :q <<:x :y :z>> >> .
-
-:s-11 :p << <<:s1 :a :o>> :q :r >> .
-
-:s-12 :p <http://host/entity> .
-
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/empty.nq b/jena-arq/testing/rdf-star-cg/sparql/eval/empty.nq
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl
deleted file mode 100644
index 0eddb48515f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl
+++ /dev/null
@@ -1,366 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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 qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#>
-PREFIX ut:     <http://www.w3.org/2009/sparql/tests/test-update#>
-PREFIX dawgt:  <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#>
-PREFIX test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/sparql/eval#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:    <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-    rdfs:label "SPARQL-star Evaluation Tests"@en ;
-    skos:prefLabel "La suite des tests d'évaluation de SPARQL-star"@fr;
-    skos:prefLabel "Conjunto de pruebas para evaluar SPARQL-star"@es;
-    dct:issued "2021-06-21"^^xsd:date ;
-    dct:modified "2021-07-18"^^xsd:date ;
-    dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-    dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    rdfs:seeAlso <README>;
-    mf:entries
-    (
-        trs:sparql-star-results-1j
-        trs:sparql-star-results-1x
-
-        trs:sparql-star-basic-2
-        trs:sparql-star-basic-3
-        trs:sparql-star-basic-4
-        trs:sparql-star-basic-5
-        trs:sparql-star-basic-6
-
-        trs:sparql-star-pattern-1
-        trs:sparql-star-pattern-2
-        trs:sparql-star-pattern-3
-        trs:sparql-star-pattern-4
-        trs:sparql-star-pattern-5
-        trs:sparql-star-pattern-6
-        trs:sparql-star-pattern-7
-        trs:sparql-star-pattern-8
-        trs:sparql-star-pattern-9
-
-        trs:sparql-star-construct-1
-        trs:sparql-star-construct-2
-        trs:sparql-star-construct-3
-        trs:sparql-star-construct-4
-        trs:sparql-star-construct-5
-
-        trs:sparql-star-graphs-1
-        trs:sparql-star-graphs-2
-
-        trs:sparql-star-expr-1
-        trs:sparql-star-expr-2
-
-        trs:sparql-star-op-1
-        trs:sparql-star-op-2
-        trs:sparql-star-op-3
-        trs:sparql-star-op-4
-
-        trs:sparql-star-order-1
-        trs:sparql-star-order-2
-
-        trs:sparql-star-update-1
-        trs:sparql-star-update-2
-        trs:sparql-star-update-3
-) .
-
-trs:sparql-star-results-1j rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - all graph triples (JSON results)" ;
-    mf:action [
-       qt:query  <sparql-star-results-1.rq> ;
-       qt:data   <data-0.ttl>
-    ] ;
-    mf:result  <sparql-star-results-1.srj>
-    .
-
-trs:sparql-star-results-1x rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - all graph triples (XML results)" ;
-    mf:action [
-       qt:query  <sparql-star-results-1.rq> ;
-       qt:data   <data-0.ttl>
-    ] ;
-    mf:result  <sparql-star-results-1.srx>
-    .
-
-trs:sparql-star-basic-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - match constant quoted triple" ;
-    mf:action [
-       qt:query  <sparql-star-basic-2.rq> ;
-       qt:data   <data-1.ttl>
-    ] ;
-    mf:result  <sparql-star-basic-2.srj>
-    .
-
-trs:sparql-star-basic-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - match quoted triple, var subject" ;
-    mf:action [
-       qt:query  <sparql-star-basic-3.rq> ;
-       qt:data   <data-1.ttl>
-    ] ;
-    mf:result  <sparql-star-basic-3.srj>
-    .
-
-trs:sparql-star-basic-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - match quoted triple, var predicate" ;
-    mf:action [
-       qt:query  <sparql-star-basic-4.rq> ;
-       qt:data   <data-1.ttl>
-    ] ;
-    mf:result  <sparql-star-basic-4.srj>
-    .
-
-trs:sparql-star-basic-5 rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - match quoted triple, var object" ;
-    mf:action [
-       qt:query  <sparql-star-basic-5.rq> ;
-       qt:data   <data-1.ttl>
-    ] ;
-    mf:result  <sparql-star-basic-5.srj>
-    .
-
-trs:sparql-star-basic-6 rdf:type mf:QueryEvaluationTest ;
-    mf:name      "SPARQL-star - no match of quoted triple" ;
-    mf:action [
-       qt:query  <sparql-star-basic-6.rq> ;
-       qt:data   <data-1.ttl>
-    ] ;
-    mf:result  <sparql-star-basic-6.srj>
-    .
-
-trs:sparql-star-pattern-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Asserted and quoted triple" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-01.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-01.srj>
-    .
-
-trs:sparql-star-pattern-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star -  Asserted and quoted triple" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-02.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-02.srj>
-    .
-
-trs:sparql-star-pattern-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - Variable for quoted triple" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-03.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-03.srj>
-    .
-
-trs:sparql-star-pattern-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - No match" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-04.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-04.srj>
-    .
-
-trs:sparql-star-pattern-5 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - match variables in triple terms" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-05.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-05.srj>
-    .
-
-trs:sparql-star-pattern-6 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - Nesting 1" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-06.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-06.srj>
-    .
-
-trs:sparql-star-pattern-7 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - Nesting - 2" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-07.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-07.srj>
-    .
-
-trs:sparql-star-pattern-8 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - Match and nesting" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-08.rq> ;
-          qt:data   <data-2.ttl> ] ;
-    mf:result  <sparql-star-pattern-08.srj>
-    .
-
-trs:sparql-star-pattern-9 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Pattern - Same variable" ;
-    mf:action
-        [ qt:query  <sparql-star-pattern-09.rq> ;
-          qt:data   <data-5.ttl> ] ;
-    mf:result  <sparql-star-pattern-09.srj>
-    .
-
-## CONSTRUCT
-
-trs:sparql-star-construct-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - CONSTRUCT with constant template" ;
-    mf:action
-        [ qt:query  <sparql-star-construct-1.rq> ;
-          qt:data   <data-3.ttl> ] ;
-    mf:result  <sparql-star-construct-1.ttl> ;
-.
-
-trs:sparql-star-construct-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - CONSTRUCT WHERE with constant template" ;
-    mf:action
-        [ qt:query  <sparql-star-construct-2.rq> ;
-          qt:data   <data-3.ttl> ] ;
-    mf:result  <sparql-star-construct-2.ttl> ;
-.
-
-trs:sparql-star-construct-3 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - CONSTRUCT - about every triple" ;
-    mf:action
-        [ qt:query  <sparql-star-construct-3.rq> ;
-          qt:data   <data-3.ttl> ] ;
-    mf:result  <sparql-star-construct-3.ttl> ;
-.
-
-trs:sparql-star-construct-4 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - CONSTRUCT with annotation syntax" ;
-    mf:action
-        [ qt:query  <sparql-star-construct-4.rq> ;
-          qt:data   <data-3.ttl> ] ;
-    mf:result  <sparql-star-construct-4.ttl> ;
-.
-
-trs:sparql-star-construct-5 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - CONSTRUCT WHERE with annotation syntax" ;
-    mf:action
-        [ qt:query  <sparql-star-construct-5.rq> ;
-          qt:data   <data-3.ttl> ] ;
-    mf:result  <sparql-star-construct-5.ttl> ;
-    .
-
-trs:sparql-star-graphs-1 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - GRAPH" ;
-    mf:action
-        [ qt:query  <sparql-star-graphs-1.rq> ;
-          qt:data   <data-4.trig> ] ;
-    mf:result  <sparql-star-graphs-1.srj> ;
-    .
-
-trs:sparql-star-graphs-2 rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - GRAPHs with blank node" ;
-    mf:action
-        [ qt:query  <sparql-star-graphs-2.rq> ;
-          qt:data   <data-4.trig> ] ;
-    mf:result  <sparql-star-graphs-2.srj> ;
-    .
-
-## Expressions
-
-trs:sparql-star-expr-1  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - BIND - CONSTRUCT" ;
-    mf:action
-        [ qt:query  <sparql-star-expr-01.rq> ;
-          qt:data   <data-4.trig> ] ;
-    mf:result  <sparql-star-expr-01.ttl> ;
-    .
-
-trs:sparql-star-expr-2  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - Functions" ;
-    mf:action
-        [ qt:query  <sparql-star-expr-02.rq> ;
-          qt:data   <empty.nq> ] ;
-    mf:result  <sparql-star-expr-02.srj> ;
-    .
-
-## Operators
-
-trs:sparql-star-op-1  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - sameTerm" ;
-    mf:action
-        [ qt:query  <sparql-star-op-1.rq> ;
-          qt:data   <data-7.ttl> ] ;
-    mf:result  <sparql-star-op-1.srj> ;
-    .
-
-trs:sparql-star-op-2  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - value-equality" ;
-    mf:action
-        [ qt:query  <sparql-star-op-2.rq> ;
-          qt:data   <data-7.ttl> ] ;
-    mf:result  <sparql-star-op-2.srj> ;
-    .
-
-trs:sparql-star-op-3  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - value-inequality" ;
-    mf:action
-        [ qt:query  <sparql-star-op-3.rq> ;
-          qt:data   <data-7.ttl> ] ;
-    mf:result  <sparql-star-op-3.srj> ;
-    .
-
-trs:sparql-star-op-4  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - value-inequality" ;
-    mf:action
-        [ qt:query  <sparql-star-op-4.rq> ;
-          qt:data   <data-7.ttl> ] ;
-    mf:result  <sparql-star-op-4.srj> ;
-    .
-
-## ORDER BY
-## These use the same query on different data.
-
-trs:sparql-star-order-1  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - ORDER BY" ;
-    mf:action
-        [ qt:query  <sparql-star-order-by.rq> ;
-          qt:data   <data-order-kind.ttl> ] ;
-    mf:result  <sparql-star-order-1.srj> ;
-    .
-
-trs:sparql-star-order-2  rdf:type mf:QueryEvaluationTest ;
-    mf:name    "SPARQL-star - Embedded triple - ordering" ;
-    mf:action
-        [ qt:query  <sparql-star-order-by.rq> ;
-          qt:data   <data-order.ttl> ] ;
-    mf:result  <sparql-star-order-2.srj> ;
-    .
-
-## Update
-
-
-trs:sparql-star-update-1 rdf:type mf:UpdateEvaluationTest ;
-    mf:name    "SPARQL-star - Update" ;
-    mf:action [ ut:request <sparql-star-update-1.ru> ;
-                ut:data <data-6.trig>
-              ] ;
-    mf:result [ ut:data <update-result-1.trig>
-              ] ;
-    .
-
-trs:sparql-star-update-2 rdf:type mf:UpdateEvaluationTest ;
-    mf:name    "SPARQL-star - Update - annotation" ;
-    mf:action [ ut:request <sparql-star-update-2.ru> ;
-                ut:data <data-6.trig>
-              ] ;
-    mf:result [ ut:data <update-result-2.trig>
-              ] ;
-    .
-
-trs:sparql-star-update-3 rdf:type mf:UpdateEvaluationTest ;
-    mf:name    "SPARQL-star - Update - data" ;
-    mf:action [ ut:request <sparql-star-update-3.ru> ;
-                ut:data <empty.nq>
-              ] ;
-    mf:result [ ut:data <update-result-3.trig>
-              ] ;
-    .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.rq
deleted file mode 100644
index 984173a3024..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    <<:a :b :c>> ?p ?o
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.srj
deleted file mode 100644
index 19d55c3ead3..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-2.srj
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "head": {
-    "vars": [ "p" , "o" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "p": { "type": "uri" , "value": "http://example/q" } ,
-        "o": { "type": "uri" , "value": "http://example/z" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.rq
deleted file mode 100644
index cbaca5a4286..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    <<?s :b :c>> ?p ?o
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.srj
deleted file mode 100644
index 04aef0a7168..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-3.srj
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" , "o" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "uri" , "value": "http://example/a" } ,
-        "p": { "type": "uri" , "value": "http://example/q" } ,
-        "o": { "type": "uri" , "value": "http://example/z" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.rq
deleted file mode 100644
index 104cc55c4b7..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    <<:a ?p :c>> ?q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.srj
deleted file mode 100644
index 4f05066e9b0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-4.srj
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "head": {
-    "vars": [ "p" , "q" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "p": { "type": "uri" , "value": "http://example/b" } ,
-        "q": { "type": "uri" , "value": "http://example/q" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.rq
deleted file mode 100644
index 0233890f3ce..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    <<:a :b ?o>> ?q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.srj
deleted file mode 100644
index 8f4c5fd447e..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-5.srj
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "head": {
-    "vars": [ "o" , "q" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "o": { "type": "uri" , "value": "http://example/c" } ,
-        "q": { "type": "uri" , "value": "http://example/q" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.rq
deleted file mode 100644
index 5f3d96ae975..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    <<?a ?b :nomatch >> ?q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.srj
deleted file mode 100644
index bc485347fcd..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-basic-6.srj
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "head": {
-    "vars": [ "a" , "b" , "q" ]
-  } ,
-  "results": {
-    "bindings": [
-      
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.rq
deleted file mode 100644
index 07f7ca1228c..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-CONSTRUCT {
-  <<:a :b :c >> :q :z .
-} WHERE { }
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.ttl
deleted file mode 100644
index 235f28fea38..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :      <http://example/>
-
-<< :a :b :c >>  :q  :z .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.rq
deleted file mode 100644
index 5003aeabb33..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-CONSTRUCT WHERE {
-  <<:a :b :c >> :q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.ttl
deleted file mode 100644
index 235f28fea38..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-2.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :      <http://example/>
-
-<< :a :b :c >>  :q  :z .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.rq
deleted file mode 100644
index 1bbf99b1e2e..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-CONSTRUCT {
-   << ?s ?p ?o >> :source :ABC .
-} WHERE {
-   ?s ?p ?o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.ttl
deleted file mode 100644
index f24da01d6fb..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-3.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX :      <http://example/>
-
-<< << :a :b :c >> :q :z >>
-        :source  :ABC .
-
-<< :a :b :c >>  :source  :ABC .
-
-<< :s :p :o >>  :source  :ABC .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.rq
deleted file mode 100644
index 77727062c05..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-CONSTRUCT {
-   :a :b ?c {| :source :ABC |} .
-} WHERE {
-   :a :b ?c .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.ttl
deleted file mode 100644
index 3b7ff0b5f7b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-4.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :      <http://example/>
-
-:a      :b      :c .
-
-<< :a :b :c >>  :source  :ABC .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.rq
deleted file mode 100644
index 17fa8ef348e..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-CONSTRUCT WHERE {
-   :a :b ?c {| ?q ?z |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.ttl
deleted file mode 100644
index 3ed186d9c2a..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-construct-5.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :      <http://example/>
-
-:a      :b      :c .
-
-<< :a :b :c >>  :q  :z .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.rq
deleted file mode 100644
index 570672fbe8f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example/>
-
-CONSTRUCT {
-  ?t :graph ?g .
-} WHERE {
-  GRAPH ?g {
-    ?s ?p ?o .
-    BIND(<<?s ?p  ?o>> AS ?t)
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.ttl b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.ttl
deleted file mode 100644
index fedeb98618e..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-01.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-PREFIX :      <http://example/>
-
-<< << :s :p :o2 >> :q2 :z2 >>
-        :graph  :g .
-
-<< _:b0 :r :o4 >>  :graph  :g1 .
-
-<< _:b0 :r :o3 >>  :graph  :g1 .
-
-<< << :s :p :o1 >> :q1 :z1 >>
-        :graph  :g .
-
-<< << _:b0 :r :o3 >> :pb "abc" >>
-        :graph  :g2 .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.rq
deleted file mode 100644
index e10806f768d..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.rq
+++ /dev/null
@@ -1,13 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  VALUES ?t {
-         <<:s :p :o >>
-         :x
-          <<:s :p :o1 >>
-          }
-  FILTER(isTriple(?t))
-  FILTER(SUBJECT(?t) = :s)
-  FILTER(PREDICATE(?t) = :p)
-  FILTER(OBJECT(?t) = :o)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.srj
deleted file mode 100644
index cc2d6ce36e9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-expr-02.srj
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "head": {
-    "vars": [ "t" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "t": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p" } ,
-            "object":   { "type": "uri" , "value": "http://example/o" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.rq
deleted file mode 100644
index cc2b9653afa..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-   :s :p ?o .
-   GRAPH ?g { <<:s :p ?o>> ?q ?z }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.srj
deleted file mode 100644
index 63b5d5a3255..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-1.srj
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "head": {
-    "vars": [ "o" , "q" , "z" , "g" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "o": { "type": "uri" , "value": "http://example/o1" } ,
-        "q": { "type": "uri" , "value": "http://example/q1" } ,
-        "z": { "type": "uri" , "value": "http://example/z1" } ,
-        "g": { "type": "uri" , "value": "http://example/g" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.rq
deleted file mode 100644
index 40d834e8af2..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-   GRAPH ?g1 { ?s ?p ?o }
-   GRAPH ?g2 { << ?s ?p ?o >> ?q ?z }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.srj
deleted file mode 100644
index fd44899d2ea..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-graphs-2.srj
+++ /dev/null
@@ -1,17 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" , "o" , "g1" , "q" , "z" , "g2" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "bnode" , "value": "b0" } ,
-        "p": { "type": "uri" , "value": "http://example/r" } ,
-        "o": { "type": "uri" , "value": "http://example/o3" } ,
-        "g1": { "type": "uri" , "value": "http://example/g1" } ,
-        "q": { "type": "uri" , "value": "http://example/pb" } ,
-        "z": { "type": "literal" , "value": "abc" } ,
-        "g2": { "type": "uri" , "value": "http://example/g2" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.rq
deleted file mode 100644
index ab22436b2dc..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  ?x :left ?left .
-  ?x :right ?right .
-  FILTER( sameTerm(?left, ?right) )
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.srj
deleted file mode 100644
index 64d3328e95b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-1.srj
+++ /dev/null
@@ -1,46 +0,0 @@
-{ "head": {
-    "vars": [ "x" , "left" , "right" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "x": { "type": "uri" , "value": "http://example/x2" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x5" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.rq
deleted file mode 100644
index f96cc8f4eaa..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  ?x :left ?left .
-  ?x :right ?right .
-  FILTER( ! sameTerm(?left, ?right) )
-  FILTER(?left = ?right)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.srj
deleted file mode 100644
index d1f10893f60..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-2.srj
+++ /dev/null
@@ -1,79 +0,0 @@
-{ "head": {
-    "vars": [ "x" , "left" , "right" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "x": { "type": "uri" , "value": "http://example/x6" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#double" , "value": "123e0" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x1" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#decimal" , "value": "123.0" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x3" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/a" } ,
-                "predicate": { "type": "uri" , "value": "http://example/b" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example/q" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/a" } ,
-                "predicate": { "type": "uri" , "value": "http://example/b" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#decimal" , "value": "123.0" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example/q" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.rq
deleted file mode 100644
index cf15586b72c..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  ?x :left ?left .
-  ?x :right ?right .
-  FILTER ( ?left < ?right )
-  FILTER ( ?right > ?left )
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.srj
deleted file mode 100644
index ea87953b8be..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-3.srj
+++ /dev/null
@@ -1,27 +0,0 @@
-{ "head": {
-    "vars": [ "x" , "left" , "right" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "x": { "type": "uri" , "value": "http://example/x7" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "9" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.rq
deleted file mode 100644
index 9b091c1d090..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  ?x :left ?left .
-  ?x :right ?right .
-  FILTER ( ?left <= ?right )
-  FILTER ( ?right >= ?left )
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.srj
deleted file mode 100644
index 8eee770ef4d..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-op-4.srj
+++ /dev/null
@@ -1,136 +0,0 @@
-{ "head": {
-    "vars": [ "x" , "left" , "right" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "x": { "type": "uri" , "value": "http://example/x7" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "9" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x2" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x1" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#decimal" , "value": "123.0" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x5" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b0" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x3" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/a" } ,
-                "predicate": { "type": "uri" , "value": "http://example/b" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example/q" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/a" } ,
-                "predicate": { "type": "uri" , "value": "http://example/b" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#decimal" , "value": "123.0" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example/q" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        }
-      } ,
-      { 
-        "x": { "type": "uri" , "value": "http://example/x6" } ,
-        "left": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b1" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#double" , "value": "123e0" }
-          }
-        } ,
-        "right": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "bnode" , "value": "b1" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-1.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-1.srj
deleted file mode 100644
index 066b754a3b6..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-1.srj
+++ /dev/null
@@ -1,31 +0,0 @@
-{ "head": {
-    "vars": [ "v" , "index" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "v": { "type": "bnode" , "value": "b0" } ,
-        "index": { "type": "literal" , "value": "B-1" }
-      } ,
-      { 
-        "v": { "type": "uri" , "value": "http://example/x" } ,
-        "index": { "type": "literal" , "value": "B-2" }
-      } ,
-      { 
-        "v": { "type": "literal" , "value": "abc" } ,
-        "index": { "type": "literal" , "value": "A-3" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p" } ,
-            "object":   { "type": "uri" , "value": "http://example/o" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-4" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-2.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-2.srj
deleted file mode 100644
index 3bb6ed4b7eb..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-2.srj
+++ /dev/null
@@ -1,154 +0,0 @@
-{ "head": {
-    "vars": [ "v" , "index" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "v": { "type": "bnode" , "value": "b0" } ,
-        "index": { "type": "literal" , "value": "B-1" }
-      } ,
-      { 
-        "v": { "type": "uri" , "value": "http://host/entity" } ,
-        "index": { "type": "literal" , "value": "B-2" }
-      } ,
-      { 
-        "v": { "type": "literal" , "value": "string" } ,
-        "index": { "type": "literal" , "value": "A-3" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/p" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "-456" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-4" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/p" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "B-5" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/p" } ,
-            "object":   {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example.com/x" } ,
-                "predicate": { "type": "uri" , "value": "http://example.com/y" } ,
-                "object":   { "type": "uri" , "value": "http://example.com/z" }
-              }
-            }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "B-6" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s1" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/a" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-7" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s1" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/p" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "999" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-8" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example.com/s2" } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/p" } ,
-            "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "900" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "A-9" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example.com/s1" } ,
-                "predicate": { "type": "uri" , "value": "http://example.com/a" } ,
-                "object":   { "type": "uri" , "value": "http://example.com/o" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/q" } ,
-            "object":   { "type": "uri" , "value": "http://example.com/r" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-10" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example.com/x" } ,
-                "predicate": { "type": "uri" , "value": "http://example.com/y" } ,
-                "object":   { "type": "uri" , "value": "http://example.com/z" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/q" } ,
-            "object":   { "type": "uri" , "value": "http://example.com/r" }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "C-11" }
-      } ,
-      { 
-        "v": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example.com/x" } ,
-                "predicate": { "type": "uri" , "value": "http://example.com/y" } ,
-                "object":   { "type": "uri" , "value": "http://example.com/z" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example.com/q" } ,
-            "object":   {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example.com/x" } ,
-                "predicate": { "type": "uri" , "value": "http://example.com/y" } ,
-                "object":   { "type": "uri" , "value": "http://example.com/z" }
-              }
-            }
-          }
-        } ,
-        "index": { "type": "literal" , "value": "A-12" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-by.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-by.rq
deleted file mode 100644
index 4f12635f6db..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-order-by.rq
+++ /dev/null
@@ -1,69 +0,0 @@
-PREFIX : <http://example.com/>
-
-SELECT *
-WHERE {
-   # Record ORDER BY for up to 20 items.
-   # Each clause slices one ?v and sets ?index.
-   # ?index is a unique string which is not in the same order.
-   {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 0 LIMIT 1 }
-     BIND( "B-1" as ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 1 LIMIT 1 }
-     BIND( "B-2" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 2 LIMIT 1 }
-     BIND( "A-3" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 3 LIMIT 1 }
-     BIND( "C-4" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 4 LIMIT 1 }
-     BIND( "B-5" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 5 LIMIT 1 }
-     BIND( "B-6" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 6 LIMIT 1 }
-     BIND( "C-7" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 7 LIMIT 1 }
-     BIND( "C-8" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 8 LIMIT 1 }
-     BIND( "A-9" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 9 LIMIT 1 }
-     BIND( "C-10" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 10 LIMIT 1 }
-     BIND( "C-11" as ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 11 LIMIT 1 }
-     BIND( "A-12" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 12 LIMIT 1 }
-     BIND( "B-13" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 13 LIMIT 1 }
-     BIND( "A-14" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 14 LIMIT 1 }
-     BIND( "B-15" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 15 LIMIT 1 }
-     BIND( "C-16" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 16 LIMIT 1 }
-     BIND( "C-17" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 17 LIMIT 1 }
-     BIND( "B-18" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 18 LIMIT 1 }
-     BIND( "A-19" AS ?index )
-   } UNION {
-     { SELECT ?v { ?s ?p ?v } ORDER BY ?v OFFSET 19 LIMIT 1 }
-     BIND( "A-20" AS ?index )
-   }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.rq
deleted file mode 100644
index 11db33d6055..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
- :s :p1 ?o .
- <<:s :p1 ?o>> ?q ?z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.srj
deleted file mode 100644
index 06e903399be..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-01.srj
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "head": {
-    "vars": [ "o" , "q" , "z" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "o": { "type": "uri" , "value": "http://example/o" } ,
-        "q": { "type": "uri" , "value": "http://example/b" } ,
-        "z": { "type": "uri" , "value": "http://example/a2" }
-      } ,
-      { 
-        "o": { "type": "uri" , "value": "http://example/o" } ,
-        "q": { "type": "uri" , "value": "http://example/q" } ,
-        "z": { "type": "uri" , "value": "http://example/z" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.rq
deleted file mode 100644
index 495982ee911..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-  <<:s :p1 ?o>> ?q ?z .
-  :s :p1 ?o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.srj
deleted file mode 100644
index 06e903399be..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-02.srj
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "head": {
-    "vars": [ "o" , "q" , "z" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "o": { "type": "uri" , "value": "http://example/o" } ,
-        "q": { "type": "uri" , "value": "http://example/b" } ,
-        "z": { "type": "uri" , "value": "http://example/a2" }
-      } ,
-      { 
-        "o": { "type": "uri" , "value": "http://example/o" } ,
-        "q": { "type": "uri" , "value": "http://example/q" } ,
-        "z": { "type": "uri" , "value": "http://example/z" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.rq
deleted file mode 100644
index e2a7cc95ae3..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-## Connected via triple term
-SELECT * {
- ?s :b ?o .
- ?o :b ?z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.srj
deleted file mode 100644
index 51c30787383..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-03.srj
+++ /dev/null
@@ -1,20 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "o" , "z" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "uri" , "value": "http://example/a1" } ,
-        "o": {
-          "type": "triple" , 
-          "value": {
-            "subject":   { "type": "uri" , "value": "http://example/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p1" } ,
-            "object":    { "type": "uri" , "value": "http://example/o" }
-          }
-        } ,
-        "z": { "type": "uri" , "value": "http://example/a2" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.rq
deleted file mode 100644
index 445ff602771..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-## No match
-SELECT * {
-   ?s ?p << :s :p1 :zz >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.srj
deleted file mode 100644
index dc43176af54..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-04.srj
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" ]
-  } ,
-  "results": {
-    "bindings": [
-      
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.rq
deleted file mode 100644
index 4f631e83c36..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-# Matching Variables
-SELECT * {
-   <<?s ?p ?o>> ?Q <<?s ?p ?o>>
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.srj
deleted file mode 100644
index 03e95c4e010..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-05.srj
+++ /dev/null
@@ -1,14 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" , "o" , "Q" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "uri" , "value": "http://example/s" } ,
-        "p": { "type": "uri" , "value": "http://example/p2" } ,
-        "o": { "type": "uri" , "value": "http://example/o" } ,
-        "Q": { "type": "uri" , "value": "http://example/sym" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.rq
deleted file mode 100644
index 6dfb30e8783..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-# Nesting
-SELECT * {
-  << <<:s :p2 :o>> :p3 :z>> :q  ?q .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.srj
deleted file mode 100644
index cd179ab26fc..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-06.srj
+++ /dev/null
@@ -1,11 +0,0 @@
-{ "head": {
-    "vars": [ "q" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "q": { "type": "uri" , "value": "http://example/o" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.rq
deleted file mode 100644
index 31cd627fbdc..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :       <http://example/>
-
-# Nesting
-SELECT * {
-  << <<?s :p2 :o>> :p3 ?x>> :q ?q 
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.srj
deleted file mode 100644
index 80b03ae23b9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-07.srj
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "x" , "q" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "uri" , "value": "http://example/s" } ,
-        "x": { "type": "uri" , "value": "http://example/z" } ,
-        "q": { "type": "uri" , "value": "http://example/o" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.rq
deleted file mode 100644
index 0b625ecaad7..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-# Nesting via match
-SELECT * {
-  ?t :p3 :z .
-  << ?t  :p3 :z >> :q :o . 
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.srj
deleted file mode 100644
index b4045d62ab3..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-08.srj
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "head": {
-    "vars": [ "t" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "t": {
-          "type": "triple" , 
-          "value": {
-            "subject":   { "type": "uri" , "value": "http://example/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p2" } ,
-            "object":    { "type": "uri" , "value": "http://example/o" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.rq
deleted file mode 100644
index 300277a1f11..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    { <<?s ?p :o>> ?p ?z }
-    UNION
-    { ?z ?p  <<?s ?p :o>> }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.srj
deleted file mode 100644
index 5e6dc622f40..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-pattern-09.srj
+++ /dev/null
@@ -1,18 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" , "z" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": { "type": "uri" , "value": "http://example/s2" } ,
-        "p": { "type": "uri" , "value": "http://example/p" } ,
-        "z": { "type": "literal" , "value": "same-p" }
-      } ,
-      { 
-        "s": { "type": "uri" , "value": "http://example/s2" } ,
-        "p": { "type": "uri" , "value": "http://example/p" } ,
-        "z": { "type": "uri" , "value": "http://example/z2" }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.rq b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.rq
deleted file mode 100644
index 11d68f8c332..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :       <http://example/>
-
-SELECT * {
-    ?s ?p ?o
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srj b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srj
deleted file mode 100644
index 84da8f0a25b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srj
+++ /dev/null
@@ -1,106 +0,0 @@
-{ "head": {
-    "vars": [ "s" , "p" , "o" ]
-  } ,
-  "results": {
-    "bindings": [
-      { 
-        "s": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "uri" , "value": "http://example/c" }
-          }
-        } ,
-        "p": { "type": "uri" , "value": "http://example/q1" } ,
-        "o": { "type": "uri" , "value": "http://example/z1" }
-      } ,
-      { 
-        "s": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "uri" , "value": "http://example/c" }
-          }
-        } ,
-        "p": { "type": "uri" , "value": "http://example/q" } ,
-        "o": { "type": "uri" , "value": "http://example/z" }
-      } ,
-      { 
-        "s": { "type": "uri" , "value": "http://example/a" } ,
-        "p": { "type": "uri" , "value": "http://example/b" } ,
-        "o": { "type": "uri" , "value": "http://example/c" }
-      } ,
-      { 
-        "s": { "type": "uri" , "value": "http://example/a" } ,
-        "p": { "type": "uri" , "value": "http://example/q" } ,
-        "o": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/a" } ,
-            "predicate": { "type": "uri" , "value": "http://example/b" } ,
-            "object":   { "type": "uri" , "value": "http://example/c" }
-          }
-        }
-      } ,
-      { 
-        "s": { "type": "uri" , "value": "http://example/f" } ,
-        "p": { "type": "uri" , "value": "http://example/g" } ,
-        "o": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/s" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p" } ,
-            "object":   {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/x2" } ,
-                "predicate": { "type": "uri" , "value": "http://example/y3" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-              }
-            }
-          }
-        }
-      } ,
-      { 
-        "s": { "type": "uri" , "value": "http://example/f" } ,
-        "p": { "type": "uri" , "value": "http://example/g" } ,
-        "o": {
-          "type": "triple" , 
-          "value": {
-            "subject":  {
-              "type": "triple" , 
-              "value": {
-                "subject":  { "type": "uri" , "value": "http://example/x1" } ,
-                "predicate": { "type": "uri" , "value": "http://example/y1" } ,
-                "object":   { "type": "literal" , "datatype": "http://www.w3.org/2001/XMLSchema#integer" , "value": "123" }
-              }
-            } ,
-            "predicate": { "type": "uri" , "value": "http://example/p" } ,
-            "object":   { "type": "uri" , "value": "http://example/o" }
-          }
-        }
-      } ,
-      { 
-        "s": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/s1" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p1" } ,
-            "object":   { "type": "uri" , "value": "http://example/o1" }
-          }
-        } ,
-        "p": { "type": "uri" , "value": "http://example/q" } ,
-        "o": {
-          "type": "triple" , 
-          "value": {
-            "subject":  { "type": "uri" , "value": "http://example/s1" } ,
-            "predicate": { "type": "uri" , "value": "http://example/p1" } ,
-            "object":   { "type": "uri" , "value": "http://example/o1" }
-          }
-        }
-      }
-    ]
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srx b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srx
deleted file mode 100644
index 46dc2ec9077..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-results-1.srx
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="s"/>
-    <variable name="p"/>
-    <variable name="o"/>
-  </head>
-  <results>
-    <result>
-      <binding name="s">
-        <triple>
-          <subject>
-            <uri>http://example/a</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/b</uri>
-          </predicate>
-          <object>
-            <uri>http://example/c</uri>
-          </object>
-        </triple>
-      </binding>
-      <binding name="p">
-        <uri>http://example/q1</uri>
-      </binding>
-      <binding name="o">
-        <uri>http://example/z1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <triple>
-          <subject>
-            <uri>http://example/a</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/b</uri>
-          </predicate>
-          <object>
-            <uri>http://example/c</uri>
-          </object>
-        </triple>
-      </binding>
-      <binding name="p">
-        <uri>http://example/q</uri>
-      </binding>
-      <binding name="o">
-        <uri>http://example/z</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <uri>http://example/a</uri>
-      </binding>
-      <binding name="p">
-        <uri>http://example/b</uri>
-      </binding>
-      <binding name="o">
-        <uri>http://example/c</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <uri>http://example/a</uri>
-      </binding>
-      <binding name="p">
-        <uri>http://example/q</uri>
-      </binding>
-      <binding name="o">
-        <triple>
-          <subject>
-            <uri>http://example/a</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/b</uri>
-          </predicate>
-          <object>
-            <uri>http://example/c</uri>
-          </object>
-        </triple>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <uri>http://example/f</uri>
-      </binding>
-      <binding name="p">
-        <uri>http://example/g</uri>
-      </binding>
-      <binding name="o">
-        <triple>
-          <subject>
-            <uri>http://example/s</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/p</uri>
-          </predicate>
-          <object>
-            <triple>
-              <subject>
-                <uri>http://example/x2</uri>
-              </subject>
-              <predicate>
-                <uri>http://example/y3</uri>
-              </predicate>
-              <object>
-                <literal datatype="http://www.w3.org/2001/XMLSchema#integer">123</literal>
-              </object>
-            </triple>
-          </object>
-        </triple>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <uri>http://example/f</uri>
-      </binding>
-      <binding name="p">
-        <uri>http://example/g</uri>
-      </binding>
-      <binding name="o">
-        <triple>
-          <subject>
-            <triple>
-              <subject>
-                <uri>http://example/x1</uri>
-              </subject>
-              <predicate>
-                <uri>http://example/y1</uri>
-              </predicate>
-              <object>
-                <literal datatype="http://www.w3.org/2001/XMLSchema#integer">123</literal>
-              </object>
-            </triple>
-          </subject>
-          <predicate>
-            <uri>http://example/p</uri>
-          </predicate>
-          <object>
-            <uri>http://example/o</uri>
-          </object>
-        </triple>
-      </binding>
-    </result>
-    <result>
-      <binding name="s">
-        <triple>
-          <subject>
-            <uri>http://example/s1</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/p1</uri>
-          </predicate>
-          <object>
-            <uri>http://example/o1</uri>
-          </object>
-        </triple>
-      </binding>
-      <binding name="p">
-        <uri>http://example/q</uri>
-      </binding>
-      <binding name="o">
-        <triple>
-          <subject>
-            <uri>http://example/s1</uri>
-          </subject>
-          <predicate>
-            <uri>http://example/p1</uri>
-          </predicate>
-          <object>
-            <uri>http://example/o1</uri>
-          </object>
-        </triple>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-1.ru b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-1.ru
deleted file mode 100644
index 019d697bb63..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-1.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-INSERT {
-  << ?s ?p ?o >> :source ?g
-} WHERE {
-  GRAPH ?g { ?s ?p ?o }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-2.ru b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-2.ru
deleted file mode 100644
index 8e7b405a333..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-2.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-DELETE { GRAPH ?g { ?s ?p ?o } }
-INSERT { ?s ?p ?o {| :source ?g |} }
-WHERE {
-  GRAPH ?g { ?s ?p ?o }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-3.ru b/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-3.ru
deleted file mode 100644
index ea925409c4f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/sparql-star-update-3.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-INSERT DATA {
-   :s :p :o {| :source :faraway |}
-}
-;
-DELETE DATA { :s :p :o }
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-1.trig b/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-1.trig
deleted file mode 100644
index 3fbfb719ad0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-1.trig
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :       <http://example/>
-
-GRAPH :g1 { :s1 :p1 :o1 }
-GRAPH :g2 { :s2 :p2 :o2 }
-
-<< :s2 :p2 :o2 >> :source :g2 .
-<< :s1 :p1 :o1 >> :source :g1 .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-2.trig b/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-2.trig
deleted file mode 100644
index 535ac6fe89c..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-2.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:s1 :p1 :o1 .
-:s2 :p2 :o2 .
-<< :s1 :p1 :o1 >> :source :g1 .
-<< :s2 :p2 :o2 >> :source :g2.
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-3.trig b/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-3.trig
deleted file mode 100644
index fdc690ec0a9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/update-result-3.trig
+++ /dev/null
@@ -1,2 +0,0 @@
-<< <http://example/s> <http://example/p> <http://example/o> >>
-        <http://example/source>  <http://example/faraway> .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/manifest.ttl b/jena-arq/testing/rdf-star-cg/sparql/syntax/manifest.ttl
deleted file mode 100644
index e92d9c103db..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/manifest.ttl
+++ /dev/null
@@ -1,433 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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 test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/sparql/syntax#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-    rdfs:label "SPARQL-star Syntax Tests"@en ;
-    skos:prefLabel "La suite des tests pour SPARQL-star"@fr ;
-    skos:prefLabel "Conjunto de pruebas para SPARQL-star"@es ;
-    dct:issued "2021-06-21"^^xsd:date ;
-    rdfs:seeAlso <https://w3c.github.io/rdf-tests/> ;
-    dct:modified "2021-07-18"^^xsd:date ;
-    dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-    dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    mf:entries
-    (
-        trs:sparql-star-1
-        trs:sparql-star-2
-        trs:sparql-star-3
-        trs:sparql-star-4
-        trs:sparql-star-5
-        trs:sparql-star-6
-        trs:sparql-star-7
-
-        trs:sparql-star-inside-1
-        trs:sparql-star-inside-2
-
-        trs:sparql-star-nested-1
-        trs:sparql-star-nested-2
-
-        trs:sparql-star-compound-1
-
-        trs:sparql-star-bnode-1
-        trs:sparql-star-bnode-2
-        trs:sparql-star-bnode-3
-
-        trs:sparql-star-ann-01
-        trs:sparql-star-ann-02
-        trs:sparql-star-ann-03
-        trs:sparql-star-ann-04
-        trs:sparql-star-ann-05
-        trs:sparql-star-ann-06
-        trs:sparql-star-ann-07
-        trs:sparql-star-ann-08
-        trs:sparql-star-ann-09
-
-        trs:sparql-star-expr-1
-        trs:sparql-star-expr-2
-        trs:sparql-star-expr-3
-        trs:sparql-star-expr-4
-        trs:sparql-star-expr-5
-        trs:sparql-star-expr-6
-
-        trs:sparql-star-bad-1
-        trs:sparql-star-bad-2
-        trs:sparql-star-bad-3
-        trs:sparql-star-bad-4
-        trs:sparql-star-bad-5
-        trs:sparql-star-bad-6
-        trs:sparql-star-bad-7
-        trs:sparql-star-bad-8
-        trs:sparql-star-bad-9
-        trs:sparql-star-bad-10
-        trs:sparql-star-bad-11
-        trs:sparql-star-bad-12
-
-        trs:sparql-star-bad-ann-1
-        trs:sparql-star-bad-ann-2
-
-        trs:sparql-star-bad-ann-path-1
-        trs:sparql-star-bad-ann-path-2
-        trs:sparql-star-bad-ann-path-3
-        trs:sparql-star-bad-ann-path-4
-        trs:sparql-star-bad-ann-path-5
-        trs:sparql-star-bad-ann-path-6
-        trs:sparql-star-bad-ann-path-7
-
-        trs:sparql-star-update-1
-        trs:sparql-star-update-2
-        trs:sparql-star-update-3
-        trs:sparql-star-update-4
-        trs:sparql-star-update-5
-        trs:sparql-star-update-6
-        trs:sparql-star-update-7
-        trs:sparql-star-update-8
-
-        trs:sparql-star-bad-update-1
-        trs:sparql-star-bad-update-2
-        trs:sparql-star-bad-update-3
-        trs:sparql-star-bad-update-4
-         ) .
-
-## Good Syntax
-
-trs:sparql-star-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - subject quoted triple" ;
-    mf:action    <sparql-star-syntax-basic-01.rq> ;
-    .
-
-trs:sparql-star-2 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - object quoted triple" ;
-    mf:action    <sparql-star-syntax-basic-02.rq> ;
-    .
-
-trs:sparql-star-3 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - subject quoted triple - vars" ;
-    mf:action    <sparql-star-syntax-basic-03.rq> ;
-    .
-
-trs:sparql-star-4 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - object quoted triple - vars" ;
-    mf:action    <sparql-star-syntax-basic-04.rq> ;
-    .
-
-trs:sparql-star-5 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Embedded triple in VALUES" ;
-    mf:action    <sparql-star-syntax-basic-05.rq> ;
-    .
-
-trs:sparql-star-6 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Embedded triple in CONSTRUCT" ;
-    mf:action    <sparql-star-syntax-basic-06.rq> ;
-    .
-
-trs:sparql-star-7 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Embedded triples in CONSTRUCT WHERE" ;
-    mf:action    <sparql-star-syntax-basic-07.rq> ;
-    .
-
-
-trs:sparql-star-inside-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - quoted triple inside blankNodePropertyList" ;
-    mf:action    <sparql-star-syntax-inside-01.rq> ;
-    .
-
-trs:sparql-star-inside-2 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - quoted triple inside collection" ;
-    mf:action    <sparql-star-syntax-inside-02.rq> ;
-    .
-
-trs:sparql-star-nested-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - nested quoted triple, subject position" ;
-    mf:action    <sparql-star-syntax-nested-01.rq> ;
-    .
-
-trs:sparql-star-nested-2 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - nested quoted triple, object position" ;
-    mf:action     <sparql-star-syntax-nested-02.rq> ;
-    .
-
-trs:sparql-star-compound-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - compound forms" ;
-    mf:action    <sparql-star-syntax-compound.rq> ;
-    .
-
-trs:sparql-star-bnode-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - blank node subject" ;
-    mf:action    <sparql-star-syntax-bnode-01.rq> ;
-    .
-
-trs:sparql-star-bnode-2 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - blank node object" ;
-    mf:action    <sparql-star-syntax-bnode-02.rq> ;
-    .
-
-trs:sparql-star-bnode-3 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - blank node" ;
-    mf:action    <sparql-star-syntax-bnode-03.rq> ;
-    .
-
-## Expressions
-
-trs:sparql-star-expr-1 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - Embedded triple" ;
-    mf:action    <sparql-star-syntax-expr-01.rq> ;
-    .
-
-trs:sparql-star-expr-2 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - Embedded triple" ;
-    mf:action    <sparql-star-syntax-expr-02.rq> ;
-    .
-
-trs:sparql-star-expr-3 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - Functions" ;
-    mf:action    <sparql-star-syntax-expr-03.rq> ;
-    .
-
-trs:sparql-star-expr-4 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - TRIPLE" ;
-    mf:action    <sparql-star-syntax-expr-04.rq> ;
-    .
-
-trs:sparql-star-expr-5 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - Functions" ;
-    mf:action    <sparql-star-syntax-expr-05.rq> ;
-    .
-
-trs:sparql-star-expr-6 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Expressions - BIND - CONSTRUCT" ;
-    mf:action    <sparql-star-syntax-expr-06.rq> ;
-    .
-
-## Bad Syntax
-
-trs:sparql-star-bad-1 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - quoted triple as predicate" ;
-    mf:action    <sparql-star-syntax-bad-01.rq> ;
-    .
-
-trs:sparql-star-bad-2 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - quoted triple outside triple" ;
-    mf:action    <sparql-star-syntax-bad-02.rq> ;
-    .
-
-trs:sparql-star-bad-3 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - collection list in quoted triple" ;
-
-
-mf:action    <sparql-star-syntax-bad-03.rq> ;
-    .
-
-trs:sparql-star-bad-4 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - literal in subject position of quoted triple" ;
-    mf:action    <sparql-star-syntax-bad-04.rq> ;
-    .
-
-trs:sparql-star-bad-5 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - blank node  as predicate in quoted triple";
-    mf:action    <sparql-star-syntax-bad-05.rq> ;
-    .
-
-trs:sparql-star-bad-6 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - compound blank node expression";
-    mf:action    <sparql-star-syntax-bad-06.rq> ;
-    .
-
-trs:sparql-star-bad-7 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - incomplete quoted triple";
-    mf:action    <sparql-star-syntax-bad-07.rq> ;
-    .
-
-trs:sparql-star-bad-8 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - quad quoted triple";
-    mf:action    <sparql-star-syntax-bad-08.rq> ;
-    .
-
-trs:sparql-star-bad-9 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - variable in quoted triple in VALUES ";
-    mf:action    <sparql-star-syntax-bad-09.rq> ;
-    .
-
-trs:sparql-star-bad-10 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - blank node in quoted triple in VALUES ";
-    mf:action    <sparql-star-syntax-bad-10.rq> ;
-    .
-
-trs:sparql-star-bad-11 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - blank node in quoted triple in FILTER";
-    mf:action    <sparql-star-syntax-bad-11.rq> ;
-    .
-
-trs:sparql-star-bad-12 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - blank node in quoted triple in BIND";
-    mf:action    <sparql-star-syntax-bad-12.rq> ;
-    .
-
-## Annotation syntax
-
-trs:sparql-star-ann-01 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation form" ;
-    mf:action    <sparql-star-annotation-01.rq> ;
-   .
-
-trs:sparql-star-ann-02 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation example" ;
-    mf:action    <sparql-star-annotation-02.rq> ;
-    .
-
-trs:sparql-star-ann-03 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation example" ;
-    mf:action    <sparql-star-annotation-03.rq> ;
-    .
-
-trs:sparql-star-ann-04 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation with quoting" ;
-    mf:action    <sparql-star-annotation-04.rq> ;
-    .
-
-trs:sparql-star-ann-05 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation on triple with quoted object" ;
-    mf:action    <sparql-star-annotation-05.rq> ;
-    .
-
-trs:sparql-star-ann-06 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation with path" ;
-    mf:action    <sparql-star-annotation-06.rq> ;
-    .
-
-trs:sparql-star-ann-07 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation with nested path" ;
-    mf:action    <sparql-star-annotation-07.rq> ;
-    .
-
-trs:sparql-star-ann-08 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation in CONSTRUCT " ;
-    mf:action    <sparql-star-annotation-08.rq> ;
-    .
-
-trs:sparql-star-ann-09 rdf:type mf:PositiveSyntaxTest11 ;
-    mf:name      "SPARQL-star - Annotation in CONSTRUCT WHERE" ;
-    mf:action    <sparql-star-annotation-09.rq> ;
-    .
-
-## Bad annotation syntax
-
-trs:sparql-star-bad-ann-1 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - empty annotation";
-    mf:action    <sparql-star-syntax-bad-ann-1.rq> ;
-    .
-
-trs:sparql-star-bad-ann-2 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - triples in annotation";
-    mf:action    <sparql-star-syntax-bad-ann-2.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-1 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path - seq";
-    mf:action    <sparql-star-syntax-bad-ann-path-1.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-2 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path - alt";
-    mf:action    <sparql-star-syntax-bad-ann-path-2.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-3 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path - p*";
-    mf:action    <sparql-star-syntax-bad-ann-path-3.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-4 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path - p+";
-    mf:action    <sparql-star-syntax-bad-ann-path-4.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-5 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path - p?";
-    mf:action    <sparql-star-syntax-bad-ann-path-5.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-6 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path in CONSTRUCT";
-    mf:action    <sparql-star-syntax-bad-ann-path-6.rq> ;
-    .
-
-trs:sparql-star-bad-ann-path-7 rdf:type mf:NegativeSyntaxTest11 ;
-    mf:name      "SPARQL-star - bad - path in CONSTRUCT";
-    mf:action    <sparql-star-syntax-bad-ann-path-7.rq> ;
-    .
-
-## SPARQL-star Update
-
-trs:sparql-star-update-1  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update";
-    mf:action    <sparql-star-syntax-update-1.ru> ;
-    .
-
-trs:sparql-star-update-2  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update";
-    mf:action    <sparql-star-syntax-update-2.ru> ;
-    .
-
-trs:sparql-star-update-3  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update";
-    mf:action    <sparql-star-syntax-update-3.ru> ;
-    .
-
-trs:sparql-star-update-4  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update with quoting";
-    mf:action    <sparql-star-syntax-update-4.ru> ;
-    .
-
-trs:sparql-star-update-5  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update with quoted object";
-    mf:action    <sparql-star-syntax-update-5.ru> ;
-    .
-
-trs:sparql-star-update-6  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update with annotation template";
-    mf:action    <sparql-star-syntax-update-6.ru> ;
-    .
-
-trs:sparql-star-update-7  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update with annotation, template and pattern";
-    mf:action    <sparql-star-syntax-update-7.ru> ;
-    .
-
-trs:sparql-star-update-8  rdf:type mf:PositiveUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update DATA with annotation";
-    mf:action    <sparql-star-syntax-update-8.ru> ;
-    .
-
-## SPARQL-star Update - bad syntax
-
-trs:sparql-star-bad-update-1  rdf:type mf:NegativeUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update - bad syntax";
-    mf:action    <sparql-star-syntax-bad-update-1.ru> ;
-    .
-
-trs:sparql-star-bad-update-2  rdf:type mf:NegativeUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update - bad syntax";
-    mf:action    <sparql-star-syntax-bad-update-2.ru> ;
-    .
-
-trs:sparql-star-bad-update-3  rdf:type mf:NegativeUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update - bad syntax";
-    mf:action    <sparql-star-syntax-bad-update-3.ru> ;
-    .
-
-trs:sparql-star-bad-update-4  rdf:type mf:NegativeUpdateSyntaxTest11 ;
-    mf:name      "SPARQL-star - update - bad syntax";
-    mf:action    <sparql-star-syntax-bad-update-4.ru> ;
-    .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-01.rq
deleted file mode 100644
index efe35adb8e6..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r ?Z |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-02.rq
deleted file mode 100644
index 1b477184115..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-02.rq
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p :o {| :source [ :graph <http://host1/> ;
-                         :date "2020-01-20"^^xsd:date
-                       ] ;
-               ?source [ :graph <http://host2/> ;
-                         :date "2020-12-31"^^xsd:date
-                       ]
-             |}
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-03.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-03.rq
deleted file mode 100644
index eabd3f1db3a..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-03.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>> {| ?q ?z |}
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-04.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-04.rq
deleted file mode 100644
index 77d9329930b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>> {| ?q <<:s1 :p1 ?z>> |}
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-05.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-05.rq
deleted file mode 100644
index 481dd6491a8..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-05.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   <<?s :p1 :o1>> ?p ?o {| :r ?Z |} .
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-06.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-06.rq
deleted file mode 100644
index cad28149260..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-06.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r/:q 'ABC' |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-07.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-07.rq
deleted file mode 100644
index c6bb787e953..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-07.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r [ :p1|:p2 'ABC'] |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-08.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-08.rq
deleted file mode 100644
index e8af673c8f0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-08.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-      ?s ?p ?o {| :source ?g |}
-}
-WHERE { GRAPH ?g { ?s ?p ?o } }
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-09.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-09.rq
deleted file mode 100644
index 2694e5660b6..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-annotation-09.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o {| :q1 ?z |} 
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-01.rq
deleted file mode 100644
index c25da7aa0ba..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   :x <<:s :p :o>> 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-02.rq
deleted file mode 100644
index f77f3efac00..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<?s ?p ?o>>
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-03.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-03.rq
deleted file mode 100644
index 5991752090f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<?s :p ("abc") >> :q 123 .
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-04.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-04.rq
deleted file mode 100644
index 4ff307c53df..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<:s 3 :o >> :q ?z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-05.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-05.rq
deleted file mode 100644
index 4528cb2b6e0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-05.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<:s [] :o>> :q 123 .
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-06.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-06.rq
deleted file mode 100644
index 18150f254c7..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-06.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<:s :p [ :p1 :o1 ]  >> :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-07.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-07.rq
deleted file mode 100644
index 59e53c99ffb..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-07.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  << :s :p >> :q :o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-08.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-08.rq
deleted file mode 100644
index 02c971b95e0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-08.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  << :g :s :p :o >> :q :o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-09.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-09.rq
deleted file mode 100644
index b8295cbb4d6..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-09.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/>
-
-SELECT * {
-    VALUES ?x { << :s :p ?o >> }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-10.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-10.rq
deleted file mode 100644
index e4789e2176a..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-10.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/>
-
-SELECT * {
-    VALUES ?x { << :s :p [] >> }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-11.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-11.rq
deleted file mode 100644
index f4c74646d4c..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-11.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/>
-
-SELECT * {
-    ?s ?p ?o .
-    BIND(<< [] ?p ?o >> AS ?t )
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-12.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-12.rq
deleted file mode 100644
index 71091b8c9dc..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-12.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/>
-
-SELECT * {
-    ?s ?p ?o .
-    FILTER ( isTRIPLE(<< ?s ?p [] >>) )
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-1.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-1.rq
deleted file mode 100644
index 7f654f4ebc1..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-1.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :s :p :o {|  |} .
-}
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-2.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-2.rq
deleted file mode 100644
index c3d0e1cdbb5..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-2.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :a :b ?X {| :s :p ?O  |} .
-}
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-1.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-1.rq
deleted file mode 100644
index 0d0b41037fe..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-1.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :x :p/:q :o {| ?p ?o |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-2.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-2.rq
deleted file mode 100644
index 0293df7aad4..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-2.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :x (:p|:q) :o {| ?p ?o |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-3.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-3.rq
deleted file mode 100644
index 6aadeefdf68..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-3.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :x :p* :o {| ?p ?o |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-4.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-4.rq
deleted file mode 100644
index d6a0a578ab9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-4.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :x :p+ :o {| ?p ?o |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-5.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-5.rq
deleted file mode 100644
index f060e1e2413..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-5.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?X :p? :o {| ?p ?o |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-6.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-6.rq
deleted file mode 100644
index 2d17d499830..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-6.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-  ?s :p :o {| (:q1|:q2) :o |}
-} WHERE
-  ?s :p ?o 
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-7.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-7.rq
deleted file mode 100644
index bc0fba12a7f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-ann-path-7.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p :z {| (:q1|:q2) ?o |} 
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-1.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-1.ru
deleted file mode 100644
index 3890c42dda0..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-1.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    << :a :b :c >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-2.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-2.ru
deleted file mode 100644
index c1dc218716f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-2.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    << :g :a :b :c >> :p :o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-3.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-3.ru
deleted file mode 100644
index 44338f1e530..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-3.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    :s :p :o {| :p/:q :z |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-4.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-4.ru
deleted file mode 100644
index 6566a9f2ac2..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bad-update-4.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    {| :p :z |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-01.rq
deleted file mode 100644
index d48d407bc13..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << :a :b :c >> :p1 :o1.
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-02.rq
deleted file mode 100644
index 9660efecaef..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    :s :p << :a :b "c" >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-03.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-03.rq
deleted file mode 100644
index e4cbd4c7e1f..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << ?s ?p ?o >> ?Y ?Z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-04.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-04.rq
deleted file mode 100644
index a036a8e9b46..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    ?S ?P << ?a ?b ?c >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-05.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-05.rq
deleted file mode 100644
index 73274a2605a..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-05.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    VALUES ?x {
-        <<:s :p :o >>
-        << <<:s :p :o >> :q :z >>
-    }
-    VALUES (?y ?z) { (<<:s :p :o >> 123 )
-                      (123 <<:s :p :o >> ) }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-06.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-06.rq
deleted file mode 100644
index 88fe48d1b4a..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-06.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT { <<:s :p :o >> :q :z }
-WHERE {}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-07.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-07.rq
deleted file mode 100644
index d0af4d4d4e3..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-basic-07.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   <<?s ?p ?o >> ?q ?z .
-   ?a ?b <<?s ?p ?o >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-01.rq
deleted file mode 100644
index 01e549be1e1..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<_:a :p :o >> :q 456 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-02.rq
deleted file mode 100644
index 8bebeb244b1..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<:s :p _:a >> :q 456 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-03.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-03.rq
deleted file mode 100644
index 8af6ea71fa9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-bnode-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<[] :p [] >> :q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-compound.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-compound.rq
deleted file mode 100644
index 9f0233ac600..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-compound.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-
-  <<:x ?R :z >> :p <<:a :b ?C >> .
-
-  << <<:x ?R :z >> :p <<:a :b [] >> >>
-     :q
-  << <<[] ?R :z >> :p <<:a :b [] >> >> .
-}
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-01.rq
deleted file mode 100644
index a97964dbd45..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-01.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(<<?s ?p ?o>> AS ?t)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-02.rq
deleted file mode 100644
index fce259bff11..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-02.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(<< <<?s ?p ?o>> :q :z >> AS ?t)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-03.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-03.rq
deleted file mode 100644
index 83526adbe0b..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-03.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(TRIPLE(?s, ?p, ?o) AS ?t1)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-04.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-04.rq
deleted file mode 100644
index 1d7e04ce882..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(TRIPLE(?s, ?p, str(?o)) AS ?t2)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-05.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-05.rq
deleted file mode 100644
index 5b3d6020099..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-05.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?t :source :g
-  FILTER(isTriple(?t))
-  FILTER(SUBJECT(?t) = :s)
-  FILTER(PREDICATE(?t) = :p)
-  FILTER(OBJECT(?t) = :o)
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-06.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-06.rq
deleted file mode 100644
index 096b1aa90ef..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-expr-06.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-  ?t :graph ?g .
-} WHERE {
-  GRAPH ?g {
-    ?s ?p ?o .
-    BIND(<<?s ?p  ?o>> AS ?t)
-  }
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-01.rq
deleted file mode 100644
index 7f2cc1eb81d..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    [ ?Q <<:s ?P :o>> ] :b :c .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-02.rq
deleted file mode 100644
index f94cbdc2ee7..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-inside-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ( <<?S1 :p :o1>> <<?S2 :p :o2>> )  :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-01.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-01.rq
deleted file mode 100644
index 7905cffafd8..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-01.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<?S :p :o >> :r :z .
-  << <<?S :p :o >> :r :z >> :q 1 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-02.rq b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-02.rq
deleted file mode 100644
index df1e28918d4..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-nested-02.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :a :q <<:s :p ?O >> .
-  << :a :q <<:s :p ?O >>>> :r :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-1.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-1.ru
deleted file mode 100644
index bbaa7b31ee9..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-1.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    << :a :b :c >> :p :o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-2.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-2.ru
deleted file mode 100644
index 181b57374af..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-2.ru
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT DATA {
-    :s :p :o {| :y :z |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-3.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-3.ru
deleted file mode 100644
index 006d8edecbb..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-3.ru
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT {
-    << :a :b :c >> ?P :o2  {| ?Y ?Z |}
-} WHERE {
-   << :a :b :c >> ?P :o1 {| ?Y ?Z |}
-}
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-4.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-4.ru
deleted file mode 100644
index 3eb669437ef..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-4.ru
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT {
-    << :a :b :c >> ?P :o2  {| ?Y <<:s1 :p1 ?Z>> |}
-} WHERE {
-   << :a :b :c >> ?P :o1 {| ?Y <<:s1 :p1 ?Z>> |}
-}
-
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-5.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-5.ru
deleted file mode 100644
index 91865b70dc8..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-5.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT {
-    ?S ?P << :a :b ?O >> {| ?Y ?Z |}
-} WHERE {
-   ?S ?P << :a :b ?O >> {| ?Y ?Z |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-6.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-6.ru
deleted file mode 100644
index 0fb22acd663..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-6.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-INSERT {
-    ?s :r ?o {| :added 'Property :r' |}
-} WHERE {
-   ?s :p/:q ?o .
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-7.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-7.ru
deleted file mode 100644
index f592be615b5..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-7.ru
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-DELETE {
-    ?s :r ?o {| :added 'Property :r' |}
-} WHERE {
-   ?s :p ?o {| :q1+ 'ABC' |}
-}
diff --git a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-8.ru b/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-8.ru
deleted file mode 100644
index af933e37bb6..00000000000
--- a/jena-arq/testing/rdf-star-cg/sparql/syntax/sparql-star-syntax-update-8.ru
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-DELETE DATA  {
-    :s :p :o1  {| :added 'Test' |}
-}
-;
-INSERT DATA  {
-    :s :p :o2  {| :added 'Test' |}
-}
-
-
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/manifest.ttl b/jena-arq/testing/rdf-star-cg/trig/eval/manifest.ttl
deleted file mode 100644
index 4daba2161f5..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/manifest.ttl
+++ /dev/null
@@ -1,112 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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 test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
-PREFIX rdft:   <http://www.w3.org/ns/rdftest#>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/trig/eval#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-   rdfs:label "TriG-star Evaluation Tests"@en ;
-   skos:prefLabel "La suite des tests pour évaluation de TriG-star"@fr;
-   skos:prefLabel "Conjunto de pruebas para evaluar Trig-star"@es;
-   dct:issued "2021-06-21"^^xsd:date ;
-   rdfs:seeAlso <https://w3c.github.io/rdf-tests/> ;
-   dct:modified "2021-07-18"^^xsd:date ;
-   dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-   dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-   mf:entries
-    (
-        trs:trig-star-1
-        trs:trig-star-2
-        trs:trig-star-bnode-1
-        trs:trig-star-bnode-2
-        trs:trig-star-annotation-1
-        trs:trig-star-annotation-2
-        trs:trig-star-annotation-3
-        trs:trig-star-annotation-4
-        trs:trig-star-annotation-5
-        trs:trig-star-quoted-annotation-1
-        trs:trig-star-quoted-annotation-2
-        trs:trig-star-quoted-annotation-3
-    ) .
-
-trs:trig-star-1 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - subject quoted triple" ;
-   mf:action    <trig-star-eval-01.trig> ;
-   mf:result    <trig-star-eval-01.nq> ;
-   .
-
-trs:trig-star-2 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - object quoted triple" ;
-   mf:action    <trig-star-eval-02.trig> ;
-   mf:result    <trig-star-eval-02.nq> ;
-   .
-
-trs:trig-star-bnode-1 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - blank node label" ;
-   mf:action    <trig-star-eval-bnode-1.trig> ;
-   mf:result    <trig-star-eval-bnode-1.nq> ;
-   .
-
-trs:trig-star-bnode-2 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - blank node labels" ;
-   mf:action    <trig-star-eval-bnode-2.trig> ;
-   mf:result    <trig-star-eval-bnode-2.nq> ;
-   .
-
-trs:trig-star-annotation-1 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation form" ;
-   mf:action    <trig-star-eval-annotation-1.trig> ;
-   mf:result    <trig-star-eval-annotation-1.nq> ;
-   .
-
-trs:trig-star-annotation-2 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation example" ;
-   mf:action    <trig-star-eval-annotation-2.trig> ;
-   mf:result    <trig-star-eval-annotation-2.nq> ;
-   .
-
-trs:trig-star-annotation-3 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation - predicate and object lists" ;
-   mf:action    <trig-star-eval-annotation-3.trig> ;
-   mf:result    <trig-star-eval-annotation-3.nq> ;
-   .
-
-trs:trig-star-annotation-4 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation - nested" ;
-   mf:action    <trig-star-eval-annotation-4.trig> ;
-   mf:result    <trig-star-eval-annotation-4.nq> ;
-   .
-
-trs:trig-star-annotation-5 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation object list" ;
-   mf:action    <trig-star-eval-annotation-5.trig> ;
-   mf:result    <trig-star-eval-annotation-5.nq> ;
-   .
-
-trs:trig-star-quoted-annotation-1 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation with quoting" ;
-   mf:action    <trig-star-eval-quoted-annotation-1.trig> ;
-   mf:result    <trig-star-eval-quoted-annotation-1.nq> ;
-   .
-   
-trs:trig-star-quoted-annotation-2 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation on triple with quoted subject" ;
-   mf:action    <trig-star-eval-quoted-annotation-2.trig> ;
-   mf:result    <trig-star-eval-quoted-annotation-2.nq> ;
-   .
-   
-trs:trig-star-quoted-annotation-3 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - Annotation on triple with quoted object" ;
-   mf:action    <trig-star-eval-quoted-annotation-3.trig> ;
-   mf:result    <trig-star-eval-quoted-annotation-3.nq> ;
-   .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.nq
deleted file mode 100644
index 95a93419cde..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.nq
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.trig
deleted file mode 100644
index 924f2c826af..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-01.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {<<:s :p :o>> :q :z .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.nq
deleted file mode 100644
index 3533ef00255..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.nq
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.trig
deleted file mode 100644
index eb460dd2f46..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-02.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:a :q <<:s :p :o>> .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.nq
deleted file mode 100644
index aefb8b3f676..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.trig
deleted file mode 100644
index 9364a9cf40f..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-1.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p :o {| :r :z |} .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.nq
deleted file mode 100644
index 46bc7834efd..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.nq
+++ /dev/null
@@ -1,7 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-_:b1 <http://example/graph> <http://host1/> <http://example/G> .
-_:b1 <http://example/date> "2020-01-20"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b1 <http://example/G> .
-_:b2 <http://example/graph> <http://host2/> <http://example/G> .
-_:b2 <http://example/date> "2020-12-31"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b2 <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.trig
deleted file mode 100644
index 0dc1e05fa96..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-2.trig
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :       <http://example/>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-:G {
-  :s :p :o {| :source [ :graph <http://host1/> ;
-                        :date "2020-01-20"^^xsd:date
-                      ] ;
-              :source [ :graph <http://host2/> ;
-                        :date "2020-12-31"^^xsd:date
-                      ]
-            |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.nq
deleted file mode 100644
index 64cac5dfdd7..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.nq
+++ /dev/null
@@ -1,6 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> <http://example/G> .
-<http://example/s> <http://example/p2> <http://example/o2> <http://example/G> .
-<< <http://example/s> <http://example/p2> <http://example/o2> >> <http://example/a2> <http://example/b2> <http://example/G> .
-<http://example/s> <http://example/p2> <http://example/o3> <http://example/G> .
-<< <http://example/s> <http://example/p2> <http://example/o3> >> <http://example/a3> <http://example/b3> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.trig
deleted file mode 100644
index 336c745eb1c..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-3.trig
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o {| :a :b |};
-      :p2 :o2 {| :a2 :b2 |},
-          :o3 {| :a3 :b3 |}.
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.nq
deleted file mode 100644
index 5f38decb81f..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.nq
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> <http://example/G> .
-<< << <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> >> <http://example/a2> <http://example/b2> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.trig
deleted file mode 100644
index d6d83da31df..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-4.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p :o {| :a :b {| :a2 :b2 |} |}.}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.nq
deleted file mode 100644
index 5288fbb0189..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.nq
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o1> <http://example/G> .
-<http://example/s> <http://example/p> <http://example/o2> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o2> >> <http://example/a> <http://example/b> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.trig
deleted file mode 100644
index 59d8304072d..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-annotation-5.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p :o1, :o2 {| :a :b |} .}
-
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.nq
deleted file mode 100644
index 50f0eddefc5..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-_:b9 <http://example/p> <http://example/o> <http://example/G> .
-<< _:b9 <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.trig
deleted file mode 100644
index 1ddce6d740c..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-1.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  _:b :p :o .
-  <<_:b :p :o>> :q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.nq
deleted file mode 100644
index f1c0492b2e4..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-_:label1 <http://example/p1> _:label1 <http://example/G> .
-<< _:label1 <http://example/p1> _:label1 >> <http://example/q> << _:label1 <http://example/p2> <http://example/o> >> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.trig
deleted file mode 100644
index 3d2cb2a0989..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-bnode-2.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  _:a :p1 _:a .
-  <<_:a :p1 _:a >> :q <<_:a :p2 :o>> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.nq
deleted file mode 100644
index 07518297590..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<<<http://example/s> <http://example/p> <http://example/o>>> <http://example/r> <<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.trig
deleted file mode 100644
index a56b84099cc..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-1.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p :o {| :r <<:s1 :p1 :o1>> |} .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.nq
deleted file mode 100644
index 3d16c4f220c..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/G> .
-<<<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o>>> <http://example/r> <http://example/z> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.trig
deleted file mode 100644
index ed4dec930b5..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-2.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {<<:s1 :p1 :o1>> :p :o {| :r :z |} .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.nq b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.nq
deleted file mode 100644
index b98f71b63e6..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.nq
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>> <http://example/G> .
-<<<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>>>> <http://example/r> <http://example/z> <http://example/G> .
diff --git a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.trig b/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.trig
deleted file mode 100644
index 5b1006733d1..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/eval/trig-star-eval-quoted-annotation-3.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p <<:s2 :p2 :o2>> {| :r :z |} .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/manifest.ttl b/jena-arq/testing/rdf-star-cg/trig/syntax/manifest.ttl
deleted file mode 100644
index 9f1877a021b..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/manifest.ttl
+++ /dev/null
@@ -1,175 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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#>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/trig/syntax#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-    rdfs:label "TriG-star Syntax Tests"@en ;
-    skos:prefLabel "La suite des tests pour la syntaxe de TriG-star"@fr ;
-    skos:prefLabel "Conjunto de pruebas para la sintaxis de Trig-star"@es ;
-    dct:issued "2021-06-21"^^xsd:date ;
-    rdfs:seeAlso <https://w3c.github.io/rdf-tests/> ;
-    dct:modified "2021-07-18"^^xsd:date ;
-    dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-    dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    mf:entries
-    (
-        trs:trig-star-1
-        trs:trig-star-2
-
-        trs:trig-star-inside-1
-        trs:trig-star-inside-2
-
-        trs:trig-star-nested-1
-        trs:trig-star-nested-2
-
-        trs:trig-star-compound-1
-
-        trs:trig-star-bnode-1
-        trs:trig-star-bnode-2
-        trs:trig-star-bnode-3
-
-        trs:trig-star-bad-1
-        trs:trig-star-bad-2
-        trs:trig-star-bad-3
-        trs:trig-star-bad-4
-        trs:trig-star-bad-5
-        trs:trig-star-bad-6
-        trs:trig-star-bad-7
-        trs:trig-star-bad-8
-
-        trs:trig-star-ann-1
-        trs:trig-star-ann-2
-
-        trs:trig-star-bad-ann-1
-        trs:trig-star-bad-ann-2
-    ) .
-
-## Good Syntax
-
-trs:trig-star-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - subject quoted triple" ;
-   mf:action    <trig-star-syntax-basic-01.trig> ;
-   .
-
-trs:trig-star-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - object quoted triple" ;
-   mf:action    <trig-star-syntax-basic-02.trig> ;
-   .
-
-trs:trig-star-inside-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - quoted triple inside blankNodePropertyList" ;
-   mf:action    <trig-star-syntax-inside-01.trig> ;
-   .
-
-trs:trig-star-inside-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - quoted triple inside collection" ;
-   mf:action    <trig-star-syntax-inside-02.trig> ;
-   .
-
-trs:trig-star-nested-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - nested quoted triple, subject position" ;
-   mf:action    <trig-star-syntax-nested-01.trig> ;
-   .
-
-trs:trig-star-nested-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - nested quoted triple, object position" ;
-   mf:action     <trig-star-syntax-nested-02.trig> ;
-   .
-
-trs:trig-star-compound-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - compound forms" ;
-   mf:action    <trig-star-syntax-compound.trig> ;
-   .
-
-trs:trig-star-bnode-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - blank node subject" ;
-   mf:action    <trig-star-syntax-bnode-01.trig> ;
-   .
-
-trs:trig-star-bnode-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - blank node object" ;
-   mf:action    <trig-star-syntax-bnode-02.trig> ;
-   .
-
-trs:trig-star-bnode-3 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - blank node" ;
-   mf:action    <trig-star-syntax-bnode-03.trig> ;
-   .
-
-## Bad Syntax
-
-trs:trig-star-bad-1 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - quoted triple as predicate" ;
-    mf:action    <trig-star-syntax-bad-01.trig> ;
-    .
-
-trs:trig-star-bad-2 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - quoted triple outside triple" ;
-    mf:action    <trig-star-syntax-bad-02.trig> ;
-    .
-
-trs:trig-star-bad-3 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - collection list in quoted triple" ;
-    mf:action    <trig-star-syntax-bad-03.trig> ;
-    .
-
-trs:trig-star-bad-4 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - literal in subject position of quoted triple" ;
-    mf:action    <trig-star-syntax-bad-04.trig> ;
-    .
-
-trs:trig-star-bad-5 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - blank node  as predicate in quoted triple";
-    mf:action    <trig-star-syntax-bad-05.trig> ;
-    .
-
-trs:trig-star-bad-6 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - compound blank node expression";
-    mf:action    <trig-star-syntax-bad-06.trig> ;
-    .
-
-trs:trig-star-bad-7 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - incomplete quoted triple";
-    mf:action    <trig-star-syntax-bad-07.trig> ;
-    .
-
-trs:trig-star-bad-8 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - over-long quoted triple";
-    mf:action    <trig-star-syntax-bad-08.trig> ;
-    .
-
-## Annotation syntax
-
-trs:trig-star-ann-1 rdf:type rdft:TestTrigPositiveSyntax ;
-    mf:name      "TriG-star - Annotation form" ;
-    mf:action    <trig-star-annotation-1.trig> ;
-   .
-
-trs:trig-star-ann-2 rdf:type rdft:TestTrigPositiveSyntax ;
-    mf:name      "TriG-star - Annotation example" ;
-    mf:action    <trig-star-annotation-2.trig> ;
-    .
-
-## Bad annotation syntax
-
-trs:trig-star-bad-ann-1 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - empty annotation" ;
-    mf:action    <trig-star-syntax-bad-ann-1.trig> ;
-   .
-
-trs:trig-star-bad-ann-2 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - triple as annotation" ;
-    mf:action    <trig-star-syntax-bad-ann-2.trig> ;
-   .
-
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-1.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-1.trig
deleted file mode 100644
index 888c8519323..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-1.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p :o {| :r :z |} }
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-2.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-2.trig
deleted file mode 100644
index 0dc1e05fa96..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-annotation-2.trig
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :       <http://example/>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-:G {
-  :s :p :o {| :source [ :graph <http://host1/> ;
-                        :date "2020-01-20"^^xsd:date
-                      ] ;
-              :source [ :graph <http://host2/> ;
-                        :date "2020-12-31"^^xsd:date
-                      ]
-            |} .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-01.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-01.trig
deleted file mode 100644
index 6e718c72f3f..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-01.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  :x <<:s :p :o>> 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-02.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-02.trig
deleted file mode 100644
index e6514f3784e..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-02.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  <<:s :p :o>> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-03.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-03.trig
deleted file mode 100644
index 9dfe4b5b6b2..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-03.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p ("abc") .
-  <<:s :p ("abc") >> :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-04.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-04.trig
deleted file mode 100644
index 79845600504..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-04.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  <<3 :p :o >> :q :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-05.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-05.trig
deleted file mode 100644
index 8e78f14f870..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-05.trig
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  <<:s [] :o>> :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-06.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-06.trig
deleted file mode 100644
index 6c8797ff1ed..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-06.trig
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  <<:s :p [ :p1 :o1 ]  >> :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-07.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-07.trig
deleted file mode 100644
index d2a0e2c3455..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-07.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-
-:G {:s :p << :p :r >> .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-08.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-08.trig
deleted file mode 100644
index 03b67a3159c..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-08.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {:s :p << :g :s :p :o >> .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-1.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-1.trig
deleted file mode 100644
index 04548514dfa..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-1.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-:G {:s :p :o {|  |} .}
-
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-2.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-2.trig
deleted file mode 100644
index 1d74c2c6301..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bad-ann-2.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-:G {:a :b :c {| :s :p :o |} .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-01.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-01.trig
deleted file mode 100644
index acbd98a3ded..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-01.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  <<:s :p :o>> :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-02.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-02.trig
deleted file mode 100644
index f1033de44be..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-basic-02.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  :x :p <<:s :p :o>> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-01.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-01.trig
deleted file mode 100644
index e6051df2378..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-01.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  _:a :p :o .
-  <<_:a :p :o >> :q 456 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-02.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-02.trig
deleted file mode 100644
index 8d5ddd24641..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-02.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p _:a .
-  <<:s :p _:a >> :q 456 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-03.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-03.trig
deleted file mode 100644
index 65df001f512..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-bnode-03.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:G {<<[] :p [] >> :q :z .}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-compound.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-compound.trig
deleted file mode 100644
index b6f1816f24d..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-compound.trig
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :x :r :z .
-  :a :b :c .
-  <<:a :b :c>> :r :z .
-  <<:x :r :z >> :p <<:a :b :c>> .
-
-  << <<:x :r :z >> :p <<:a :b :c>> >>
-     :q
-  << <<:x :r :z >> :p <<:a :b :c>> >> .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-01.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-01.trig
deleted file mode 100644
index c88a87b6f48..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-01.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  [ :q <<:s :p :o>> ] :b :c .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-02.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-02.trig
deleted file mode 100644
index 472548249d8..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-inside-02.trig
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o1 .
-  :s :p :o2 .
-  ( <<:s :p :o1>> <<:s :p :o2>> )  :q 123 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-01.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-01.trig
deleted file mode 100644
index 6b0e977e946..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-01.trig
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-
-  <<:s :p :o >> :r :z .
-
-  << <<:s :p :o >> :r :z >> :q 1 .
-}
diff --git a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-02.trig b/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-02.trig
deleted file mode 100644
index 2a79fea91eb..00000000000
--- a/jena-arq/testing/rdf-star-cg/trig/syntax/trig-star-syntax-nested-02.trig
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-:G {
-  :s :p :o .
-  :a :q <<:s :p :o >> .
-  << :a :q <<:s :p :o >>>> :r :z .
-}
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/manifest.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/manifest.ttl
deleted file mode 100644
index a242635b406..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/manifest.ttl
+++ /dev/null
@@ -1,113 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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 test:   <http://www.w3.org/2001/sw/DataAccess/tests/>
-PREFIX rdft:   <http://www.w3.org/ns/rdftest#>
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/turtle/eval#>
-PREFIX dct:    <http://purl.org/dc/terms/>
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#>
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/>
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-   rdfs:label "Turtle-star Evaluation Tests"@en ;
-   skos:prefLabel "La suite des tests pour Turtle-star"@fr;
-   skos:prefLabel "Conjunto de pruebas para Turtle-star"@es;
-   dct:issued "2021-06-21"^^xsd:date ;
-   rdfs:seeAlso <https://w3c.github.io/rdf-tests/> ;
-   dct:modified "2021-07-18"^^xsd:date ;
-   dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-   dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    mf:entries
-    (
-        trs:turtle-star-1
-        trs:turtle-star-2
-        trs:turtle-star-bnode-1
-        trs:turtle-star-bnode-2
-        trs:turtle-star-annotation-1
-        trs:turtle-star-annotation-2
-        trs:turtle-star-annotation-3
-        trs:turtle-star-annotation-4
-        trs:turtle-star-annotation-5
-        trs:turtle-star-quoted-annotation-1
-        trs:turtle-star-quoted-annotation-2
-        trs:turtle-star-quoted-annotation-3
-    ) .
-
-trs:turtle-star-1 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - subject quoted triple" ;
-   mf:action    <turtle-star-eval-01.ttl> ;
-   mf:result    <turtle-star-eval-01.nt> ;
-   .
-
-trs:turtle-star-2 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - object quoted triple" ;
-   mf:action    <turtle-star-eval-02.ttl> ;
-   mf:result    <turtle-star-eval-02.nt> ;
-   .
-
-trs:turtle-star-bnode-1 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - blank node label" ;
-   mf:action    <turtle-star-eval-bnode-1.ttl> ;
-   mf:result    <turtle-star-eval-bnode-1.nt> ;
-   .
-
-trs:turtle-star-bnode-2 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - blank node labels" ;
-   mf:action    <turtle-star-eval-bnode-2.ttl> ;
-   mf:result    <turtle-star-eval-bnode-2.nt> ;
-   .
-
-trs:turtle-star-annotation-1 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation form" ;
-   mf:action    <turtle-star-eval-annotation-1.ttl> ;
-   mf:result    <turtle-star-eval-annotation-1.nt> ;
-   .
-
-trs:turtle-star-annotation-2 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation example" ;
-   mf:action    <turtle-star-eval-annotation-2.ttl> ;
-   mf:result    <turtle-star-eval-annotation-2.nt> ;
-   .
-
-trs:turtle-star-annotation-3 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation - predicate and object lists" ;
-   mf:action    <turtle-star-eval-annotation-3.ttl> ;
-   mf:result    <turtle-star-eval-annotation-3.nt> ;
-   .
-
-trs:turtle-star-annotation-4 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation - nested" ;
-   mf:action    <turtle-star-eval-annotation-4.ttl> ;
-   mf:result    <turtle-star-eval-annotation-4.nt> ;
-   .
-
-trs:turtle-star-annotation-5 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation object list" ;
-   mf:action    <turtle-star-eval-annotation-5.ttl> ;
-   mf:result    <turtle-star-eval-annotation-5.nt> ;
-   .
-
-trs:turtle-star-quoted-annotation-1 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation with quoting" ;
-   mf:action    <turtle-star-eval-quoted-annotation-1.ttl> ;
-   mf:result    <turtle-star-eval-quoted-annotation-1.nt> ;
-   .
-   
-trs:turtle-star-quoted-annotation-2 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation on triple with quoted subject" ;
-   mf:action    <turtle-star-eval-quoted-annotation-2.ttl> ;
-   mf:result    <turtle-star-eval-quoted-annotation-2.nt> ;
-   .
-   
-trs:turtle-star-quoted-annotation-3 rdf:type rdft:TestTurtleEval ;
-   mf:name      "Turtle-star - Annotation on triple with quoted object" ;
-   mf:action    <turtle-star-eval-quoted-annotation-3.ttl> ;
-   mf:result    <turtle-star-eval-quoted-annotation-3.nt> ;
-   .
-
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.nt
deleted file mode 100644
index 7f2be99c35e..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.nt
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.nt
deleted file mode 100644
index 28f1501673c..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.nt
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.ttl
deleted file mode 100644
index 6e76ac6d678..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-02.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:a :q <<:s :p :o>> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.nt
deleted file mode 100644
index 8165c5829b5..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.ttl
deleted file mode 100644
index fdba9df1d88..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o {| :r :z |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.nt
deleted file mode 100644
index 87450c5f33e..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.nt
+++ /dev/null
@@ -1,7 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-_:b1 <http://example/graph> <http://host1/> .
-_:b1 <http://example/date> "2020-01-20"^^<http://www.w3.org/2001/XMLSchema#date> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b1 .
-_:b2 <http://example/graph> <http://host2/> .
-_:b2 <http://example/date> "2020-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b2 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.ttl
deleted file mode 100644
index 06ef8eaf455..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-2.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :       <http://example/>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-:s :p :o {| :source [ :graph <http://host1/> ;
-                      :date "2020-01-20"^^xsd:date
-                    ] ;
-            :source [ :graph <http://host2/> ;
-                      :date "2020-12-31"^^xsd:date
-                    ]
-          |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.nt
deleted file mode 100644
index af17aa5da51..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.nt
+++ /dev/null
@@ -1,6 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> .
-<http://example/s> <http://example/p2> <http://example/o2> .
-<< <http://example/s> <http://example/p2> <http://example/o2> >> <http://example/a2> <http://example/b2> .
-<http://example/s> <http://example/p2> <http://example/o3> .
-<< <http://example/s> <http://example/p2> <http://example/o3> >> <http://example/a3> <http://example/b3> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.ttl
deleted file mode 100644
index 8b2bbd6a6eb..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-3.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o {| :a :b |};
-    :p2 :o2 {| :a2 :b2 |},
-        :o3 {| :a3 :b3 |}.
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.nt
deleted file mode 100644
index 4bf32e24089..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.nt
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> .
-<< << <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> >> <http://example/a2> <http://example/b2> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.ttl
deleted file mode 100644
index c07c701fe91..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-4.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o {| :a :b {| :a2 :b2 |} |}.
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.nt
deleted file mode 100644
index 1238d9259ca..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.nt
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o1> .
-<http://example/s> <http://example/p> <http://example/o2> .
-<< <http://example/s> <http://example/p> <http://example/o2> >> <http://example/a> <http://example/b> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.ttl
deleted file mode 100644
index 751dc679314..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-annotation-5.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o1, :o2 {| :a :b |} .
-
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.nt
deleted file mode 100644
index dcd268dd652..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-_:b9 <http://example/p> <http://example/o> .
-<< _:b9 <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.ttl
deleted file mode 100644
index a2c01fffa9b..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-1.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-_:b :p :o .
-<<_:b :p :o>> :q :z .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.nt
deleted file mode 100644
index 42dcac5d64a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-_:label1 <http://example/p1> _:label1 .
-<< _:label1 <http://example/p1> _:label1 >> <http://example/q> << _:label1 <http://example/p2> <http://example/o> >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.ttl
deleted file mode 100644
index 8b2e5425ba7..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-bnode-2.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-_:a :p1 _:a .
-<<_:a :p1 _:a >> :q <<_:a :p2 :o>> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.nt
deleted file mode 100644
index 31eba74f73a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<<<http://example/s> <http://example/p> <http://example/o>>> <http://example/r> <<<http://example/s1> <http://example/p1> <http://example/o1>>> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.ttl
deleted file mode 100644
index 5245264afb6..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o {| :r <<:s1 :p1 :o1>> |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.nt
deleted file mode 100644
index d7efbdfa7eb..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> .
-<<<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o>>> <http://example/r> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.ttl
deleted file mode 100644
index e4f702148e3..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-2.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-<<:s1 :p1 :o1>> :p :o {| :r :z |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.nt b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.nt
deleted file mode 100644
index a655abbd04a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>> .
-<<<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>>>> <http://example/r> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.ttl b/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.ttl
deleted file mode 100644
index f19ee115945..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-quoted-annotation-3.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p <<:s2 :p2 :o2>> {| :r :z |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/manifest.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/manifest.ttl
deleted file mode 100644
index c176bb3c5ee..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/manifest.ttl
+++ /dev/null
@@ -1,268 +0,0 @@
-## Distributed under both the "W3C Test Suite License" [1]
-## and the "W3C 3-clause BSD License".
-## [1] https://www.w3.org/Consortium/Legal/2008/04-testsuite-license
-## [2] https://www.w3.org/Consortium/Legal/2008/03-bsd-license
-
-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#> 
-PREFIX trs:    <https://w3c.github.io/rdf-star/tests/turtle/syntax#> 
-PREFIX dct:    <http://purl.org/dc/terms/> 
-PREFIX xsd:    <http://www.w3.org/2001/XMLSchema#> 
-PREFIX foaf:   <http://xmlns.com/foaf/0.1/> 
-PREFIX skos:    <http://www.w3.org/2004/02/skos/core#>
-
-trs:manifest  rdf:type mf:Manifest ;
-   rdfs:label "Turtle-star Syntax Tests"@en ;
-   skos:prefLabel "La suite des tests pour la syntaxe Turtle-star"@fr ;
-   skos:prefLabel "Conjunto de pruebas para la sintaxis Turtle-star"@es ;
-   dct:issued "2021-06-21"^^xsd:date ; 
-   dct:modified "2021-07-18"^^xsd:date ; 
-   dct:licence <https://www.w3.org/Consortium/Legal/2008/03-bsd-license> ;
-   dct:creator [ foaf:homepage <https://w3c.github.io/rdf-star/> ; foaf:name " RDF-star Interest Group within the W3C RDF-DEV Community Group" ] ;
-    mf:entries
-    (
-        trs:turtle-star-1
-        trs:turtle-star-2
-
-        trs:turtle-star-inside-1
-        trs:turtle-star-inside-2
-
-        trs:turtle-star-nested-1
-        trs:turtle-star-nested-2
-
-        trs:turtle-star-compound-1
-
-        trs:turtle-star-bnode-1
-        trs:turtle-star-bnode-2
-        trs:turtle-star-bnode-3
-
-        trs:turtle-star-bad-1
-        trs:turtle-star-bad-2
-        trs:turtle-star-bad-3
-        trs:turtle-star-bad-4
-        trs:turtle-star-bad-5
-        trs:turtle-star-bad-6
-        trs:turtle-star-bad-7
-        trs:turtle-star-bad-8
-
-        trs:turtle-star-ann-1
-        trs:turtle-star-ann-2
-        
-        trs:turtle-star-bad-ann-1
-        trs:turtle-star-bad-ann-2
-
-## The same data as the N-Triples-star syntax tests,
-## except in file *.ttl and "TestTurtle"
-
-        trs:nt-ttl-star-1
-        trs:nt-ttl-star-2
-        trs:nt-ttl-star-3
-        trs:nt-ttl-star-4
-        trs:nt-ttl-star-5
-
-        trs:nt-ttl-star-bnode-1
-        trs:nt-ttl-star-bnode-2
-
-        trs:nt-ttl-star-nested-1
-        trs:nt-ttl-star-nested-2
-
-        trs:nt-ttl-star-bad-1
-        trs:nt-ttl-star-bad-2
-        trs:nt-ttl-star-bad-3
-        trs:nt-ttl-star-bad-4
-    ) .
-
-## Good Syntax
-
-trs:turtle-star-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - subject quoted triple" ;
-   mf:action    <turtle-star-syntax-basic-01.ttl> ;
-   .
-
-trs:turtle-star-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - object quoted triple" ;
-   mf:action    <turtle-star-syntax-basic-02.ttl> ;
-   .
-
-trs:turtle-star-inside-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - quoted triple inside blankNodePropertyList" ;
-   mf:action    <turtle-star-syntax-inside-01.ttl> ;
-   .
-
-trs:turtle-star-inside-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - quoted triple inside collection" ;
-   mf:action    <turtle-star-syntax-inside-02.ttl> ;
-   .
-
-trs:turtle-star-nested-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - nested quoted triple, subject position" ;
-   mf:action    <turtle-star-syntax-nested-01.ttl> ;
-   .
-
-trs:turtle-star-nested-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - nested quoted triple, object position" ;
-   mf:action     <turtle-star-syntax-nested-02.ttl> ;
-   .
-
-trs:turtle-star-compound-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - compound forms" ;
-   mf:action    <turtle-star-syntax-compound.ttl> ;
-   .
-
-trs:turtle-star-bnode-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - blank node subject" ;
-   mf:action    <turtle-star-syntax-bnode-01.ttl> ;
-   .
-
-trs:turtle-star-bnode-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - blank node object" ;
-   mf:action    <turtle-star-syntax-bnode-02.ttl> ;
-   .
-
-trs:turtle-star-bnode-3 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "Turtle-star - blank node" ;
-   mf:action    <turtle-star-syntax-bnode-03.ttl> ;
-   .
-
-## Bad Syntax
-
-trs:turtle-star-bad-1 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - quoted triple as predicate" ;
-    mf:action    <turtle-star-syntax-bad-01.ttl> ;
-    .
-
-trs:turtle-star-bad-2 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - quoted triple outside triple" ;
-    mf:action    <turtle-star-syntax-bad-02.ttl> ;
-    .
-
-trs:turtle-star-bad-3 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - collection list in quoted triple" ;
-    mf:action    <turtle-star-syntax-bad-03.ttl> ;
-    .
-
-trs:turtle-star-bad-4 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - literal in subject position of quoted triple" ;
-    mf:action    <turtle-star-syntax-bad-04.ttl> ;
-    .
-
-trs:turtle-star-bad-5 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - blank node  as predicate in quoted triple";
-    mf:action    <turtle-star-syntax-bad-05.ttl> ;
-    .
-
-trs:turtle-star-bad-6 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - compound blank node expression";
-    mf:action    <turtle-star-syntax-bad-06.ttl> ;
-    .
-
-trs:turtle-star-bad-7 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - incomplete quoted triple";
-    mf:action    <turtle-star-syntax-bad-07.ttl> ;
-    .
-
-trs:turtle-star-bad-8 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - over-long quoted triple";
-    mf:action    <turtle-star-syntax-bad-08.ttl> ;
-    .
-
-## Annotation syntax
-
-trs:turtle-star-ann-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-    mf:name      "Turtle-star - Annotation form" ;
-    mf:action    <turtle-star-annotation-1.ttl> ;
-   .
-
-trs:turtle-star-ann-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-    mf:name      "Turtle-star - Annotation example" ;
-    mf:action    <turtle-star-annotation-2.ttl> ;
-    .
-
-## Bad annotation syntax
-
-trs:turtle-star-bad-ann-1 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - empty annotation" ;
-    mf:action    <turtle-star-syntax-bad-ann-1.ttl> ;
-   .
-
-trs:turtle-star-bad-ann-2 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "Turtle-star - bad - triple as annotation" ;
-    mf:action    <turtle-star-syntax-bad-ann-2.ttl> ;
-   .
-
-## --------------------------------------------------
-## Same data as the N-triples-star tests.
-## N-Triples is a subset of Turtle, and the same is true for the "star" feature.
-
-## Good Syntax
-
-trs:nt-ttl-star-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - subject quoted triple" ;
-   mf:action    <nt-ttl-star-syntax-1.ttl> ;
-   .
-
-trs:nt-ttl-star-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - object quoted triple" ;
-   mf:action    <nt-ttl-star-syntax-2.ttl> ;
-   .
-
-trs:nt-ttl-star-3 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - subject and object quoted triples" ;
-   mf:action    <nt-ttl-star-syntax-3.ttl> ;
-   .
-
-trs:nt-ttl-star-4 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - whitespace and terms" ;
-   mf:action    <nt-ttl-star-syntax-4.ttl> ;
-   .
-
-trs:nt-ttl-star-5 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - Nested, no whitespace" ;
-   mf:action    <nt-ttl-star-syntax-5.ttl> ;
-   .
-
-# Blank nodes
-
-trs:nt-ttl-star-bnode-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - Blank node subject" ;
-   mf:action    <nt-ttl-star-bnode-1.ttl> ;
-   .
-
-trs:nt-ttl-star-bnode-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - Blank node object" ;
-   mf:action    <nt-ttl-star-bnode-2.ttl> ;
-   .
-   
-trs:nt-ttl-star-nested-1 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - Nested subject term" ;
-   mf:action    <nt-ttl-star-nested-1.ttl> ;
-   .
-
-trs:nt-ttl-star-nested-2 rdf:type rdft:TestTurtlePositiveSyntax ;
-   mf:name      "N-Triples-star as Turtle-star - Nested object term" ;
-   mf:action    <nt-ttl-star-nested-2.ttl> ;
-   .
-
-## Bad syntax
- 
-trs:nt-ttl-star-bad-1 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "N-Triples-star as Turtle-star - Bad - quoted triple as predicate" ;
-    mf:action    <nt-ttl-star-bad-syntax-1.ttl> ;
-    .
-    
-trs:nt-ttl-star-bad-2 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "N-Triples-star as Turtle-star - Bad - quoted triple, literal subject" ;
-    mf:action    <nt-ttl-star-bad-syntax-2.ttl> ;
-    .
-
-trs:nt-ttl-star-bad-3 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "N-Triples-star as Turtle-star - Bad - quoted triple, literal predicate" ;
-    mf:action    <nt-ttl-star-bad-syntax-3.ttl> ;
-    .
-
-trs:nt-ttl-star-bad-4 rdf:type rdft:TestTurtleNegativeSyntax ;
-    mf:name      "N-Triples-star as Turtle-star - Bad - quoted triple, blank node predicate" ;
-    mf:action    <nt-ttl-star-bad-syntax-4.ttl> ;
-    .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-1.ttl
deleted file mode 100644
index 401f4b86147..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-1.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/a> << <http://example/s> <http://example/p>  <http://example/o> >>  <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-2.ttl
deleted file mode 100644
index 1e47b360026..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-2.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<< "XYZ" <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-3.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-3.ttl
deleted file mode 100644
index eaeb6f2a598..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-3.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> "XYZ" <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-4.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-4.ttl
deleted file mode 100644
index af41d206413..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bad-syntax-4.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> _:label <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-1.ttl
deleted file mode 100644
index 2d94448ce1a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-1.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-_:b0 <http://example/p> <http://example/o> .
-<< _:b0 <http://example/p> <http://example/o> >> <http://example/q> "ABC" .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-2.ttl
deleted file mode 100644
index 2dc337a9326..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-bnode-2.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://example/s> <http://example/p> _:b1 .
-<< <http://example/s> <http://example/p> _:b1 >> <http://example/q> "456"^^<http://www.w3.org/2001/XMLSchema#integer> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-1.ttl
deleted file mode 100644
index d6a50cbee9f..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> .
-<< << <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> >> <http://example/q> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-2.ttl
deleted file mode 100644
index 7a8d3131ba1..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-nested-2.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-<http://example/s> <http://example/p> <http://example/o> .
-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> .
-<< <http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> >> <http://example/r> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-1.ttl
deleted file mode 100644
index 7f2be99c35e..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-1.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-2.ttl
deleted file mode 100644
index 5aa2cb20018..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-2.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<http://example/x> <http://example/p> << <http://example/s> <http://example/p> <http://example/o> >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-3.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-3.ttl
deleted file mode 100644
index 16b9420af3d..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-3.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<< <http://example/s1> <http://example/p1> <http://example/o1> >> <http://example/q> << <http://example/s2> <http://example/p2> <http://example/o2> >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-4.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-4.ttl
deleted file mode 100644
index 6dc18c359bf..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-4.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<<<http://example/s1><http://example/p1><http://example/o1>>><http://example/q><<<http://example/s2><http://example/p2><http://example/o2>>>.
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-5.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-5.ttl
deleted file mode 100644
index 041b857392b..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/nt-ttl-star-syntax-5.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<<<<<http://example/s1><http://example/p1><http://example/o1>>><http://example/q1><<<http://example/s2><http://example/p2><http://example/o2>>>>><http://example/q2><<<<<http://example/s3><http://example/p3><http://example/o3>>><http://example/q3><<<http://example/s4><http://example/p4><http://example/o4>>>>>.
\ No newline at end of file
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-1.ttl
deleted file mode 100644
index fdba9df1d88..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o {| :r :z |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-2.ttl
deleted file mode 100644
index 06ef8eaf455..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-annotation-2.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :       <http://example/>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-:s :p :o {| :source [ :graph <http://host1/> ;
-                      :date "2020-01-20"^^xsd:date
-                    ] ;
-            :source [ :graph <http://host2/> ;
-                      :date "2020-12-31"^^xsd:date
-                    ]
-          |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-01.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-01.ttl
deleted file mode 100644
index 4a41e436c2d..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-01.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-:x <<:s :p :o>> 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-02.ttl
deleted file mode 100644
index 8a1fbb388b3..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-02.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-<<:s :p :o>> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-03.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-03.ttl
deleted file mode 100644
index 3952b24b61a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-03.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p ("abc") .
-<<:s :p ("abc") >> :q 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-04.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-04.ttl
deleted file mode 100644
index a69b6469df8..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-04.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-<<3 :p :o >> :q :z .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-05.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-05.ttl
deleted file mode 100644
index b1a45960a69..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-05.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-<<:s [] :o>> :q 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-06.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-06.ttl
deleted file mode 100644
index 687ef35c811..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-06.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-
-<<:s :p [ :p1 :o1 ]  >> :q 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-07.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-07.ttl
deleted file mode 100644
index 329e6d39b03..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-07.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p << :p :r >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-08.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-08.ttl
deleted file mode 100644
index 72ceff2e270..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-08.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p << :g :s :p :o >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-1.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-1.ttl
deleted file mode 100644
index 7f654f4ebc1..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-1.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :s :p :o {|  |} .
-}
-
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-2.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-2.ttl
deleted file mode 100644
index 1abed88fb9d..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bad-ann-2.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-:a :b :c {| :s :p :o |} .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-01.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-01.ttl
deleted file mode 100644
index 3874f92efe1..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-01.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-<<:s :p :o>> :q 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-02.ttl
deleted file mode 100644
index a2b95e77d64..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-basic-02.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-:x :p <<:s :p :o>> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-01.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-01.ttl
deleted file mode 100644
index 6591a66e1d7..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-01.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-_:a :p :o .
-<<_:a :p :o >> :q 456 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-02.ttl
deleted file mode 100644
index ac99ad739cc..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-02.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p _:a .
-<<:s :p _:a >> :q 456 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-03.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-03.ttl
deleted file mode 100644
index 95f8cf5f26c..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-bnode-03.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example/>
-
-<<[] :p [] >> :q :z .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-compound.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-compound.ttl
deleted file mode 100644
index df83d97048f..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-compound.ttl
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX : <http://example/>
-
-
-:x :r :z .
-:a :b :c .
-<<:a :b :c>> :r :z .
-<<:x :r :z >> :p <<:a :b :c>> .
-
-<< <<:x :r :z >> :p <<:a :b :c>> >>
-   :q
-<< <<:x :r :z >> :p <<:a :b :c>> >> .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-01.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-01.ttl
deleted file mode 100644
index ff87a146f03..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-01.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-[ :q <<:s :p :o>> ] :b :c .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-02.ttl
deleted file mode 100644
index 28e2590e071..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-inside-02.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o1 .
-:s :p :o2 .
-( <<:s :p :o1>> <<:s :p :o2>> )  :q 123 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-01.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-01.ttl
deleted file mode 100644
index 93a936cab73..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-01.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-
-<<:s :p :o >> :r :z .
-
-<< <<:s :p :o >> :r :z >> :q 1 .
diff --git a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-02.ttl b/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-02.ttl
deleted file mode 100644
index aec49ef4a7a..00000000000
--- a/jena-arq/testing/rdf-star-cg/turtle/syntax/turtle-star-syntax-nested-02.ttl
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example/>
-
-:s :p :o .
-:a :q <<:s :p :o >> .
-<< :a :q <<:s :p :o >>>> :r :z .
diff --git a/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/manifest.ttl b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/manifest.ttl
new file mode 100644
index 00000000000..c4d920128a6
--- /dev/null
+++ b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/manifest.ttl
@@ -0,0 +1,43 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+@prefix :       <manifest#> .
+@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 mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+@prefix dawgt:  <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:comment "Syntax tests Syntax SPARQL 1.2" ;
+    mf:entries
+    (
+(
+:test_1
+:test_2
+) .
+
+:test_1 rdf:type   mf:PositiveSyntaxTest12 ;
+   dawgt:approval dawgt:NotClassified ;
+   mf:name    "syntax-sparql12-01.rq" ;
+   mf:action  <syntax-sparql12-01.rq> ;
+   .
+
+:test_2 rdf:type   mf:PositiveSyntaxTest12 ;
+   dawgt:approval dawgt:NotClassified ;
+   mf:name    "syntax-sparql12-02.rq" ;
+   mf:action  <syntax-sparql12-02.rq> ;
+   .
diff --git a/jena-arq/testing/rdf-star-cg/sparql/eval/data-1.ttl b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-01.rq
similarity index 54%
rename from jena-arq/testing/rdf-star-cg/sparql/eval/data-1.ttl
rename to jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-01.rq
index 9fc49fd0514..2bc575c4260 100644
--- a/jena-arq/testing/rdf-star-cg/sparql/eval/data-1.ttl
+++ b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-01.rq
@@ -1,3 +1,2 @@
 PREFIX : <http://example/>
-
-<<:a :b :c>> :q :z .
+SELECT * { :s :p :o  }
diff --git a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.ttl b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-02.rq
similarity index 54%
rename from jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.ttl
rename to jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-02.rq
index ad4940b9f3b..2bc575c4260 100644
--- a/jena-arq/testing/rdf-star-cg/turtle/eval/turtle-star-eval-01.ttl
+++ b/jena-arq/testing/rdf12-wg/Syntax-SPARQL_12/syntax-sparql12-02.rq
@@ -1,3 +1,2 @@
 PREFIX : <http://example/>
-
-<<:s :p :o>> :q :z .
+SELECT * { :s :p :o  }
diff --git a/jena-arq/testing/rdf12-wg/gen-sparql-12.sh b/jena-arq/testing/rdf12-wg/gen-sparql-12.sh
new file mode 100755
index 00000000000..e3305ff6b18
--- /dev/null
+++ b/jena-arq/testing/rdf12-wg/gen-sparql-12.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+## Standalone generation for now.
+
+## SPARQL10="sparql10"
+## SPARQL11="sparql11"
+## SPARQL12="sparql12"
+## ARQ="arq"
+## SPARQL11U="sparql11update"
+## SPARQL12U="sparql12update"
+
+SPARQL12="sparql12"
+
+source syn-func12.sh
+
+(
+    cd Syntax-SPARQL_12
+    clean 
+    source ../syn-sparql_12.sh  
+    createManifest "Syntax SPARQL 1.2" '<manifest#>'
+)
diff --git a/jena-arq/testing/rdf12-wg/syn-func12.sh b/jena-arq/testing/rdf12-wg/syn-func12.sh
new file mode 100644
index 00000000000..ef555947a84
--- /dev/null
+++ b/jena-arq/testing/rdf12-wg/syn-func12.sh
@@ -0,0 +1,272 @@
+#!/bin/bash
+
+# Functions in support of syntax tests
+# Source this file.
+
+# Query
+## declare -a GOOD_S10
+## declare -a GOOD_S11
+## declare -a GOOD_S12
+## declare -a GOOD_ARQ
+## declare -a BAD_S10
+## declare -a BAD_S11
+## declare -a BAD_S12
+## declare -a BAD_ARQ
+
+declare -a GOOD_S12
+declare -a BAD_S12
+
+# Update
+## declare -a GOOD_U11
+## declare -a GOOD_U12
+## declare -a BAD_U11
+## declare -a BAD_U12
+## declare -a GOOD_ARQU
+## declare -a BAD_ARQU
+
+## declare -a GOOD_U12
+## declare -a BAD_U12
+
+function fname
+{
+    local BASE="$1"	# Base
+    local N="$2"	# Number
+    local EXT="$3"	# Extension
+    [ "$EXT" = "" ] && EXT="rq"
+    echo $(printf "$BASE%02d.$EXT" $N)
+}
+
+# reads from stdin
+function testGood
+{
+    if [ "$#" != 2 ]
+	then
+	echo "Problems with $*"
+    fi
+    local LANG="$1"
+    local FN="$2"
+    local I
+    case "$LANG" in
+## 	($SPARQL10)   I=${#GOOD_S10[*]} ; GOOD_S10[$I]=$FN ;;
+## 	($SPARQL11)   I=${#GOOD_S11[*]} ; GOOD_S11[$I]=$FN ;;
+## 	($SPARQL11U)  I=${#GOOD_U11[*]} ; GOOD_U11[$I]=$FN ;;
+## 	($SPARQL12)   I=${#GOOD_S12[*]} ; GOOD_S12[$I]=$FN ;;
+## 	($SPARQL12U   I=${#GOOD_U12[*]} ; GOOD_U12[$I]=$FN ;;
+## 	($ARQ)        I=${#GOOD_ARQ[*]} ; GOOD_ARQ[$I]=$FN ;;
+## 	($ARQU)       I=${#GOOD_ARQU[*]} ; GOOD_ARQU[$I]=$FN ;;
+
+	($SPARQL12)   I=${#GOOD_S12[*]} ; GOOD_S12[$I]=$FN ;;
+	
+	    *)      echo "Unrecognized: $*" ;;
+    esac
+
+    cat > $FN
+}
+
+# reads from stdin
+function testBad
+{
+    if [ "$#" != 2 ]
+	then
+	echo "Problems with $*"
+    fi
+    local LANG="$1"
+    local FN="$2"
+    local I
+    case "$LANG" in
+## 	($SPARQL10)  I=${#BAD_S10[*]} ; BAD_S10[$I]=$FN ;;
+## 	($SPARQL11)  I=${#BAD_S11[*]} ; BAD_S11[$I]=$FN ;;
+## 	($SPARQL12)  I=${#BAD_S12[*]} ; BAD_S12[$I]=$FN ;;
+## 	($SPARQL11U) I=${#BAD_U11[*]} ; BAD_U11[$I]=$FN ;;
+## 	($SPARQL12U) I=${#BAD_U12[*]} ; BAD_U12[$I]=$FN ;;
+## 	($ARQ)       I=${#BAD_ARQ[*]} ; BAD_ARQ[$I]=$FN ;;
+## 	($ARQU)      I=${#BAD_ARQU[*]} ; BAD_ARQU[$I]=$FN ;;
+
+	($SPARQL12)  I=${#BAD_S12[*]} ; BAD_S12[$I]=$FN ;;
+	    *)      echo "Unrecognized: $*" ;;
+    esac
+
+    cat > $FN
+}
+
+function clean
+{
+    rm -f *.rq
+    rm -f *.arq
+    rm -f *.ttl
+}
+
+function output
+{
+    local FN="$1"
+    local TYPE="$2"
+    
+    I="$(($I+1))"
+    local N=":test_$I"
+    local E="\n"
+    E="${E}$N rdf:type   $TYPE ;"
+    E="${E}\n   dawgt:approval dawgt:NotClassified ;" ;
+    E="${E}\n   mf:name    \"$FN\" ;" 
+    E="${E}\n   mf:action  <$FN> ;"
+    E="${E}\n   ."
+
+    ENTRIES="${ENTRIES}$E\n"
+    ITEMS="${ITEMS}$N\n"
+}
+    
+function outputLicense
+{
+    cat <<EOF
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+# 
+#       http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+EOF
+
+}
+
+function createManifest
+{
+    if [ "$#" != 2 ]
+    then
+	echo "Wrong number of arguments to createManifest" 1>&2
+	exit 1
+    fi
+
+    local LABEL="$1"
+    local URI="$2"
+## Header
+    (
+	outputLicense
+	cat <<EOF
+@prefix :       $URI .
+@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 mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
+@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
+@prefix dawgt:  <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
+
+<>  rdf:type mf:Manifest ;
+    rdfs:comment "Syntax tests $LABEL" ;
+    mf:entries
+EOF
+
+    )> manifest.ttl
+
+# Build the manifest list.
+# Build the manifest items.
+
+##     # These are globals.
+##     ENTRIES=""
+##     ITEMS=""
+##     I=0
+## 
+##     # SPARQL 1.0
+##     for f in "${GOOD_S10[@]}"
+##     do
+##       output "$f" "mf:PositiveSyntaxTest"
+##       done
+## 
+##     for f in "${BAD_S10[@]}"
+##     do
+##       output "$f" "mf:NegativeSyntaxTest"
+##       done
+## 
+##     # SPARQL 1.1
+##     for f in "${GOOD_S11[@]}"
+##     do
+##       output "$f" "mf:PositiveSyntaxTest11"
+##       done
+## 
+##     for f in "${BAD_S11[@]}"
+##     do
+##       output "$f" "mf:NegativeSyntaxTest11"
+##       done
+## 
+##     # SPARQL 1.2
+##     for f in "${GOOD_S12[@]}"
+##     do
+## 	# Reuse PositiveSyntaxTest12
+##       output "$f" "mf:PositiveSyntaxTest12"
+##       done
+## 
+##     for f in "${BAD_S12[@]}"
+##     do
+##       output "$f" "mf:NegativeSyntaxTest12"
+##       done
+## 
+##     # ARQ
+##     for f in "${GOOD_ARQ[@]}"
+##     do
+##       output "$f" "mfx:PositiveSyntaxTestARQ"
+##       done
+## 
+##     for f in "${BAD_ARQ[@]}"
+##     do
+##       output "$f" "mfx:NegativeSyntaxTestARQ"
+##       done
+## 
+##     # SPARQL 1.1 Update
+##     for f in "${GOOD_U11[@]}"
+##     do
+##       output "$f" "mf:PositiveUpdateSyntaxTest11"
+##       done
+## 
+##     for f in "${BAD_U11[@]}"
+##     do
+##       output "$f" "mf:NegativeUpdateSyntaxTest11"
+##       done
+## 
+##     # SPARQL 1.2 Update
+##     for f in "${GOOD_U12[@]}"
+##     do
+##       output "$f" "mf:PositiveUpdateSyntaxTest12" ## 
+##       done
+## 
+##     for f in "${BAD_U12[@]}"
+##     do
+##       output "$f" "mf:NegativeUpdateSyntaxTest12" ##
+##       done
+## 
+##     # ARQ 1.1 Update
+##     for f in "${GOOD_ARQU[@]}"
+##     do
+##       output "$f" "mf:PositiveUpdateSyntaxTestARQ"
+##       done
+## 
+##     for f in "${BAD_ARQ11[@]}"
+##     do
+##       output "$f" "mf:NegativeUpdateSyntaxTestARQ"
+##       done
+
+    # SPARQL 1.2
+    for f in "${GOOD_S12[@]}"
+    do
+	# Reuse PositiveSyntaxTest12
+      output "$f" "mf:PositiveSyntaxTest12"
+      done
+
+    for f in "${BAD_S12[@]}"
+    do
+      output "$f" "mf:NegativeSyntaxTest12"
+      done
+
+    (
+	echo '('
+	echo -e -n "$ITEMS"
+	echo ') .'
+	echo -e -n "$ENTRIES"
+    )  >> manifest.ttl
+}
diff --git a/jena-arq/testing/rdf12-wg/syn-sparql_12.sh b/jena-arq/testing/rdf12-wg/syn-sparql_12.sh
new file mode 100644
index 00000000000..660ae692ee5
--- /dev/null
+++ b/jena-arq/testing/rdf12-wg/syn-sparql_12.sh
@@ -0,0 +1,137 @@
+#!/usr/bin/bash
+
+N=0
+N=$((N+1)) ; testGood $SPARQL12 $(fname "syntax-sparql12-" $N) <<EOF
+PREFIX : <http://example/>
+SELECT * { :s :p :o  }
+EOF
+
+##    ## Basics not broken.
+##     @Test public void basic_01() { testSyntaxFragment("{ :s :p :o  }") ; }
+##     @Test public void basic_02() { testSyntaxFragment("{ :s :p :o . }") ; }
+##     @Test public void basic_03() { testSyntaxFragment("{ :s :p :o ; :p2 :o2 }") ; }
+##     @Test public void basic_04() { testSyntaxFragment("{ :s :p :o ; :p2 :o2 . }") ; }
+## 
+##     ## Triple terms.
+##     @Test public void tripleTerm_01() { testSyntaxFragment("{ :s :p <<(:s :p :o )>> }"); }
+##     @Test public void tripleTerm_02() { testSyntaxFragment("{ :s :p <<(:s :p :o )>> .}"); }
+##     @Test public void tripleTerm_03() { testSyntaxFragment("{ :s :p <<( ?x ?p ?z )>> .}"); }
+##     ## SPARQL is symmetric, as it is with literals.
+##     @Test public void tripleTerm_04() { testSyntaxFragment("{ <<( ?x ?p ?z )>> :p <<( ?x ?p ?z )>> .}"); }
+## 
+##     ## Blank node annotation
+##     @Test public void annotation_1() { testSyntaxFragment("{ :s :p :o {| :q :r |} . }");}
+##     @Test public void annotation_2() { testSyntaxFragment("{ :s :p :o {| :q1 :r1 ; :q2 :r2 ; |} }");}
+##     @Test public void annotation_3() { testSyntaxFragment("{ :s :p :o {| :x :y |} ; :q :r . }");}
+##     @Test public void annotation_4() { testSyntaxFragment("{ :s :p :o {| :x1 :y1 |} {| :x2 :y2 |} }"); }
+## 
+##     ## Now bad syntax
+##     @Test public void annotation_bad_empty_1() { testSyntaxFragmentBad("{ :s :p :o {|  |}  }");}
+##     @Test public void annotation_bad_empty_2() { testSyntaxFragmentBad("{ :s :p :o {| |} ; :q :r }");}
+## 
+##     ## Old syntax
+##     @Test public void annotation_bad_1() { testSyntaxFragmentBad("{ :s :p :o ~(:e) . }"); }
+##     @Test public void annotation_bad_2() { testSyntaxFragmentBad("{ :s :p/:q :o ~ . }"); }
+##     @Test public void annotation_bad_3() { testSyntaxFragmentBad("{ :s :p/:q :o {| :x :y |} }"); }
+##     @Test public void annotation_bad_4() { testSyntaxFragmentBad("{ :s :p :o | :e . }"); }
+## 
+##     ## Reifier+Annotation
+##     @Test public void reifierAnnotation_1() { testSyntaxFragment("{ :s :p :o ~:e . }"); }
+##     @Test public void reifierAnnotation_2() { testSyntaxFragment("{ :s :p :o ~ . }"); }
+##     @Test public void reifierAnnotation_3() { testSyntaxFragment("{ :s :p :o ~[] . }"); }
+##     @Test public void reifierAnnotation_4() { testSyntaxFragment("{ :s :p :o ~:e {| :q :r |} }"); }
+##     @Test public void reifierAnnotation_5() { testSyntaxFragment("{ :s :p :o ~ {| :x :y |} ; :q :r . }"); }
+## 
+##     ## Multiple reifiers, multiple annotation
+##     @Test public void reifierAnnotation_10() { testSyntaxFragment("{ :s :p :o ~:e ~ .}");}
+##     @Test public void reifierAnnotation_11() { testSyntaxFragment("{ :s :p :o ~:e ~:r }");}
+##     @Test public void reifierAnnotation_12() { testSyntaxFragment("{ :s :p :o ~ ~ {| :y :z|}  }");}
+##     @Test public void reifierAnnotation_13() { testSyntaxFragment("{ :s :p :o ~:e {| :q :r |} ~:r {| :q :r |} ~:r } ");}
+##     @Test public void reifierAnnotation_14() { testSyntaxFragment("{ :s :p :o {| :q :r |} {| :q :r |} .}"); }
+##     @Test public void reifierAnnotation_15() { testSyntaxFragment("{ :s :p :o ~  {| :x :y |} ; :q :r . }");}
+## 
+##     @Test public void reifierVarAnnotation_1() { testSyntaxFragment("{ :s :p :o ~?v .}");}
+##     @Test public void reifierVarAnnotation_2() { testSyntaxFragment("{ :s :p :o ~?v ; :q :r }");}
+##     @Test public void reifierVarAnnotation_3() { testSyntaxFragment("{ :s :p :o ~?v {| :x :y |} ; :q :r }");}
+## 
+##     ## Reified triple
+##     @Test public void reifiedTriple_1() { testSyntaxFragment("{ << :s :p :o >> . }");}
+##     @Test public void reifiedTriple_2() { testSyntaxFragment("{ << :s :p :o >> :p :r . }");}
+##     @Test public void reifiedTriple_3() { testSyntaxFragment("{ :x :y << :s :p :o >> . }");}
+##     @Test public void reifiedTriple_4() { testSyntaxFragment("{ :x :y << << :s :p :o1 >> :p :o2 >> . }");}
+##     @Test public void reifiedTriple_5() { testSyntaxFragment("{ :x :y << :s1 :p << :s2 :p :o >>  >> . }");}
+## 
+##     @Test public void reifiedTriple_6() { testSyntaxFragment("{ << :s :p :o ~:e >> . }");}
+##     @Test public void reifiedTriple_7() { testSyntaxFragment("{ << :s :p :o ~ >> . }");}
+##     @Test public void reifiedTriple_8() { testSyntaxFragment("{ << :s :p :o ~ [] >> . }");}
+##     @Test public void reifiedTriple_9() { testSyntaxFragment("{ :a :b << :s :p :o ~:e >> . }");}
+## 
+##     @Test public void reifierTriple_bad_1() { testSyntaxFragmentBad("{ << :s :p :o ~:e1 ~:e2 >> . }"); }
+##     @Test public void reifierTriple_bad_2() { testSyntaxFragmentBad("{ << :s :p :o ~(:e) >> . }"); }
+##     @Test public void reifierTriple_bad_3() { testSyntaxFragmentBad("{ << :s :p :o ~() >> . }"); }
+##     @Test public void reifierTriple_bad_4() { testSyntaxFragmentBad("{ << :s :p/:q :o ~() >> . }"); }
+##     @Test public void reifierTriple_bad_5() { testSyntaxFragmentBad("{ << :s :p :o | :r >> . }"); }
+## 
+##     ## Nesting
+##     @Test public void reifierReifiedTriple_nested_1() { testSyntaxFragment("{ << :s :p << :s :p :o >> >> :y :z }");}
+## 
+##     @Test public void reifierVarReifiedTriple_1() { testSyntaxFragment("{ << :s :p :o ~?v >> . }");}
+##     @Test public void reifierVarReifiedTriple_2() { testSyntaxFragment("{ :a :b << :s :p :o ~?v >> . }");}
+## 
+##     @Test public void reifierMultipleReifiedTriple_bad_1() { testSyntaxFragmentBad("{ << :s :p :o ~:e1 ~:e2 >> . }");}
+## 
+##     ## In larger units.
+##     @Test public void reifierData_1() { testSyntaxFragment("{ :x :q << :s :p :o >> . }");}
+##     @Test public void reifierData_2() { testSyntaxFragment("{ :x :q << :s :p :o ~:e >> . }");}
+##     @Test public void reifierData_3() { testSyntaxFragment("{ :x :q << :s :p :o ~:e >> ; :x :y }");}
+##     @Test public void reifierData_4() { testSyntaxFragment("{ :s :p :o . :x :q << :s :p :o ~:e >> ; :x :y }");}
+##     @Test public void reifierData_5() { testSyntaxFragment("{ :s :p :o . << :s :p :o ~:e >> . :e :x :y }");}
+## 
+##     ## Variables.
+##     @Test public void reifierAnnotationVars_1()     { testSyntaxFragment("{ :s :p :o {| ?x ?y |} {| :x2 :y2 |} }"); }
+##     @Test public void reifierAnnotationVars_2()     { testSyntaxFragment("{ :s :p :o ~?v1 ~?v2 }"); }
+## 
+##     ## Variables.
+##     @Test public void reifierReifiedTriplesVars_1()  { testSyntaxFragment("{  << ?s ?p ?o ~?e >> }"); }
+##     @Test public void reifierReifiedTriplesVars_2()  { testSyntaxFragment("{  << ?s ?p ?o ~?e >> ?p ?q }"); }
+## 
+##     ## Expressions.
+##     @Test public void exprTripleTerm_1() { testSyntaxFragment("{ FILTER(?x = <<( :s :p :o )>>) }"); }
+##     @Test public void exprTripleterm_2() { testSyntaxFragment("{ FILTER(sameTerm(?x, <<( :s :p :o )>>)) }"); }
+##     ## Expressions.
+##     @Test public void exprTripleTerm_bad_1() { testSyntaxFragmentBad("{ FILTER(?x = << :s :p :o >>) }"); }
+## 
+##     ## VALUES
+##     @Test public void valuesTripleTerm_1() { testSyntaxFragment("{ VALUES ?x { :x <<( :s :p :o )>> } }"); }
+##     @Test public void valuesTripleTerm_2() { testSyntaxFragment("{ VALUES (?x ?y) { (:x <<( :s :p :o )>>) } }"); }
+## 
+##     @Test public void valuesTripleTerm_bad_1() { testSyntaxFragmentBad("{ VALUES ?x { :x << :s :p :o >> } }"); }
+##     @Test public void valuesTripleTerm_bad_2() { testSyntaxFragmentBad("{ VALUES ?x { :x <<( ?s ?p ?o )>> } }"); }
+## 
+##     ## Old syntax
+##     @Test public void oldSyntax_1() { testSyntaxFragmentBad("{ << :r | :s :p :o >> :x : y  }"); }
+##     @Test public void oldSyntax_2() { testSyntaxFragmentBad("{ :s :p :o {| :r | : q :x |} }"); }
+## 
+##     @Test public void reifierData_10() { testSyntaxFragment("""
+##                     {
+##                       :s :p1 1 ;
+##                          :p2 22 {| :a 99 |} {| :a 98 |} ~:e ;
+##                          :p3 2 ,
+##                              3 {| :a 99 |} {| :a 98 |} ~?v ~:e1 ~:e2 ;
+##                          :x :y
+##                     }
+##                     """
+##             );}
+## 
+##     ## Old alternative.
+##     @Test public void annotationReifierList_1() { testSyntaxFragmentBad("{ :s :p :o ~(:e1 :e2) }");}
+##     @Test public void annotationReifierList_2() { testSyntaxFragmentBad("{ :s :p :o ~() }");}
+## 
+##     ## CONSTRUCT patterns.
+##     @Test public void construct_1() { testSyntaxQuery("CONSTRUCT { :s :p :o ~:e } WHERE {}"); }
+##     @Test public void construct_2() { testSyntaxQuery("CONSTRUCT { :s :p :o {| :q 'ABC' |} } WHERE {}"); }
+##     @Test public void construct_3() { testSyntaxQuery("CONSTRUCT { :s :p <<( :a :b :c )>> } WHERE {}"); }
+##     @Test public void construct_4() { testSyntaxQuery("CONSTRUCT { :s :p <<( :a :b  <<( :d :e :f )>> )>> } WHERE {}"); }
+## 
+##     @Test public void construct_10() { testSyntaxQuery("CONSTRUCT { :s :p << :x :y :z >> } WHERE {}"); }
+##     @Test public void construct_11() { testSyntaxQuery("CONSTRUCT { << :x :y :z >> :q :z } WHERE {}"); }
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java
index 286d83ad4d7..ae0efecaa52 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java
@@ -157,6 +157,7 @@ private final void setCurrChar(int ch) {
         currChar = ch;
     }
 
+    /** Next character or EOF. Sets peekChar. */
     public final int readChar() {
         return nextChar();
     }
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java
index 8856ef9df05..8d9126184a6 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorBlockingQueue.java
@@ -24,46 +24,45 @@
 
 /** Iterator over a blocking queue until queue end seen */
 
-public class IteratorBlockingQueue<T> implements Iterator<T>
-{
-    private BlockingQueue<T> queue ;
-    private boolean finished = false ;
-    private T slot = null ;
-    private T endMarker ;
+public class IteratorBlockingQueue<T> implements Iterator<T> {
+    private BlockingQueue<T> queue;
+    private boolean finished = false;
+    private T slot = null;
+    private T endMarker;
 
-    public IteratorBlockingQueue(BlockingQueue<T> queue, T endMarker) { this.queue = queue ; this.endMarker = endMarker ; }
+    public IteratorBlockingQueue(BlockingQueue<T> queue, T endMarker) {
+        this.queue = queue;
+        this.endMarker = endMarker;
+    }
 
     @Override
-    public boolean hasNext()
-    {
-        if ( finished ) return false ;
-        if ( slot != null ) return true ;
-        try
-        {
-            slot = queue.take() ;
-            if ( slot == endMarker )
-            {
-                finished = true ;
-                slot = null ;
-                return false ;
+    public boolean hasNext() {
+        if ( finished )
+            return false;
+        if ( slot != null )
+            return true;
+        try {
+            slot = queue.take();
+            if ( slot == endMarker ) {
+                finished = true;
+                slot = null;
+                return false;
             }
-            return true ;
+            return true;
 
-        } catch (InterruptedException ex)
-        {
+        } catch (InterruptedException ex) {
             ex.printStackTrace();
 
         }
-        return false ;
+        return false;
     }
 
     @Override
-    public T next()
-    {
-        if ( ! hasNext() )
-            throw new NoSuchElementException() ;
-        T item = slot ;
-        slot = null ;
-        return item ;
+    public T next() {
+        if ( !hasNext() )
+            throw new NoSuchElementException();
+        T item = slot;
+        slot = null;
+        return item;
     }
 }
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
index 8d01eb160ec..04b82cfd9cf 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
@@ -26,7 +26,9 @@
 
 /**
  * Iterator of Iterators IteratorConcat is better when there are lots of iterators to
- * be joined. IteratorCons is slightly better for two iterators.
+ * be joined.
+ * <p>
+ * {@link IteratorCons} is slightly better for two iterators.
  */
 
 public class IteratorConcat<T> implements IteratorCloseable<T> {
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
index e4d3122d6ea..f8652314cbd 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
@@ -25,10 +25,11 @@
 import org.apache.jena.atlas.lib.Lib;
 
 /**
- * IteratorCons : the concatenation of two iterators. See also
- * {@link IteratorConcat}. If there potentially many iterators to be joined, it is
- * better to create an IteratorConcat explicitly and add each iterator. IteratorCons
- * is slightly better in the two iterator case.
+ * IteratorCons : the concatenation of two iterators.
+ * <p>
+ * See also {@link IteratorConcat}. If there potentially many iterators to be joined,
+ * it is better to create an IteratorConcat explicitly and add each iterator.
+ * IteratorCons is slightly better in the two iterator case.
  */
 public class IteratorCons<T> implements IteratorCloseable<T> {
     // No - we don't really need IteratorCons and IteratorConcat
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java
deleted file mode 100644
index 921f822d1ca..00000000000
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.atlas.iterator;
-
-import java.util.Iterator ;
-import java.util.function.Consumer;
-
-public class IteratorInteger implements Iterator<Long>
-{
-    private final long start ;
-    private final long finish ;
-    private long current ;
-
-    public static IteratorInteger range(long start, long finish)
-    {
-        return new IteratorInteger(start, finish) ;
-    }
-
-
-    /** [start, finish) */
-    public IteratorInteger(long start, long finish)
-    {
-        this.start = start ;
-        this.finish = finish ;
-        this.current = start ;
-    }
-
-    @Override
-    public boolean hasNext()
-    {
-        return ( current < finish ) ;
-    }
-
-    @Override
-    public Long next()
-    {
-        return current++;
-    }
-
-    @Override
-    public void forEachRemaining(Consumer<? super Long> action) {
-        while (current < finish) {
-            action.accept(current);
-            current++;
-        }
-    }
-}
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java
index bf94c938b48..cefdcd54ab1 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/NullIterator.java
@@ -25,6 +25,8 @@
 
 /**
  *  Null Iterator - also guaranteed shareable and immutable
+ *  <p>
+ *  @deprecated Use {@link Iter#nullIterator()}.
  */
 @Deprecated
 public class NullIterator<T> implements Iterator<T> {
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
index 788ef3540a8..fc291f4a1c9 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
@@ -21,29 +21,34 @@
 import java.util.Iterator ;
 import java.util.NoSuchElementException ;
 
-public class SingletonIterator<T> implements Iterator<T>
-{
-    private T thing = null ;
-    private boolean yielded = false ;
+/**
+ * Use {@link Iter#singletonIterator}.
+ */
+public class SingletonIterator<T> implements Iterator<T> {
+    private T thing = null;
+    private boolean yielded = false;
+
+    public static <X> Iterator<X> create(X item){ return new SingletonIterator<>(item); }
 
-    public SingletonIterator(T thing) { this.thing = thing ; }
+    /*package*/ SingletonIterator(T thing) {
+        this.thing = thing;
+    }
 
     @Override
-    public boolean hasNext()
-    {
-        return ! yielded ;
+    public boolean hasNext() {
+        return !yielded;
     }
 
     @Override
-    public T next()
-    {
+    public T next() {
         if ( yielded )
-            throw new NoSuchElementException("SingletonIterator.next") ;
-        yielded = true ;
-        return thing ;
+            throw new NoSuchElementException("SingletonIterator.next");
+        yielded = true;
+        return thing;
     }
 
     @Override
-    public void remove()
-    { throw new UnsupportedOperationException("SingletonIterator.remove") ;}
+    public void remove() {
+        throw new UnsupportedOperationException("SingletonIterator.remove");
+    }
 }
diff --git a/jena-cmds/src/main/java/riotcmd/utf8.java b/jena-cmds/src/main/java/riotcmd/utf8.java
index a2af9f3394a..8d9bb0c04da 100644
--- a/jena-cmds/src/main/java/riotcmd/utf8.java
+++ b/jena-cmds/src/main/java/riotcmd/utf8.java
@@ -61,7 +61,6 @@ public static void main(String... args) {
                     } else
                         colNum++ ;
                     if ( ! Character.isBmpCodePoint(ch) ) {
-
                         char[] utf16 = Character.toChars(ch);
                         if ( utf16.length > 1 )
                             System.out.printf("Codepoint: 0x%04X hi:0x%04X lo:0x%04X\n", ch, (int)utf16[0], (int)utf16[1]);
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFDirLangString.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFDirLangString.java
index fde1913b04f..cae9eac9ce9 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFDirLangString.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFDirLangString.java
@@ -26,7 +26,7 @@
 import org.apache.jena.vocabulary.RDF;
 
 /**
- * {@code rdf:dirLangString} - a literal with language and initial text direction.
+ * {@code rdf:dirLangString} - a literal with language and base direction.
  * <p>
  * This covers the unusual case of {@code "foo"^^rdf:dirLangString}.
  */
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java
index fe78888abc2..17b95faa242 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java
@@ -26,7 +26,7 @@
 import org.apache.jena.vocabulary.RDF;
 
 /**
- * {@code rdf:dirLangString} - a literal with language and initial text direction.
+ * {@code rdf:langString} - a literal with language and no base direction.
  * <p>
  * This covers the unusual case of {@code "foo"^^rdf:langString}.
  * When there is a language tag, there is a lexical form but it is in two parts lex@lang.
diff --git a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
index 59ff551d0d3..4e72d927650 100644
--- a/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
+++ b/jena-core/src/main/java/org/apache/jena/enhanced/EnhNode.java
@@ -87,14 +87,14 @@ public final boolean isURIResource() {
         An enhanced node is a statement resource iff its underlying node is a triple term (RDF-star).
      */
     public final boolean isStmtResource() {
-        return node.isNodeTriple();
+        return node.isTripleTerm();
     }
 
     /**
         An enhanced node is a resource if it's node is a URI node, a blank node or a triple term.
     */
     public final boolean isResource() {
-        return node.isURI() || node.isBlank() || node.isNodeTriple();
+        return node.isURI() || node.isBlank() || node.isTripleTerm();
     }
     
     /**
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node.java b/jena-core/src/main/java/org/apache/jena/graph/Node.java
index 2f92e8c0d40..dd688836480 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node.java
@@ -60,8 +60,8 @@ public abstract class Node implements Serializable {
     public static final String noLangTag = "";
 
     /**
-     * The TextDirection used when a literal does not have an initial text direction setting.
-     * Accessing the initial text direction of a non-literal will throw an exception.
+     * The TextDirection used when a literal does not have an base direction setting.
+     * Accessing the base direction of a non-literal will throw an exception.
      * @see Util#hasDirection(Node)
      */
     public static final TextDirection noTextDirection = null;
@@ -117,9 +117,17 @@ public boolean isVariable()
     /**
      * Answer true iff this node is an "triple node" (RDF-star)
      */
-    public boolean isNodeTriple()
+    public boolean isTripleTerm()
     { return false; }
 
+    /**
+     * Answer true iff this node is an "triple node" (RDF-star)
+     * @deprecated use {@link #isTripleTerm}
+     */
+    @Deprecated(forRemoval = true)
+    public boolean isNodeTriple()
+    { return isTripleTerm(); }
+
     /**
      * Answer true iff this node is an "graph node" (N3 formula). This is not related
      * to named graphs.
@@ -166,12 +174,12 @@ public String getLiteralLexicalForm()
     public String getLiteralLanguage()
     { throw new NotLiteral( this ); }
 
-    /** Return the initial text direction for an rdf:dirLangString literal.
-     * Does not return null if the literal is a rdf:dirLangString literal.
-     * Returns null if the text direction is not set (and the datatype won't be rdf:dirLangString).
+    /**
+     * Return the base direction for a literal.
+     * Returns null if the node is a literal and does not have a base direction.
      * Otherwise die horribly.
      */
-    public TextDirection getLiteralTextDirection()
+    public TextDirection getLiteralBaseDirection()
     { throw new NotLiteral( this ); }
 
     /**
diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
index 4979cb06c81..5d238f23c88 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
@@ -105,13 +105,15 @@ public static Node createLiteralString(String string) {
      *
      * @deprecated Use {@link #createLiteralLang(String, String)}.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public static Node createLiteral(String string, String lang) {
         return createLiteralLang(string, lang);
     }
 
     /**
      * Make a literal with specified language. The lexical form must not be null.
+     * <p>
+     * If the {@code lang} contains "--" it is interpreted as including a base direction.
      *
      * @param string  the lexical form of the literal
      * @param lang    the optional language tag
@@ -120,23 +122,40 @@ public static Node createLiteralLang(String string, String lang) {
         Objects.requireNonNull(string, "null lexical form for literal");
         if ( isEmpty(lang) )
             return new Node_Literal(string);
-        else {
-           String langFmt = formatLanguageTag(lang);
-           return new Node_Literal(string, langFmt);
+
+        int idx = lang.indexOf("--");
+        if ( idx >= 0 ) {
+            String textDir = lang.substring(idx+2);
+            if ( textDir.isEmpty() )
+                throw new JenaException("Empty base direction after '--'");
+            lang = lang.substring(0, idx);
+            return createLiteralDirLang(string, lang, textDir);
         }
+        String langFmt = formatLanguageTag(lang);
+        return new Node_Literal(string, langFmt);
     }
 
     /**
      * Make a literal with specified language and language direction.
      * The lexical form must not be null.
-     * The language must not be null if a non-direction is provided.
+     * The language must not be null or "" if a non-direction is provided.
      *
      * @param string  the lexical form of the literal
      * @param lang    the optional language tag
      * @param textDir the optional language direction
      */
     public static Node createLiteralDirLang(String string, String lang, String textDir) {
-        TextDirection textDirEnum = initialTextDirection(textDir);
+        boolean emptyDirection = textDir == null || textDir.isEmpty();
+        if ( lang == null || lang.isEmpty() ) {
+            if ( ! emptyDirection )
+                throw new JenaException("No langtag but base direction is given");
+            return createLiteralString(string);
+        }
+        if ( lang.contains("--") && ! emptyDirection )
+            throw new JenaException("Langtag contains '--' and  a base direction is given");
+        if ( emptyDirection )
+            return createLiteralLang(string, lang);
+        TextDirection textDirEnum = baseDirection(textDir);
         String langFmt = formatLanguageTag(lang);
         return createLiteralDirLang(string, langFmt, textDirEnum);
     }
@@ -162,8 +181,9 @@ public static Node createLiteralDirLang(String string, String lang, TextDirectio
      * Build a literal node.
      * <p>
      * This is a convenience operation for passing in language and datatype without
-     * needing the caller to differentiate between the xsd:string, rdf:langString and other
-     * datatype cases.
+     * needing the caller to differentiate between the xsd:string, rdf:langString, rdf:dirLangString
+     * and other datatype cases.
+     * <p>
      * It calls {@link #createLiteralString(String)},
      * {@link #createLiteralDirLang(String, String, String)} or
      * {@link #createLiteralDT(String, RDFDatatype)}
@@ -174,7 +194,7 @@ public static Node createLiteralDirLang(String string, String lang, TextDirectio
      * @param dtype the type of the literal or null.
      */
     public static Node createLiteral(String lex, String lang, RDFDatatype dtype) {
-        return createLiteral(lex, lang, Node.noTextDirection, dtype);
+        return createLiteralInternal(lex, lang, Node.noTextDirection, dtype);
     }
 
     /**
@@ -183,6 +203,7 @@ public static Node createLiteral(String lex, String lang, RDFDatatype dtype) {
      * This is a convenience operation for passing in language and datatype without
      * needing the caller to differentiate between the xsd:string, rdf:langString, and other
      * datatype cases.
+     * <p>
      * It calls {@link #createLiteralString(String)},
      * {@link #createLiteralDirLang(String, String, String)} or
      * {@link #createLiteralDT(String, RDFDatatype)}
@@ -194,8 +215,8 @@ public static Node createLiteral(String lex, String lang, RDFDatatype dtype) {
      * @param dtype the type of the literal or null.
      */
     public static Node createLiteral(String lex, String lang, String textDir, RDFDatatype dtype) {
-        TextDirection textDirEnum = initialTextDirection(textDir);
-        return createLiteral(lex, lang, textDirEnum, dtype);
+        TextDirection textDirEnum = baseDirection(textDir);
+        return createLiteralInternal(lex, lang, textDirEnum, dtype);
     }
 
     /**
@@ -215,6 +236,14 @@ public static Node createLiteral(String lex, String lang, String textDir, RDFDat
      * @param dtype the type of the literal or null.
      */
     public static Node createLiteral(String lex, String lang, TextDirection textDir, RDFDatatype dtype) {
+        return createLiteralInternal(lex, lang, textDir, dtype);
+    }
+
+    /**
+     * Make a literal from any legal combination language tag, base direction and datatype.
+     * Any of these can be null when not needed.
+     */
+    private static Node createLiteralInternal(String lex, String lang, TextDirection textDir, RDFDatatype dtype) {
         Objects.requireNonNull(lex, "null lexical form for literal");
         boolean hasLang = ! isEmpty(lang);
         if ( hasLang ) {
@@ -225,11 +254,13 @@ public static Node createLiteral(String lex, String lang, TextDirection textDir,
                         throw new JenaException("Datatype is not rdf:langString but a language was given");
                 } else {
                     if ( ! dtype.equals(RDFDirLangString.rdfDirLangString) )
-                        throw new JenaException("Datatype is not rdf:dirLangString but a language and initial text direction was given");
+                        throw new JenaException("Datatype is not rdf:dirLangString but a language and base direction was given");
                 }
             }
-
-            return createLiteralDirLang(lex, langFmt, textDir);
+            if ( textDir == null )
+                return createLiteralLang(lex, langFmt);
+            else
+                return createLiteralDirLang(lex, langFmt, textDir);
         }
 
         if ( dtype == null )
@@ -240,15 +271,15 @@ public static Node createLiteral(String lex, String lang, TextDirection textDir,
         boolean hasTextDirLang = ( textDir != null );
         if ( hasTextDirLang ) {
             if ( dtype.equals(RDFDirLangString.rdfDirLangString) ) {
-                // No language. Datatype is rdf:dirLangString, Does have an initial text direction
-                throw new JenaException("Datatype is rdf:dirLangString and has an initial text direction but no language given");
+                // No language. Datatype is rdf:dirLangString, Does have an base direction
+                throw new JenaException("Datatype is rdf:dirLangString and has an base direction but no language given");
             } else if ( dtype.equals(RDFLangString.rdfLangString) ) {
-                // No language. Datatype is rdf:langString, Does have an initial text direction.
-                throw new JenaException("Datatype is rdf:langString and has an initial text direction but no language given");
+                // No language. Datatype is rdf:langString, Does have an base direction.
+                throw new JenaException("Datatype is rdf:langString and has an ibase direction but no language given");
             }
         }
 
-        // Datatype. No language, no initial text direction.
+        // Datatype. No language, no base direction.
         // Allow "abc"^^rdf:langString
         // Allow "abc"^^rdf:dirLangString
 
@@ -256,12 +287,16 @@ public static Node createLiteral(String lex, String lang, TextDirection textDir,
 //        if ( dtype.equals(RDFLangString.rdfLangString) )
 //            throw new JenaException("Datatype is rdf:langString but no language given");
 //        if ( dtype.equals(RDFDirLangString.rdfDirLangString) && noTextDir(textDir) )
-//            throw new JenaException("Datatype is rdf:dirLangString but no initial text direction given");
+//            throw new JenaException("Datatype is rdf:dirLangString but no ibase direction given");
 
         Node n = createLiteralDT(lex, dtype);
         return n;
     }
 
+    /*
+     * Controls whether langtags are normalized or not.
+     * RDF treats language tags in a case-insensitive manner. One way to do that is to normalize the strings.
+     */
     /*package*/ static final boolean legacyLangTag = false;
     /** Prepare the language tag - apply formatting normalization */
     private static String formatLanguageTag(String langTagStr) {
@@ -275,11 +310,13 @@ private static String formatLanguageTag(String langTagStr) {
         return LangTags.basicFormat(langTagStr);
     }
 
-    /** Prepare the initial text direction - apply formatting normalization */
-    private static TextDirection initialTextDirection(String input) {
+    /** Prepare the base direction. */
+    private static TextDirection baseDirection(String input) {
         if ( isEmpty(input) )
             return Node.noTextDirection;
         // Throws JenaException on bad input.
+        // If there is formatting normalization, it happens here.
+        // RDF 1.2 strictly is 'ltr', 'rtl' only.
         TextDirection textDir = TextDirection.create(input);
         return textDir;
     }
@@ -308,8 +345,7 @@ public static Node createLiteralDT(String lex, RDFDatatype dtype) {
     /** Create a Node based on the value
      * If the value is a string we
      * assume this is intended to be a lexical form after all.
-     * @param value
-     *          The value, mapped according to registered types.
+     * @param value The value, mapped according to registered types.
      * @return Node
      */
     public static Node createLiteralByValue(Object value) {
@@ -320,10 +356,8 @@ public static Node createLiteralByValue(Object value) {
     /** Create a Node based on the value
      * If the value is a string we
      * assume this is intended to be a lexical form after all.
-     * @param value
-     *          The value, mapped according to registered types.
-     * @param dtype
-     *          RDF Datatype.
+     * @param value The value, mapped according to registered types.
+     * @param dtype RDF Datatype.
      * @return Node
      */
     public static Node createLiteralByValue(Object value, RDFDatatype dtype) {
@@ -332,14 +366,31 @@ public static Node createLiteralByValue(Object value, RDFDatatype dtype) {
     }
 
     /** Create a triple node (RDF-star) */
+    public static Node createTripleTerm(Node s, Node p, Node o) {
+        return new Node_Triple(s, p, o);
+    }
+
+    /** Create a triple term (RDF-star) */
+    public static Node createTripleTerm(Triple triple) {
+        return new Node_Triple(triple);
+    }
+
+    /**
+     * Create a triple term (RDF-star)
+     * @deprecated Use {@link #createTripleTerm(Node, Node, Node)}
+     */
+    @Deprecated
     public static Node createTripleNode(Node s, Node p, Node o) {
-        Triple triple = Triple.create(s, p, o);
-        return createTripleNode(triple);
+        return createTripleTerm(s, p, o);
     }
 
-    /** Create a triple node (RDF-star) */
+    /**
+     * Create a triple node (RDF-star)
+     * @deprecated Use {@link #createTripleTerm(Triple)}
+     */
+    @Deprecated
     public static Node createTripleNode(Triple triple) {
-        return new Node_Triple(triple);
+        return createTripleTerm(triple);
     }
 
     /** Create a graph node. This is an N3-formula; it is not a named graph (see "quad") */
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
index b2c5389eeca..82fe5cf2517 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
@@ -49,7 +49,7 @@ public class Node_Literal extends Node
     /*package*/ Node_Literal(String lex, String lang, TextDirection textDir) {
         Objects.requireNonNull(lex, "null lexical form for literal");
         Objects.requireNonNull(lang, "null language");
-        Objects.requireNonNull(textDir, "null text direction");
+        Objects.requireNonNull(textDir, "null base direction");
         this.label = LiteralLabelFactory.createDirLang(lex, lang, textDir);
     }
 
@@ -80,8 +80,8 @@ public final String getLiteralLanguage()
     { return getLiteral().language(); }
 
     @Override
-    public final TextDirection getLiteralTextDirection()
-    { return getLiteral().initialTextDirection(); }
+    public final TextDirection getLiteralBaseDirection()
+    { return getLiteral().baseDirection(); }
 
 
     @Override
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
index d91c18b34d6..881e27651e8 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Triple.java
@@ -46,7 +46,7 @@ public boolean isConcrete() {
     }
 
     @Override
-    public boolean isNodeTriple() {
+    public boolean isTripleTerm() {
         return true;
     }
 
@@ -75,11 +75,11 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString(PrefixMapping pm) {
-        return "<< " + triple.toString() + " >>";
+        return "<<( " + triple.toString() + " )>>";
     }
 
     @Override
     public String toString() {
-        return triple.toString();
+        return "<<( "+ triple.toString() + " )>>";
     }
 }
diff --git a/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java b/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
index 8c3748acc07..6cc50f499db 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/TextDirection.java
@@ -18,7 +18,7 @@
 
 package org.apache.jena.graph;
 
-import static org.apache.jena.atlas.lib.Lib.lowercase;
+import java.util.Objects;
 
 import org.apache.jena.shared.JenaException;
 
@@ -43,12 +43,31 @@ public String toString() {
     }
 
     public static TextDirection create(String label) {
-        String s = lowercase(label);
-        return switch(s) {
+        Objects.requireNonNull(label);
+        return switch (label) {
             case "ltr" -> LTR;
-            case "rtl"-> RTL;
-            default ->
-                throw new JenaException("Initial text direction must be 'ltr' or 'rtl'");
+            case "rtl" -> RTL;
+            case "LTR", "RTL"
+                -> throw new JenaException("Base direction must be lowercase: got: "+label);
+            default -> throw new JenaException("Base direction must be 'ltr' or 'rtl'");
+        };
+    }
+
+    // Null works better if the code wants to give a context-sensitive error message.
+    public static TextDirection createOrNull(String label) {
+        Objects.requireNonNull(label);
+        return switch (label) {
+            case "ltr" -> LTR;
+            case "rtl" -> RTL;
+            case "LTR", "RTL" -> null;
+            default -> null;
+        };
+    }
+
+    public static boolean isValid(String label) {
+        return switch (label) {
+            case "ltr", "rtl" -> true;
+            default -> false;
         };
     }
 }
diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java
index 1fdaca2c444..66965dd45e0 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabel.java
@@ -57,7 +57,7 @@ final public class LiteralLabel {
     private final String lang;
 
     /**
-     * The initial text direction of a language literal.
+     * The base direction of a language literal.
      * Datatype rdf:dirLangSring.
      */
     private final TextDirection textDir;
@@ -418,10 +418,9 @@ public String language() {
     }
 
     /**
-     * Answer the initial text direction associated with this literal (the empty string if there's
-     * no text direction).
+     * Answer the base direction associated with this literal (null if there's no base direction).
      */
-    public TextDirection initialTextDirection() {
+    public TextDirection baseDirection() {
         return textDir;
     }
 
@@ -486,8 +485,11 @@ public boolean equals(Object other) {
         boolean langEquals = Objects.equals(lang, otherLiteral.language());
         if ( ! langEquals )
             return false;
-        // Ignore xml flag as it is calculated from the lexical form + datatype
-        // Ignore value as lexical form + datatype -> value is a function.
+
+        boolean dirEquals = Objects.equals(textDir, otherLiteral.baseDirection());
+        if ( ! dirEquals )
+            return false;
+
         return true;
     }
 
@@ -533,13 +535,13 @@ private static boolean sameValueAs(LiteralLabel lit1, LiteralLabel lit2) {
             if ( isLangString(lit2) ) return false;
         }
 
-        // -- Language tag strings with initial text direction
+        // -- Language tag strings with base direction
         if ( isLangStringDir(lit1) && isLangStringDir(lit2) ) {
             String lex1 = lit1.getLexicalForm();
             String lex2 = lit2.getLexicalForm();
             return lex1.equals(lex2)
                     && lit1.language().equalsIgnoreCase(lit2.language())
-                    && lit1.initialTextDirection().equals(lit2.initialTextDirection());
+                    && lit1.baseDirection().equals(lit2.baseDirection());
         } else {
             if ( isLangStringDir(lit1) ) return false;
             if ( isLangStringDir(lit2) ) return false;
@@ -569,15 +571,15 @@ private static boolean isStringValue(LiteralLabel lit) {
 
     /**
      * Return true if the literal label is a well-formed language string (rdf:langString).
-     * Language strings do not have an initial text direction.
+     * Language strings do not have an base direction.
      * This test excludes "abc"^^rdf:langString (not well-formed).
      */
     private static boolean isLangString(LiteralLabel lit) {
         // Duplicate of Util.isLangString except for the additional consistency check.
         if ( isEmpty(lit.language()) )
             return false;
-        if ( lit.initialTextDirection() != null )
-            // Has an initial text direction so it is n't
+        if ( lit.baseDirection() != null )
+            // Has an base direction so it isn't
             return false;
         // Internal check.
         if ( ! Objects.equals(lit.getDatatype(), RDF.dtLangString) )
@@ -586,7 +588,7 @@ private static boolean isLangString(LiteralLabel lit) {
     }
 
     /**
-     * Return true if the literal label is a well-formed language string with text direction.
+     * Return true if the literal label is a well-formed language string with base direction.
      * This excludes "abc"^^rdf:dirLangString.
      */
     private static boolean isLangStringDir(LiteralLabel lit) {
@@ -595,11 +597,11 @@ private static boolean isLangStringDir(LiteralLabel lit) {
         // Allow "abc"@--rtl
 //        if ( isEmpty(lit.language()) )
 //            return false;
-        if ( lit.initialTextDirection() == null )
+        if ( lit.baseDirection() == null )
             return false;
         // Internal check.
         if ( ! Objects.equals(lit.getDatatype(), RDF.dtDirLangString) )
-            throw new JenaException("Literal with language string and text direction which is not rdf:dirLangString: "+lit);
+            throw new JenaException("Literal with language string and base direction which is not rdf:dirLangString: "+lit);
         return true;
     }
 
diff --git a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java
index 8621c4c9ce3..024b9dc5b24 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/impl/LiteralLabelFactory.java
@@ -66,10 +66,10 @@ public static LiteralLabel createLang(String lex, String lang) {
     }
 
     /**
-     * Build a literal label from its lexical form,language tag and initial text direction
+     * Build a literal label from its lexical form,language tag and base direction
      * @param lex the lexical form of the literal
      * @param lang the optional language tag
-     * @param textDir the optional initial text direction (lang required)
+     * @param textDir the optional base direction (lang required)
      */
     public static LiteralLabel createDirLang(String lex, String lang, TextDirection textDir) {
         RDFDatatype dt = fixDatatype(null, lang, textDir);
diff --git a/jena-core/src/main/java/org/apache/jena/graph/langtag/LangTags.java b/jena-core/src/main/java/org/apache/jena/graph/langtag/LangTags.java
index 29efa034b0d..6cea239a824 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/langtag/LangTags.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/langtag/LangTags.java
@@ -86,8 +86,6 @@ public static String basicFormat(String string) {
             else {
                 // case depends on ;length
                 sb.append(strcase(s));
-                // is it the start of an extension or privateuse
-                // XXX s.length()==1?
                 if ( s.length() == 1 )
                     singleton = true;
             }
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Literal.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Literal.java
index 953d26e6a7e..f8ceee7e5aa 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Literal.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Literal.java
@@ -175,12 +175,16 @@ public interface Literal extends RDFNode {
      */
     public String getLanguage();
 
+    /** @deprecated Use {@link #getBaseDirection()} */
+    @Deprecated
+    public default String getTextDirection() { return getBaseDirection(); }
+
     /**
-     * If a text direction is defined for this literal return it
+     * If a base direction is defined for this literal return it
      *
-     * @return the text direction for this literal if it exists, or null if none
+     * @return the base direction for this literal if it exists, or null if none
      */
-    public String getTextDirection();
+    public String getBaseDirection();
 
     /** Test whether another object is equal to this object.
      *
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
index a8e6ce19fa1..f4db0eb3769 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Model.java
@@ -231,14 +231,22 @@ will be equal to any other bnode with the same AnonId (even if they are in
 	public Property createProperty(String nameSpace, String localName);
 
 	/**
-        Create an untyped literal from a String value with a specified language.
+       Create an untyped literal from a String value with a specified language.
 	   @param v the lexical form of the literal
 	   @param language the language associated with the literal
 	   @return a new literal representing the value v with the given language
 	 */
-
 	public Literal createLiteral(String v, String language);
 
+	/**
+       Create an untyped literal from a String value with a specified language.
+       @param v the lexical form of the literal
+       @param language the language associated with the literal
+       @param baseDirection the base direction associated with the literal
+       @return a new literal representing the value v with the given language
+	 */
+	public Literal createLiteral(String v, String language, String baseDirection);
+
     /**
         Build a typed literal from its lexical form. The
         lexical form will be parsed now and the value stored. If
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
index a9e026f2636..e9ff695abc0 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/ModelCon.java
@@ -498,12 +498,32 @@ Add the statement (s, p, o') to the model, where o' is the typed
      * @return this model
      * @param s the subject of the statement to add
      * @param p the predicate of the statement to add
-     * @param lex the lexcial form of the literal
+     * @param lex the lexical form of the literal
      * @param datatype the datatype of the literal
      */
     Model add(Resource s, Property p, String lex, RDFDatatype datatype) ;
 
-    Model add(Resource s, Property p, String o, String l) ;
+    /** add a statement to this model.
+    *
+    * @return this model
+    * @param s the subject of the statement to add
+    * @param p the predicate of the statement to add
+    * @param lex the lexical form of the literal
+    * @param lang the language of the literal
+    * @param datatype the datatype of the literal
+    */
+    Model add(Resource s, Property p, String lex, String lang) ;
+
+    /** add a statement to this model.
+    *
+    * @return this model
+    * @param s the subject of the statement to add
+    * @param p the predicate of the statement to add
+    * @param lex the lexical form of the literal
+    * @param lang the language of the literal
+    * @param dir the base direction of the literal
+    */
+    Model add(Resource s, Property p, String lex, String lang, String direction) ;
 
     /**
         remove the statement <code>(s, p, o)</code> from this model and
@@ -579,7 +599,7 @@ Add the statement (s, p, o') to the model, where o' is the typed
      *  that match a pattern.  The statements selected are those
      *  whose subject matches the <code>subject</code> argument,
      *  whose predicate matches the <code>predicate</code> argument
-     *  and whose object matchesthe <code>object</code> argument.</p>
+     *  and whose object matches the <code>object</code> argument.</p>
      * @return an iterator over the subjects
      * @param subject   The subject sought
      * @param predicate The predicate sought
@@ -593,13 +613,13 @@ Add the statement (s, p, o') to the model, where o' is the typed
      *  that match a pattern.  The statements selected are those
      *  whose subject matches the <code>subject</code> argument,
      *  whose predicate matches the <code>predicate</code> argument
-     *  and whose object matchesthe <code>object</code> argument.
+     *  and whose object matches the <code>object</code> argument.
      *  If an argument is <code>null</code> it matches anything.</p>
      * @return an iterator over the subjects
      * @param subject   The subject sought
      * @param predicate The predicate sought
      * @param object    The value sought
-     * @param lang      The lang code ofthe string.
+     * @param lang      The lang code of the string.
 
      */
     StmtIterator listStatements(Resource subject,
@@ -608,6 +628,27 @@ StmtIterator listStatements(Resource subject,
                                 String   lang)
     ;
 
+    /** Find all the statements matching a pattern.
+     * <p>Return an iterator over all the statements in a model
+     *  that match a pattern.  The statements selected are those
+     *  whose subject matches the <code>subject</code> argument,
+     *  whose predicate matches the <code>predicate</code> argument
+     *  and whose object matches the <code>object</code> argument.
+     *  If an argument is <code>null</code> it matches anything.</p>
+     * @return an iterator over the subjects
+     * @param subject   The subject sought
+     * @param predicate The predicate sought
+     * @param object    The value sought
+     * @param lang      The lang code of the string.
+     * @param direction The base direction of the string.
+
+     */
+    StmtIterator listStatements(Resource subject,
+                                Property predicate,
+                                String   object,
+                                String   lang,
+                                String   direction)
+    ;
     /**
         Answer an iterator [without duplicates] over all the resources in this
         model which have value o' for property p, where o' is the typed literal
@@ -653,19 +694,28 @@ StmtIterator listStatements(Resource subject,
     /** lists all subjects with a given property and property value.
      * @return an iterator over the set of subjects
      * @param p The predicate sought.
-     * @param o The property value sought.
+     * @param str The property value sought.
      */
-    ResIterator listSubjectsWithProperty( Property p, String o );
+    ResIterator listSubjectsWithProperty( Property p, String str );
 
     /** lists all subjects with a given property and property value.
 
      * @return an iterator over the set of subjects
      * @param p The predicate sought.
-     * @param o The property value sought.
-     * @param l the language associated with the object
+     * @param str The property value sought.
+     * @param lang the language associated with the object
+     */
+    ResIterator listSubjectsWithProperty( Property p, String str, String lang );
+
+    /** lists all subjects with a given property and property value.
 
+     * @return an iterator over the set of subjects
+     * @param p The predicate sought.
+     * @param str The property value sought.
+     * @param lang the language associated with the object
+     * @param dir the text directio associated with the object
      */
-    ResIterator listSubjectsWithProperty( Property p, String o, String l );
+    ResIterator listSubjectsWithProperty( Property p, String str, String lang, String dir );
 
     /**
         Answer true iff this model contains the statement (s, p, o') where
@@ -712,19 +762,30 @@ Answer true iff this model contains the statement (s, p, o') where
     /** Determine if a statement is present in this model.
      * @return true if the statement with subject s, property p and object o
      * is in the model, false otherwise
-     * @param s The subject of the statment tested.
+     * @param s The subject of the statement tested.
      * @param p The predicate of the statement tested.
-     * @param o The object of the statement tested.
+     * @param lex The string object in the statement tested.
      */
-    boolean contains( Resource s, Property p, String o );
+    boolean contains( Resource s, Property p, String lex );
 
     /** Determine if a statement is present in this model.
      * @return true if the statement with subject s, property p and object o
      * is in the model, false otherwise
-     * @param s The subject of the statment tested.
+     * @param s The subject of the statement tested.
      * @param p The predicate of the statement tested.
-     * @param o The object of the statement tested.
-     * @param l the language associated with the object
+     * @param lex The string object in the statement tested.
+     * @param lang the language associated with the object.
+     */
+    boolean contains( Resource s, Property p, String lex, String lang );
+
+    /** Determine if a statement is present in this model.
+     * @return true if the statement with subject s, property p and object o
+     * is in the model, false otherwise
+     * @param s The subject of the statement tested.
+     * @param p The predicate of the statement tested.
+     * @param lex The string object in the statement tested.
+     * @param lang the language associated with the object.
+     * @param dir the language associated with the object.
      */
-    boolean contains( Resource s, Property p, String o, String l );
+    boolean contains( Resource s, Property p, String lex, String lang, String dir );
 }
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Resource.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Resource.java
index d124f6eaa99..6e4a7cc94f7 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Resource.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Resource.java
@@ -21,7 +21,6 @@
 import org.apache.jena.datatypes.RDFDatatype ;
 import org.apache.jena.shared.PropertyNotFoundException ;
 
-
 /** An RDF Resource.
 
     Resource instances when created may be associated with a specific model.
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/LiteralImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/LiteralImpl.java
index 00cae4af9c4..cd89d5527b1 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/LiteralImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/LiteralImpl.java
@@ -249,8 +249,8 @@ public String getLanguage() {
     }
 
     @Override
-    public String getTextDirection() {
-        TextDirection textDir = asNode().getLiteralTextDirection();
+    public String getBaseDirection() {
+        TextDirection textDir = asNode().getLiteralBaseDirection();
         if ( textDir == null )
             return null;
         return textDir.direction();
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index 4018a56e33d..7736760a66f 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -122,7 +122,7 @@ public Model addLiteral( Resource s, Property p, double o )
 
     @Override
     public Model add(Resource s, Property p, String o)  {
-        return add( s, p, literal( o, "" ) );
+        return add( s, p, literal( o ) );
     }
 
     @Override
@@ -131,9 +131,15 @@ public Model add(Resource s, Property p, String lex, RDFDatatype datatype) {
         return this;
     }
 
+    private Literal literal( String s )
+    { return new LiteralImpl( NodeFactory.createLiteralString(s), this ); }
+
     private Literal literal( String s, String lang)
     { return new LiteralImpl( NodeFactory.createLiteralLang( s, lang), this ); }
 
+    private Literal literal( String s, String lang, String textDirection)
+    { return new LiteralImpl( NodeFactory.createLiteralDirLang( s, lang, textDirection), this ); }
+
     private Literal literal( String lex, RDFDatatype datatype)
     { return new LiteralImpl( NodeFactory.createLiteralDT( lex, datatype), this ); }
 
@@ -141,6 +147,10 @@ private Literal literal( String lex, RDFDatatype datatype)
     public Model add( Resource s, Property p, String o, String l )
     { return add( s, p, literal(o, l) ); }
 
+    @Override
+    public Model add( Resource s, Property p, String o, String l, String d)
+    { return add( s, p, literal(o, l, d) ); }
+
     @Override
     public Model addLiteral( Resource s, Property p, Literal o )
     { return add( s, p, o ); }
@@ -327,6 +337,10 @@ public boolean contains( Resource s, Property p, String o )
     public boolean contains( Resource s, Property p, String o, String l )
     { return contains( s, p, literal( o, l ) ); }
 
+    @Override
+    public boolean contains( Resource s, Property p, String o, String l, String d)
+    { return contains( s, p, literal( o, l, d ) ); }
+
     @Override
     public boolean containsLiteral(Resource s, Property p, Object o)
     { return contains( s, p, asObject( o ) ); }
@@ -388,6 +402,24 @@ public StmtIterator listStatements( Resource S, Property P, String O, String L )
         }
     }
 
+    @Override
+    public StmtIterator listStatements( Resource S, Property P, String O, String L, String D ) {
+        if (O != null) {
+            // this is not OK when L is null: returns only the statements whose lang is ""
+            // return listStatements( S, P, Node.createLiteral( O, L, false ) );
+            if (L != null) {
+                if ( D != null )
+                    return listStatements( S, P, NodeFactory.createLiteralDirLang( O, L, D ) );
+                else
+                    return listStatements( S, P, NodeFactory.createLiteralLang( O, L ) );
+            }
+            // there's maybe a better way
+            return new StringFilteredStmtIterator(O, listStatements(S, P, Node.ANY));
+        } else {
+            return new LangFilteredStmtIterator(L, listStatements(S, P, Node.ANY));
+        }
+    }
+
 	private class StringFilteredStmtIterator extends FilterIterator<Statement> implements StmtIterator {
 		public StringFilteredStmtIterator(final String str, Iterator<Statement> it) {
 			super(s -> {
@@ -473,12 +505,16 @@ public ResIterator listSubjectsWithProperty( Property p, RDFNode o )
 
     @Override
     public ResIterator listSubjectsWithProperty( Property p, String o )
-    { return listSubjectsWithProperty( p, o, "" ); }
+    { return listSubjectsWithProperty( p, literal(o) ); }
 
     @Override
     public ResIterator listSubjectsWithProperty( Property p, String o, String l )
     { return listResourcesWithProperty(p, literal( o, l ) ); }
 
+    @Override
+    public ResIterator listSubjectsWithProperty( Property p, String o, String l, String d)
+    { return listResourcesWithProperty(p, literal( o, l, d ) ); }
+
     @Override
     public Resource createResource( Resource type )
     { return createResource().addProperty( RDF.type, type ); }
@@ -673,6 +709,10 @@ public Literal createLiteral( String v )
     public Literal createLiteral( String v, String l )
     { return literal( v, l ); }
 
+    @Override
+    public Literal createLiteral( String v, String l, String d)
+    { return literal( v, l, d ); }
+
     @Override
     public Statement createLiteralStatement( Resource r, Property p, boolean o )
     { return createStatement( r, p, createTypedLiteral( o ) ); }
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
index 3344b0e5f34..d5630cd2503 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
@@ -111,7 +111,7 @@ public ResourceImpl(String nameSpace, String localName, ModelCom m) {
     }
 
     public ResourceImpl(Statement statement, ModelCom m) {
-        this( NodeFactory.createTripleNode(statement.asTriple()), m);
+        this( NodeFactory.createTripleTerm(statement.asTriple()), m);
     }
 
     @Override
@@ -139,7 +139,7 @@ public Resource inModel( Model m ) {
         if ( isAnon() )
             return m.createResource( getId() );
         if ( isStmtResource() )
-            return  m.createResource( getStmtTerm() );
+            return m.createResource( getStmtTerm() );
         if ( asNode().isConcrete() == false )
             return (Resource) m.getRDFNode( asNode() );
         // if isURIResource()
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
index 1c0317b17d4..bea460351c3 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/Util.java
@@ -142,7 +142,7 @@ public static boolean isSimpleString(Node n) {
 
     /**
      * A Node is a well-formed language string if it has a language tag
-     * and it does not have an initial text direction.
+     * and it does not have a base direction.
      * This excludes {@code "abc"^^rdf:langString} which is not well-formed.
      */
     public static boolean isLangString(Node n) {
@@ -154,7 +154,7 @@ public static boolean isLangString(Node n) {
 
     /**
      * A Node is a well-formed directional language string if it has a language tag
-     * and it has an initial text direction.
+     * and it has an base direction.
      */
     public static boolean isDirLangString(Node n) {
         Objects.requireNonNull(n);
@@ -179,7 +179,7 @@ public static boolean hasDirection(Node n) {
     }
 
     private static boolean hasDirectionText(Node n) {
-        TextDirection textDir = n.getLiteralTextDirection();
+        TextDirection textDir = n.getLiteralBaseDirection();
         return textDir != null;
     }
 
@@ -209,13 +209,13 @@ public static boolean isLangString(Literal lit) {
         return ! lang.equals("");
     }
 
-    /** Return true if the literal is well-formed, has a language tag and a text direction. */
+    /** Return true if the literal is well-formed, has a language tag and a base direction. */
     public static boolean isDirLangString(Literal lit) {
         Objects.requireNonNull(lit);
         String lang = lit.getLanguage();
         if ( lang == null )
             return false;
-        String textDir = lit.getTextDirection();
+        String textDir = lit.getBaseDirection();
         if ( textDir == null )
             return false;
         return true;
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java
index 7a38f00d32e..30eca0b638c 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/RDFXML_Basic.java
@@ -23,6 +23,7 @@
 import org.apache.jena.datatypes.xsd.impl.XMLLiteralType;
 import org.apache.jena.rdf.model.* ;
 import org.apache.jena.rdf.model.impl.Util ;
+import org.apache.jena.shared.JenaException;
 import org.apache.jena.vocabulary.RDFSyntax ;
 
 /** Writes out an XML serialization of a model.
@@ -144,6 +145,9 @@ protected void writeResourceReference( Resource r, PrintWriter writer )
 		if (r.isAnon()) {
 			writer.print(rdfAt("nodeID") + "=" + attributeQuoted(anonId(r)));
 		} else {
+		    if ( r.isStmtResource() )
+		        throw new JenaException("Triple terms not supported in RDF/XML");
+
 			writer.print(
 				rdfAt("resource")
 					+ "="
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
index 4e1c58cbc5e..3e95ff14d6b 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -397,6 +397,9 @@ private boolean wPropertyEltCompact(WType wt, Property prop, Statement s,
         if (!(val instanceof Resource))
             return false;
         Resource r = (Resource) val;
+        if ( r.isStmtResource() )
+            throw new JenaException("Triple terms not supported in RDF/XML");
+
         if (!(allPropsAreAttr(r) || doing.contains(r)))
             return false;
         // '<' propName '/>' is 6.12.1 rather than 6.12.4
@@ -1279,9 +1282,7 @@ private Statement[] reification(Statement s) {
 
     private boolean hasProperties(Resource r) {
         ExtendedIterator<Statement> ss = listProperties(r);
-        if (avoidExplicitReification && // ( r instanceof Statement ) &&
-                (!r.isAnon()) && isLocalReference(r)
-                && res2statement.containsKey(r)) {
+        if (avoidExplicitReification && (!r.isAnon()) && !r.isStmtResource() && isLocalReference(r) && res2statement.containsKey(r)) {
             ss = new MapFilterIterator<>(new MapFilter<Statement, Statement>() {
                 @Override
                 public Statement accept(Statement o) {
diff --git a/jena-core/src/main/java/org/apache/jena/util/PrefixMappingUtils.java b/jena-core/src/main/java/org/apache/jena/util/PrefixMappingUtils.java
index a263993d016..f67c43c632a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/PrefixMappingUtils.java
+++ b/jena-core/src/main/java/org/apache/jena/util/PrefixMappingUtils.java
@@ -150,7 +150,7 @@ private static void process(Node node, Set<String> inUse, Trie<String> trie) {
             uri = node.getURI();
         else if ( node.isLiteral() )
             uri = node.getLiteralDatatypeURI();
-        else if ( node.isNodeTriple() ) {
+        else if ( node.isTripleTerm() ) {
             process(node.getTriple(), inUse, trie);
             return ;
         }
@@ -243,7 +243,7 @@ private static void processTTL(Node node, Set<String> inUse, PrefixMapping prefi
             uri = node.getURI();
         else if ( node.isLiteral() )
             uri = node.getLiteralDatatypeURI();
-        else if ( node.isNodeTriple() ) {
+        else if ( node.isTripleTerm() ) {
             processTTL(node.getTriple(), inUse, prefixMapping);
             return ;
         }
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
index bc71d0d0c53..2af1f0ddee9 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
@@ -80,9 +80,11 @@ public static Property li(int i) {
     public static final Property    object          = property("object");
     public static final Property    type            = property("type");
     public static final Property    value           = property("value");
+    public static final Property    reifies         = property("reifies");
+
     // RDF 1.1 - the datatypes of language strings
     public static final Resource    langString      = resource("langString");
-    // RDF 1.2 - the datatypes of language strings with text direction
+    // RDF 1.2 - the datatypes of language strings with base direction
     public static final Resource    dirLangString   = resource("dirLangString");
     // rdf:XMLLiteral
     public static final Resource    xmlLiteral      = resource("XMLLiteral");
@@ -133,11 +135,17 @@ private static class Init {
         // This should not be needed anymore.
         public static Resource Alt()                { return resource( "Alt" ); }
         public static Resource Bag()                { return resource( "Bag" ); }
-        // Java8 bug : https://bugzilla.redhat.com/show_bug.cgi?id=1423421
-        // Can't have a method called Property() - it crashes the javadoc generation.
+
+        // This was a due to a Java8 bug : https://bugzilla.redhat.com/show_bug.cgi?id=1423421
+        //  Can't have a method name ending in "Property" - it crashes the javadoc generation.
         //  https://bugzilla.redhat.com/show_bug.cgi?id=1423421 ==>
         //  https://bugs.openjdk.java.net/browse/JDK-8061305
+
+        /** @deprecated Use {@link #Property()} */
+        @Deprecated(forRemoval = true)
         public static Resource _Property()          { return resource( "Property" ); }
+
+        public static Resource Property()           { return resource( "Property" ); }
         public static Resource Seq()                { return resource( "Seq" ); }
         public static Resource Statement()          { return resource( "Statement" ); }
         public static Resource List()               { return resource( "List" ); }
@@ -203,5 +211,6 @@ public static final class Nodes
         public static final Node language       = RDF.language.asNode();
         public static final Node direction      = RDF.direction.asNode();
         public static final Node PlainLiteral   = RDF.PlainLiteral.asNode();
+        public static final Node reifies        = RDF.reifies.asNode();
     }
 }
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
index 72a5396f521..e809b31b9e3 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
@@ -526,7 +526,7 @@ private void visitExamples( NodeVisitor nv )
         Node s = node( "uri1" );
         Node p = node( "uri2" );
         Node o = node( "uri1" );
-        Node nt = NodeFactory.createTripleNode(s, p, o);
+        Node nt = NodeFactory.createTripleTerm(s, p, o);
         nt.visitWith(nv);
         // ---
         Graph g = GraphMemFactory.empty();
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java
index 43cd6f2813c..5996d650368 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeEdgeCases.java
@@ -38,7 +38,7 @@ public class TestNodeEdgeCases {
     }
 
     @Test public void term_create_02() {
-        // "abc"^rdf:dirLangString (no language, no initial text direction)
+        // "abc"^^rdf:dirLangString (no language, no base direction)
         Node node1 = NodeFactory.createLiteral("abc", null, (String)null, RDFDirLangString.rdfDirLangString);
         assertNotNull(node1);
         Node node2 = NodeFactory.createLiteralDT("abc", RDFDirLangString.rdfDirLangString);
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java
index 71b343dcfb9..e4dd04eaae8 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestNodeExtras.java
@@ -21,11 +21,16 @@
 import static org.junit.Assert.*;
 
 import org.apache.jena.graph.*;
+import org.apache.jena.rdf.model.impl.Util;
+import org.apache.jena.vocabulary.RDF;
+
 import org.junit.Test;
 
-/** Tests for {@link Node_Triple} and other unusual nodes */
+/** More tests for {@link Node Nodes}. */
 public class TestNodeExtras {
 
+    // See also TestRDFStringLiterals
+
     private static Node s = NodeFactory.createBlankNode();
     private static Node p = NodeCreateUtils.create("eg:p");
     private static Node o = NodeCreateUtils.create("'abc'");
@@ -35,9 +40,9 @@ public class TestNodeExtras {
 
     private static Triple triple9 = Triple.create(NodeFactory.createBlankNode(),p,o);
 
-    private static Node newTripleTerm(Triple triple)             { return NodeFactory.createTripleNode(triple); }
+    private static Node newTripleTerm(Triple triple)             { return NodeFactory.createTripleTerm(triple); }
 
-    private static Node newTripleTerm(Node s, Node p , Node o)   { return NodeFactory.createTripleNode(s,p,o); }
+    private static Node newTripleTerm(Node s, Node p , Node o)   { return NodeFactory.createTripleTerm(s,p,o); }
 
     private static Node_Graph newGraphTerm(Graph graph)          { return new Node_Graph(graph); }
 
@@ -45,7 +50,7 @@ public class TestNodeExtras {
 
      @Test public void term_triple_1() {
         Node nt = newTripleTerm(s,p,o);
-        assertTrue(nt.isNodeTriple());
+        assertTrue(nt.isTripleTerm());
         assertNotNull(nt.getTriple());
         assertNotNull(nt.getTriple());
         assertEquals(triple1, nt.getTriple());
@@ -104,4 +109,28 @@ public void term_graph_1() {
         assertNotEquals(nGraph.getGraph().hashCode(), nGraph.hashCode());
         assertTrue(nGraph.sameValueAs(nGraph));
     }
+
+    @Test
+    public void term_dirLangString_1() {
+        Node nDirLangString = NodeFactory.createLiteralDirLang("abc", "EN", TextDirection.LTR);
+        assertTrue(nDirLangString.isLiteral());
+        assertTrue(Util.hasLang(nDirLangString));
+        assertTrue(Util.hasDirection(nDirLangString));
+        assertEquals(RDF.dtDirLangString, nDirLangString.getLiteralDatatype());
+        // Normalized.
+        assertEquals("en", nDirLangString.getLiteralLanguage());
+        assertEquals(TextDirection.LTR, nDirLangString.getLiteralBaseDirection());
+    }
+
+    @Test
+    public void term_dirLangString_2() {
+        // Make via langtag
+        Node nDirLangString = NodeFactory.createLiteralLang("abc", "en--ltr");
+        assertTrue(nDirLangString.isLiteral());
+        assertTrue(Util.hasLang(nDirLangString));
+        assertTrue(Util.hasDirection(nDirLangString));
+        assertEquals(RDF.dtDirLangString, nDirLangString.getLiteralDatatype());
+        assertEquals("en", nDirLangString.getLiteralLanguage());
+        assertEquals(TextDirection.LTR, nDirLangString.getLiteralBaseDirection());
+    }
 }
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java
index e12a4c18026..b81e7607613 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestRDFStringLiterals.java
@@ -18,8 +18,11 @@
 
 package org.apache.jena.graph.test;
 
-import static org.apache.jena.graph.TextDirection.*;
+import static org.apache.jena.graph.TextDirection.RTL;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import org.junit.Test;
 
 import org.apache.jena.datatypes.RDFDatatype;
 import org.apache.jena.datatypes.xsd.XSDDatatype;
@@ -28,11 +31,11 @@
 import org.apache.jena.graph.TextDirection;
 import org.apache.jena.shared.JenaException;
 import org.apache.jena.vocabulary.RDF;
-import org.junit.Test;
 
-/** Tests for create RDF Terms (@link Node Nodes}) involving strings
+/**
+ * Tests for create RDF Terms (@link Node Nodes}) involving strings
  * (xsd:string, rdf:langString, rdf:dirLangString).
- * Initial text direction introduced in RDF 1.2.
+ * Base direction introduced in RDF 1.2.
  */
 public class TestRDFStringLiterals {
 
@@ -78,7 +81,7 @@ public class TestRDFStringLiterals {
         test(n, "abc", "", null, XSDDatatype.XSDstring, "abc");
     }
 
-    // Make with explicit no text direction.
+    // Make with explicit no base direction.
 
     @Test public void strLang04() {
         Node n = NodeFactory.createLiteralDirLang("abc", null, (String)null);
@@ -115,9 +118,55 @@ public class TestRDFStringLiterals {
         test(n, "abc", "en", RTL, RDF.dtDirLangString, "abc@en");
     }
 
-    @Test public void dirLangString02() {
+    @Test(expected = JenaException.class)
+    public void dirLangString02() {
         Node n = NodeFactory.createLiteralDirLang("abc", "en", "LTR");
-        test(n, "abc", "en", LTR, RDF.dtDirLangString, "abc@en");
+    }
+
+    @Test(expected = JenaException.class)
+    public void dirLangString03() {
+        Node n = NodeFactory.createLiteralDirLang("abc", "en", "unk");
+    }
+
+    @Test public void dirLangString04() {
+        Node n = NodeFactory.createLiteralDirLang("abc", "en", "");
+        test(n, "abc", "en", null, RDF.dtLangString, "abc@en");
+    }
+
+    @Test(expected = JenaException.class)
+    public void dirLangString05() {
+        Node n = NodeFactory.createLiteralDirLang("abc", "en", "x");
+    }
+
+    // -- Via createLiteralLang splitting lang tags on "--"
+    @Test public void dirLangString10() {
+        Node n = NodeFactory.createLiteralLang("abc", "en--rtl");
+        test(n, "abc", "en", RTL, RDF.dtDirLangString, "abc@en");
+    }
+
+    @Test
+    public void dirLangString_equality() {
+        // Equality of rdf:dirLangString
+        Node nDirLangString1 = NodeFactory.createLiteralLang("abc", "en--ltr");
+        Node nDirLangString2 = NodeFactory.createLiteralLang("abc", "en--ltr");
+        assertEquals(nDirLangString1, nDirLangString2);
+
+        Node nDirLangString3 = NodeFactory.createLiteralLang("abc", "en--rtl");
+        assertNotEquals(nDirLangString1, nDirLangString3);
+
+        Node nDirLangString4 = NodeFactory.createLiteralLang("abc", "en");
+        assertNotEquals(nDirLangString1, nDirLangString4);
+    }
+
+
+    @Test(expected = JenaException.class)
+    public void dirLangString11() {
+        Node n = NodeFactory.createLiteralLang("abc", "en--LTR");
+    }
+
+    @Test(expected = JenaException.class)
+    public void dirLangString12() {
+        Node n = NodeFactory.createLiteralLang("abc", "en--");
     }
 
     // Errors
@@ -154,7 +203,7 @@ public void rdfStringBad05() {
     private static void test(Node node, String lexicalForm, String lang, TextDirection textDir, RDFDatatype datatype, String indexingValue) {
         assertEquals("Lexical form:", lexicalForm, node.getLiteralLexicalForm());
         assertEquals("Language:", lang, node.getLiteralLanguage());
-        assertEquals("Text Direction:", textDir, node.getLiteralTextDirection());
+        assertEquals("Text Direction:", textDir, node.getLiteralBaseDirection());
         assertEquals("Datatype:", datatype, node.getLiteralDatatype());
         assertEquals("Indexing:", indexingValue, node.getIndexingValue());
     }
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
index 97c86aeb8d4..0b1fd064f2e 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/WhereHandler.java
@@ -46,10 +46,10 @@
  *
  */
 public class WhereHandler implements Handler {
-    
-    private static Predicate<Node> checkPredicate = n -> n.isURI() || n.isVariable() ||n.equals(Node.ANY);
-    
-    private static Predicate<Node> checkSubject = n -> checkPredicate.test(n) || n.isBlank() || n.isNodeTriple();
+
+    private static Predicate<Node> checkPredicate = n -> n.isURI() || n.isVariable() || n.equals(Node.ANY);
+
+    private static Predicate<Node> checkSubject = n -> checkPredicate.test(n) || n.isBlank();
 
 
     // the query to modify
@@ -171,7 +171,7 @@ public ElementGroup getClause() {
      * @param t The trip to test.
      */
     private static void testTriple(TriplePath t) {
-        
+
         // verify Triple is valid
         boolean validSubject = checkSubject.test(t.getSubject());
         boolean validPredicate = t.isTriple() ? checkPredicate.test(t.getPredicate()) : t.getPath() != null;
@@ -229,7 +229,7 @@ public void addWhere(TriplePath t) throws IllegalArgumentException {
 
         }
     }
-    
+
     /**
      * Add the triple path to the where clause
      *
@@ -262,7 +262,7 @@ public void addWhere(ValuesHandler values) throws IllegalArgumentException {
     public void addOptional(TriplePath t) throws IllegalArgumentException {
         addOptional(Arrays.asList(t));
     }
-    
+
     /**
      * Add an optional triple to the where clause
      *
@@ -397,7 +397,7 @@ public void addGraph(Node graph, TriplePath subQuery) {
         epb.addTriple(subQuery);
         getClause().addElement(new ElementNamedGraph(graph, epb));
     }
-    
+
     /**
      * Add a graph to the where clause.
      *
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
index 6976cce240d..df9b183845e 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/BuildElementVisitor.java
@@ -25,7 +25,6 @@
 /**
  * An element visitor that does an in-place modification of the elements to fix
  * union-of-one and similar issues.
- *
  */
 public class BuildElementVisitor implements ElementVisitor {
     private Element result;
@@ -113,6 +112,25 @@ public void visit(ElementLateral el) {
         }
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        el.getSubElement().visit(this);
+        if (result == el.getSubElement()) {
+            result = el;
+        } else {
+            result = new ElementSemiJoin(result);
+        }
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        el.getSubElement().visit(this);
+        if (result == el.getSubElement()) {
+            result = el;
+        } else {
+            result = new ElementAntiJoin(result);
+        }
+    }
 
     @Override
     public void visit(ElementOptional el) {
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
index 5c29d008580..a0d8d93b995 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ElementRewriter.java
@@ -147,6 +147,18 @@ public void visit(ElementLateral el) {
         push(new ElementLateral(getResult()));
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        el.getSubElement().visit(this);
+        push(new ElementSemiJoin(getResult()));
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        el.getSubElement().visit(this);
+        push(new ElementAntiJoin(getResult()));
+    }
+
     @Override
     public void visit(ElementOptional el) {
         el.getOptionalElement().visit(this);
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
index 0252a0d2e9d..7ba19f65dff 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java
@@ -56,7 +56,7 @@ public class ExprRewriter extends AbstractRewriter<Expr> implements ExprVisitor
 
     /**
      * Constructor.
-     * 
+     *
      * @param values the values to replace.
      */
     public ExprRewriter(Map<Var, Node> values) {
@@ -164,7 +164,7 @@ public void visit(ExprVar nv) {
     public void visit(ExprTripleTerm tripleTerm) {
         Triple t1 = tripleTerm.getTriple();
         Triple t2 = rewrite(t1);
-        Node ntt = NodeFactory.createTripleNode(t2);
+        Node ntt = NodeFactory.createTripleTerm(t2);
         push(ExprLib.nodeToExpr(ntt));
     }
 
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
index 59b4700afde..e157e336350 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/NodeValueRewriter.java
@@ -22,18 +22,7 @@
 import org.apache.jena.graph.Node;
 import org.apache.jena.sparql.core.Var;
 import org.apache.jena.sparql.expr.NodeValue;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueBoolean;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueDateTime;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueDecimal;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueDouble;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueDuration;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueFloat;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueInteger;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueLang;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueNode;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueSortKey;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueString;
-import org.apache.jena.sparql.expr.nodevalue.NodeValueVisitor;
+import org.apache.jena.sparql.expr.nodevalue.*;
 
 /**
  * A rewriter that implements NodeValueVisitor
@@ -102,7 +91,11 @@ public void visit(NodeValueDuration nodeValueDuration) {
 
     @Override
     public void visit(NodeValueLang nv) {
-
         push(new NodeValueLang(changeNode(nv.asNode())));
     }
+
+    @Override
+    public void visit(NodeValueLangDir nv) {
+        push(new NodeValueLangDir(changeNode(nv.asNode())));
+    }
 }
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
index 7b236273cd5..eafdb85faff 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java
@@ -230,13 +230,6 @@ public void visit(OpUnion opUnion) {
         push(OpUnion.create(pop(), pop()));
     }
 
-    @Override
-    public void visit(OpDiff opDiff) {
-        opDiff.getRight().visit(this);
-        opDiff.getLeft().visit(this);
-        push(OpDiff.create(pop(), pop()));
-    }
-
     @Override
     public void visit(OpMinus opMinus) {
         opMinus.getRight().visit(this);
@@ -251,6 +244,20 @@ public void visit(OpLateral opLateral) {
         push(OpLateral.create(pop(), pop()));
     }
 
+    @Override
+    public void visit(OpSemiJoin opSemiJoin) {
+        opSemiJoin.getRight().visit(this);
+        opSemiJoin.getLeft().visit(this);
+        push(OpSemiJoin.create(pop(), pop()));
+    }
+
+    @Override
+    public void visit(OpAntiJoin opAntiJoin) {
+        opAntiJoin.getRight().visit(this);
+        opAntiJoin.getLeft().visit(this);
+        push(OpAntiJoin.create(pop(), pop()));
+    }
+
     @Override
     public void visit(OpConditional opCondition) {
         opCondition.getRight().visit(this);
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
index 3ad11cfdac0..98bb3a18b9d 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/QuadIteratorBuilder.java
@@ -114,6 +114,17 @@ public void visit(ElementLateral el) {
         throw new QueryParseException("lateral not permitted in data quad", -1, -1);
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        throw new QueryParseException("semijoin not permitted in data quad", -1, -1);
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        throw new QueryParseException("antijoin not permitted in data quad", -1, -1);
+    }
+
+
     @Override
     public void visit(ElementOptional el) {
         throw new QueryParseException("optional not permitted in data quad", -1, -1);
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
index 11ba642d296..98cf1c9c398 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/updatebuilder/WhereQuadHolder.java
@@ -55,11 +55,11 @@ public class WhereQuadHolder implements QuadHolder {
 
     private Element whereClause;
     private final PrefixHandler prefixHandler;
-    
-    
+
+
     private static Predicate<Node> checkPredicate = n -> n.isURI() || n.isVariable() ||n.equals(Node.ANY);
-    
-    private static Predicate<Node> checkSubject = n -> checkPredicate.test(n) || n.isBlank() || n.isNodeTriple();
+
+    private static Predicate<Node> checkSubject = n -> checkPredicate.test(n) || n.isBlank();
 
 
     /**
@@ -229,7 +229,7 @@ public void addWhere(TriplePath t) throws IllegalArgumentException {
     public void addWhere(Collection<TriplePath> t) throws IllegalArgumentException {
         t.forEach(this::addWhere);
     }
-    
+
     /**
      * Add an optional triple to the where clause
      *
@@ -244,7 +244,7 @@ public void addOptional(TriplePath t) throws IllegalArgumentException {
         ElementOptional opt = new ElementOptional(epb);
         getClause().addElement(opt);
     }
-    
+
     /**
      * Add an optional TriplePath to the where clause
      *
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
index 49876a53a72..aff7df31c88 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ConvertersTest.java
@@ -176,7 +176,7 @@ public void makeNodeTest() {
         assertEquals("text", n.getLiteralLexicalForm());
         assertEquals("en", n.getLiteralLanguage());
 
-        Node tripleNode = NodeFactory.createTripleNode(NodeFactory.createURI("a"),
+        Node tripleNode = NodeFactory.createTripleTerm(NodeFactory.createURI("a"),
                 NodeFactory.createURI("b"), NodeFactory.createURI("c"));
         n = Converters.makeNode(tripleNode, pMap);
         assertEquals(tripleNode, n);
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
index 3386f6954b8..db8e8a9c540 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/ExprFactoryTest.java
@@ -654,7 +654,7 @@ public void asExprTest_URInode() {
     public void asExprTest_Triplenode() {
         Triple expected = Triple.create(NodeFactory.createURI("a"), 
                 NodeFactory.createURI("b"), NodeFactory.createURI("c"));
-        Node tripleNode = NodeFactory.createTripleNode(expected);
+        Node tripleNode = NodeFactory.createTripleTerm(expected);
         Expr e = factory.asExpr(tripleNode);
         assertTrue(e instanceof NodeValueNode);
         NodeValueNode n = (NodeValueNode) e;
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
index 34ff6cf5b1b..605558517dc 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/WhereValidator.java
@@ -128,6 +128,22 @@ public void visit(ElementLateral el) {
         }
     }
 
+    @Override
+    public void visit(ElementSemiJoin el) {
+        checkMatching(el);
+        if (!matching) {
+            el.getSubElement().visit(this);
+        }
+    }
+
+    @Override
+    public void visit(ElementAntiJoin el) {
+        checkMatching(el);
+        if (!matching) {
+            el.getSubElement().visit(this);
+        }
+    }
+
     @Override
     public void visit(ElementOptional el) {
         checkMatching(el);
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/ValuesClauseTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/ValuesClauseTest.java
index 1cc70935c17..1b52c20bbc7 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/ValuesClauseTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/ValuesClauseTest.java
@@ -258,7 +258,7 @@ public void testAddingObject() {
         builder.addValueRow("fu", null);
         Triple expected = Triple.create(NodeFactory.createURI("a"), 
                 NodeFactory.createURI("b"), NodeFactory.createURI("c"));
-        Node tripleNode = NodeFactory.createTripleNode(expected);
+        Node tripleNode = NodeFactory.createTripleTerm(expected);
         builder.addValueRow(tripleNode, null);
 
         Query query = builder.build();
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
index 8e6421124b3..06e5bd5a45d 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java
@@ -218,9 +218,9 @@ public String getLanguage() throws ReadDeniedException, AuthenticationRequiredEx
      *                                         required to be.
      */
     @Override
-    public String getTextDirection() throws ReadDeniedException, AuthenticationRequiredException {
+    public String getBaseDirection() throws ReadDeniedException, AuthenticationRequiredException {
         checkRead();
-        return holder.getBaseItem().getTextDirection();
+        return holder.getBaseItem().getBaseDirection();
     }
 
     /**
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
index dce52073742..ef1f784ef74 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java
@@ -56,21 +56,7 @@
 import org.apache.jena.permissions.model.SecuredResource;
 import org.apache.jena.permissions.model.SecuredSeq;
 import org.apache.jena.permissions.model.SecuredStatement;
-import org.apache.jena.rdf.model.AnonId;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelChangedListener;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.NsIterator;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.RDFReaderF;
-import org.apache.jena.rdf.model.RDFReaderI;
-import org.apache.jena.rdf.model.RDFWriterI;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.rdf.model.*;
 import org.apache.jena.rdf.model.impl.NsIteratorImpl;
 import org.apache.jena.rdf.model.impl.RDFReaderFImpl;
 import org.apache.jena.rdf.model.impl.StmtIteratorImpl;
@@ -449,6 +435,23 @@ public SecuredModel add(final Resource s, final Property p, final String o, fina
         return holder.getSecuredItem();
     }
 
+    /**
+     * @sec.graph Update
+     * @sec.triple Create the triple Triple(s,p,literal(o,l,false))
+     * @throws UpdateDeniedException
+     * @throws AddDeniedException
+     * @throws AuthenticationRequiredException if user is not authenticated and is
+     *                                         required to be.
+     */
+    @Override
+    public SecuredModel add(final Resource s, final Property p, final String o, final String l, final String dir)
+            throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException {
+        checkUpdate();
+        checkCreate(Triple.create(s.asNode(), p.asNode(), NodeFactory.createLiteralDirLang(o, l, dir)));
+        holder.getBaseItem().add(s, p, o, l, dir);
+        return holder.getSecuredItem();
+    }
+
     /**
      * @sec.graph Update
      * @sec.triple Create the statement as a triple
@@ -746,6 +749,23 @@ public boolean contains(final Resource s, final Property p, final String o, fina
         return containsAny(() -> holder.getBaseItem().listStatements(s, p, o, l));
     }
 
+    /**
+     * @sec.graph Read
+     * @sec.triple Read Triple( s, p, SecNode.ANY )
+     *
+     *             if {@link SecurityEvaluator#isHardReadError()} is true and the
+     *             user does not have read access then false will be returned.
+     *
+     * @throws ReadDeniedException
+     * @throws AuthenticationRequiredException if user is not authenticated and is
+     *                                         required to be.
+     */
+    @Override
+    public boolean contains(final Resource s, final Property p, final String o, final String l, final String dir)
+            throws ReadDeniedException, AuthenticationRequiredException {
+        return containsAny(() -> holder.getBaseItem().listStatements(s, p, o, l, dir));
+    }
+
     /**
      * @sec.graph Read
      * @sec.triple Read Triple( s, p, SecNode.ANY )
@@ -1182,6 +1202,12 @@ public SecuredLiteral createLiteral(final String v, final String language) {
         return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createLiteral(v, language));
     }
 
+    @Override
+    public SecuredLiteral createLiteral(final String v, final String language, final String direction) {
+        return SecuredLiteralImpl.getInstance(holder.getSecuredItem(), holder.getBaseItem().createLiteral(v, language, direction));
+    }
+
+
     /**
      * @sec.graph Update
      * @sec.triple Create Triple( s,p,o )
@@ -2388,6 +2414,11 @@ public SecuredStatementIterator listStatements(final Resource subject, final Pro
         return stmtIterator(() -> holder.getBaseItem().listStatements(subject, predicate, object, lang));
     }
 
+    @Override
+    public StmtIterator listStatements(Resource subject, Property predicate, String object, String lang, String direction) {
+        return stmtIterator(() -> holder.getBaseItem().listStatements(subject, predicate, object, lang, direction));
+    }
+
     /**
      * @sec.graph Read
      * @sec.triple Read at least one Triple( s, p, o ) for each resource returned
@@ -3258,4 +3289,9 @@ public boolean test(RDFNode o) {
             }
         }
     }
+
+    @Override
+    public ResIterator listSubjectsWithProperty(Property p, String str, String lang, String dir) {
+        return null;
+    }
 }
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
index 15f29e69450..87e73e93fb7 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java
@@ -235,6 +235,24 @@ public void visit(OpLateral opLateral) {
         addOp(OpLateral.create(rewriteOp2(opLateral, rewriter), rewriter.getResult()));
     }
 
+    @Override
+    public void visit(OpSemiJoin opSemiJoin) {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Starting visiting OpSemiJoin");
+        }
+        final OpRewriter rewriter = new OpRewriter(securityEvaluator, graphIRI);
+        addOp(OpLateral.create(rewriteOp2(opSemiJoin, rewriter), rewriter.getResult()));
+    }
+
+    @Override
+    public void visit(OpAntiJoin opAntiJoin) {
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Starting visiting OpSemiJoin");
+        }
+        final OpRewriter rewriter = new OpRewriter(securityEvaluator, graphIRI);
+        addOp(OpLateral.create(rewriteOp2(opAntiJoin, rewriter), rewriter.getResult()));
+    }
+
     /**
      * Rewrite left and right
      */
@@ -258,18 +276,6 @@ public void visit(final OpDatasetNames dsNames) {
         addOp(dsNames);
     }
 
-    /**
-     * Rewrite left and right
-     */
-    @Override
-    public void visit(final OpDiff opDiff) {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Starting visiting OpDiff");
-        }
-        final OpRewriter rewriter = new OpRewriter(securityEvaluator, graphIRI);
-        addOp(OpDiff.create(rewriteOp2(opDiff, rewriter), rewriter.getResult()));
-    }
-
     /**
      * Rewrite sequence elements
      */
diff --git a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFChangesWriterBinary.java b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFChangesWriterBinary.java
index acf8834c324..0e538b4a739 100644
--- a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFChangesWriterBinary.java
+++ b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFChangesWriterBinary.java
@@ -250,7 +250,7 @@ public void segment() {
             return;
         }
 
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple triple = node.getTriple();
 
             RDF_Term sTerm = new RDF_Term();
diff --git a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFPatchReaderBinary.java b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFPatchReaderBinary.java
index b3c9f7a857d..5c8ae041604 100644
--- a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFPatchReaderBinary.java
+++ b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/binary/RDFPatchReaderBinary.java
@@ -223,7 +223,7 @@ public static Node fromThrift(RDF_Term term) {
             Node p = fromThrift(rt.getP()) ;
             Node o = fromThrift(rt.getO()) ;
             Triple t = Triple.create(s, p, o) ;
-            return NodeFactory.createTripleNode(t);
+            return NodeFactory.createTripleTerm(t);
         }
 
         throw new PatchException("No conversion to a Node: "+term.toString());
diff --git a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/RDFPatchReaderText.java b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/RDFPatchReaderText.java
index 893a2f1bdd1..73dcfa7e120 100644
--- a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/RDFPatchReaderText.java
+++ b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/RDFPatchReaderText.java
@@ -20,8 +20,8 @@
 
 import static org.apache.jena.rdfpatch.changes.PatchCodes.*;
 import static org.apache.jena.riot.tokens.TokenType.DOT;
-import static org.apache.jena.riot.tokens.TokenType.GT2;
-import static org.apache.jena.riot.tokens.TokenType.LT2;
+import static org.apache.jena.riot.tokens.TokenType.L_TRIPLE;
+import static org.apache.jena.riot.tokens.TokenType.R_TRIPLE;
 
 import java.io.InputStream;
 import java.util.LinkedHashMap;
@@ -260,14 +260,14 @@ private static Token nextToken(Tokenizer tokenizer) {
 
     private static Node nextNode(Tokenizer tokenizer) {
         Token tok = nextToken(tokenizer);
-        if ( tok.hasType(LT2) ) {
+        if ( tok.hasType(L_TRIPLE) ) {
             Node s = nextNode(tokenizer);
             Node p = nextNode(tokenizer);
             Node o = nextNode(tokenizer);
             Token tok2 = nextToken(tokenizer);
-            if ( ! tok2.hasType(GT2) )
-                exception(tok2, "Expected token type: "+GT2+": got "+tok2);
-            return NodeFactory.createTripleNode(s, p, o);
+            if ( ! tok2.hasType(R_TRIPLE) )
+                exception(tok2, "Expected token type: "+R_TRIPLE+": got "+tok2);
+            return NodeFactory.createTripleTerm(s, p, o);
         }
         return tokenToNode(tok);
     }
diff --git a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/TokenWriterText.java b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/TokenWriterText.java
index c3da282b371..e98704ea105 100644
--- a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/TokenWriterText.java
+++ b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/text/TokenWriterText.java
@@ -125,115 +125,6 @@ public void formatBNode(AWriter w, String label) {
         }
     }
 
-    // Temporary - for reference.
-    // See notes about NodeTriple
-
-//    static class NodeFormatterBNode extends NodeFormatterWrapper {
-//        public NodeFormatterBNode(NodeFormatter other) {
-//            super(other);
-//        }
-//
-//        @Override
-//        public void format(AWriter w, Node n) {
-//            if ( n.isBlank() ) {
-//                formatBNode(w, n);
-//                return;
-//            }
-//            // Wrapped does not work with RDF-star because we need to override the bnode format recusively.
-//            // IF wrapped.
-////            if ( n.isNodeTriple() ) {
-////                // Need to print blank nodes with this code.
-////                Triple t = n.getTriple();
-////                w.print("<< ");
-////                format(w, t.getSubject());
-////                w.print(" ");
-////                format(w, t.getPredicate());
-////                w.print(" ");
-////                format(w, t.getObject());
-////                // Need to write bnodes "our way".
-////                w.print(" >>");
-////                return;
-////            }
-//
-//            super.format(w, n);
-//        }
-//
-//        @Override
-//        public void formatBNode(AWriter w, Node n) {
-//            formatBNode(w, n.getBlankNodeLabel());
-//        }
-//
-//        @Override
-//        public void formatBNode(AWriter w, String label) {
-//            w.print("<_:");
-//            w.print(label);
-//            w.print(">");
-//        }
-//    }
-//
-//    static class NodeFormatterWrapper implements NodeFormatter {
-//        private final NodeFormatter fmt;
-//
-//        public NodeFormatterWrapper(NodeFormatter other) {
-//            this.fmt = other;
-//        }
-//
-//        @Override
-//        public void format(AWriter w, Node n) {
-//            fmt.format(w, n);
-//        }
-//
-//        @Override
-//        public void formatURI(AWriter w, Node n) {
-//            fmt.formatURI(w, n);
-//        }
-//
-//        @Override
-//        public void formatURI(AWriter w, String uriStr) {
-//            fmt.formatURI(w, uriStr);
-//        }
-//
-//        @Override
-//        public void formatVar(AWriter w, Node n) {
-//            fmt.formatVar(w, n);
-//        }
-//
-//        @Override
-//        public void formatVar(AWriter w, String name) {
-//            fmt.formatVar(w, name);
-//        }
-//
-//        @Override
-//        public void formatBNode(AWriter w, Node n) {
-//            fmt.formatBNode(w, n);
-//        }
-//
-//        @Override
-//        public void formatBNode(AWriter w, String label) {
-//            fmt.formatBNode(w, label);
-//        }
-//
-//        @Override
-//        public void formatLiteral(AWriter w, Node n) {
-//            fmt.formatLiteral(w, n);
-//        }
-//
-//        @Override
-//        public void formatLitString(AWriter w, String lex) {
-//            fmt.formatLitString(w, lex);
-//        }
-//
-//        @Override
-//        public void formatLitLang(AWriter w, String lex, String langTag) {
-//            fmt.formatLitLang(w, lex, langTag);
-//        }
-//
-//        @Override
-//        public void formatLitDT(AWriter w, String lex, String datatypeURI) {
-//            fmt.formatLitDT(w, lex, datatypeURI);
-//        }
-//    }
-
     @Override
     public void sendToken(Token token) {
         String string = tokenToString(token);
diff --git a/jena-rdfpatch/src/test/java/org/apache/jena/rdfpatch/AbstractTestPatchIO.java b/jena-rdfpatch/src/test/java/org/apache/jena/rdfpatch/AbstractTestPatchIO.java
index b62fbb9be4f..ac6e60ea67b 100644
--- a/jena-rdfpatch/src/test/java/org/apache/jena/rdfpatch/AbstractTestPatchIO.java
+++ b/jena-rdfpatch/src/test/java/org/apache/jena/rdfpatch/AbstractTestPatchIO.java
@@ -38,12 +38,12 @@ public abstract class AbstractTestPatchIO {
     private static Node g2 = SSE.parseNode("_:g2");
     private static Node s1 = SSE.parseNode(":s1");
     private static Node s2 = SSE.parseNode("_:s2");
-    private static Node s3 = SSE.parseNode("<<_:b :y 123>>");
+    private static Node s3 = SSE.parseNode("<<(_:b :y 123)>>");
     private static Node p1 = SSE.parseNode("<http://example/p1>");
     private static Node p2 = SSE.parseNode(":p2");
     private static Node o1 = SSE.parseNode("<http://example/o1>");
     private static Node o2 = SSE.parseNode("123");
-    private static Node o3 = SSE.parseNode("<< <<_:b :q _:b>> :prop _:b >>");
+    private static Node o3 = SSE.parseNode("<<(  _:b :prop <<( _:b :q _:b )>> )>>");
 
     // Dubious
     private static Node zo1 = SSE.parseNode("'abc\uFFFDdef'");
diff --git a/jena-rdfpatch/testing/files/syntax-bad-1.rdfp b/jena-rdfpatch/testing/files/syntax-bad-1.rdfp
deleted file mode 100644
index 727fa9566c8..00000000000
--- a/jena-rdfpatch/testing/files/syntax-bad-1.rdfp
+++ /dev/null
@@ -1,5 +0,0 @@
-# Text patch.
-H id <uuid:bbe2edae-325e-11ec-abcc-a70bbba0dfb1>.
-TX .
-A <http://example/s> <http://example/p> "\uFFFD" <http://example/g> .
-TC .
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/lib/DumpOps.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/lib/DumpOps.java
index 538fdef2d22..0db61101ecc 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/lib/DumpOps.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/lib/DumpOps.java
@@ -18,20 +18,20 @@
 
 package org.apache.jena.tdb1.lib;
 
-import java.io.PrintStream ;
-import java.util.Arrays ;
-import java.util.HashSet ;
-import java.util.Iterator ;
-import java.util.Set ;
-
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.ByteBufferLib ;
-import org.apache.jena.atlas.lib.Pair ;
-import org.apache.jena.atlas.lib.tuple.Tuple ;
-import org.apache.jena.atlas.lib.tuple.TupleFactory ;
-import org.apache.jena.graph.Node ;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.riot.out.NodeFmtLib ;
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.ByteBufferLib;
+import org.apache.jena.atlas.lib.Pair;
+import org.apache.jena.atlas.lib.tuple.Tuple;
+import org.apache.jena.atlas.lib.tuple.TupleFactory;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.riot.out.NodeFmtLib;
 import org.apache.jena.tdb1.TDB1Exception;
 import org.apache.jena.tdb1.base.block.Block;
 import org.apache.jena.tdb1.base.block.BlockMgr;
@@ -44,140 +44,126 @@
 import org.apache.jena.tdb1.store.tupletable.TupleIndex;
 import org.apache.jena.tdb1.store.tupletable.TupleTable;
 
-public class DumpOps
-{
-    public static void dump(Dataset ds)
-    {
-        DatasetGraphTDB dsg = (DatasetGraphTDB)(ds.asDatasetGraph()) ;
+public class DumpOps {
+    public static void dump(Dataset ds) {
+        DatasetGraphTDB dsg = (DatasetGraphTDB)(ds.asDatasetGraph());
 
-        NodeTupleTable nodeTupleTableTriples = dsg.getTripleTable().getNodeTupleTable() ;
-        NodeTupleTable nodeTupleTableQuads = dsg.getQuadTable().getNodeTupleTable() ;
+        NodeTupleTable nodeTupleTableTriples = dsg.getTripleTable().getNodeTupleTable();
+        NodeTupleTable nodeTupleTableQuads = dsg.getQuadTable().getNodeTupleTable();
 
         if ( nodeTupleTableTriples.getNodeTable() != nodeTupleTableQuads.getNodeTable() )
-            throw new TDB1Exception("Different node tables for triples and quads") ;
+            throw new TDB1Exception("Different node tables for triples and quads");
 
-        NodeTable nodeTable = nodeTupleTableTriples.getNodeTable() ;
+        NodeTable nodeTable = nodeTupleTableTriples.getNodeTable();
         // V special.
-        Set<NodeTable> dumpedNodeTables = new HashSet<>() ;
+        Set<NodeTable> dumpedNodeTables = new HashSet<>();
 
-        if ( true )
-        {
-            System.out.print("## Node Table\n") ;
-            dumpNodeTable(nodeTupleTableTriples.getNodeTable(), dumpedNodeTables) ;
-            dumpNodeTable(nodeTupleTableQuads.getNodeTable(), dumpedNodeTables) ;
+        if ( true ) {
+            System.out.print("## Node Table\n");
+            dumpNodeTable(nodeTupleTableTriples.getNodeTable(), dumpedNodeTables);
+            dumpNodeTable(nodeTupleTableQuads.getNodeTable(), dumpedNodeTables);
         }
 
-        if ( false )
-        {
-            System.out.print("## Triple Table\n") ;
-            dumpNodeTupleTable(nodeTupleTableTriples.getTupleTable()) ;
-            System.out.print("## Quad Table\n") ;
-            dumpNodeTupleTable(nodeTupleTableQuads.getTupleTable()) ;
+        if ( false ) {
+            System.out.print("## Triple Table\n");
+            dumpNodeTupleTable(nodeTupleTableTriples.getTupleTable());
+            System.out.print("## Quad Table\n");
+            dumpNodeTupleTable(nodeTupleTableQuads.getTupleTable());
         }
 
         // Indexes.
-        if ( true )
-        {
-            dumpTupleIndexes(nodeTupleTableTriples.getTupleTable().getIndexes()) ;
-            dumpTupleIndexes(nodeTupleTableQuads.getTupleTable().getIndexes()) ;
+        if ( true ) {
+            dumpTupleIndexes(nodeTupleTableTriples.getTupleTable().getIndexes());
+            dumpTupleIndexes(nodeTupleTableQuads.getTupleTable().getIndexes());
         }
 
         // Prefixes
-        if ( true )
-        {
-            System.out.print("## Prefix Table\n") ;  
-            DatasetPrefixesTDB prefixes = dsg.getStoragePrefixes() ;
-
-            NodeTupleTable pntt = prefixes.getNodeTupleTable() ;
-            if ( ! dumpedNodeTables.contains(pntt.getNodeTable()))
-            {
-                dumpNodeTable(pntt.getNodeTable(), dumpedNodeTables) ;
-                dumpedNodeTables.add(pntt.getNodeTable()) ;
+        if ( true ) {
+            System.out.print("## Prefix Table\n");
+            DatasetPrefixesTDB prefixes = dsg.getStoragePrefixes();
+
+            NodeTupleTable pntt = prefixes.getNodeTupleTable();
+            if ( !dumpedNodeTables.contains(pntt.getNodeTable()) ) {
+                dumpNodeTable(pntt.getNodeTable(), dumpedNodeTables);
+                dumpedNodeTables.add(pntt.getNodeTable());
             }
-            dumpTupleIndexes(prefixes.getNodeTupleTable().getTupleTable().getIndexes()) ;
+            dumpTupleIndexes(prefixes.getNodeTupleTable().getTupleTable().getIndexes());
         }
     }
 
-    public static void dumpNodeTable(NodeTable nodeTable, Set<NodeTable> dumpedNodeTables)
-    {
-        if ( dumpedNodeTables.contains(nodeTable) )
-            return ;
+    public static void dumpNodeTable(NodeTable nodeTable) {
+        dumpNodeTable(nodeTable, null);
+    }
+
+    public static void dumpNodeTable(NodeTable nodeTable, Set<NodeTable> dumpedNodeTables) {
+        if ( dumpedNodeTables != null && dumpedNodeTables.contains(nodeTable) )
+            return;
 
-        Iterator<Pair<NodeId, Node>> iter = nodeTable.all() ;
-        for ( ; iter.hasNext() ; )
-        {
-            Pair<NodeId, Node> pair = iter.next() ;
-            NodeId nid = pair.car() ;
+        Iterator<Pair<NodeId, Node>> iter = nodeTable.all();
+        for ( ; iter.hasNext() ; ) {
+            Pair<NodeId, Node> pair = iter.next();
+            NodeId nid = pair.car();
             Node n = pair.cdr();
-            String x = NodeFmtLib.displayStr(n) ;
-            System.out.printf("%016X %s\n", nid.getId(), x) ; 
+            String x = NodeFmtLib.displayStr(n);
+            System.out.printf("%016X %s\n", nid.getId(), x);
         }
-        dumpedNodeTables.add(nodeTable) ;
+        if ( dumpedNodeTables != null )
+            dumpedNodeTables.add(nodeTable);
     }
 
-    public static void dumpTupleIndexes(TupleIndex[] tupleIndexes)
-    {
+    public static void dumpTupleIndexes(TupleIndex[] tupleIndexes) {
         for ( TupleIndex tIdx : tupleIndexes )
-            dumpTupleIndex(tIdx) ;
+            dumpTupleIndex(tIdx);
     }
 
-    public static void dumpTupleIndex(TupleIndex tIdx)
-    {
-        System.out.print("## "+tIdx.getMappingStr()+"\n") ;
-        Iterator<Tuple<NodeId>> iter = tIdx.all() ; 
-        for ( ; iter.hasNext() ; )
-        {
-            Tuple<NodeId> t = iter.next() ;
-            System.out.print(t) ;
-            System.out.print("\n") ;
+    public static void dumpTupleIndex(TupleIndex tIdx) {
+        System.out.print("## " + tIdx.getMappingStr() + "\n");
+        Iterator<Tuple<NodeId>> iter = tIdx.all();
+        for ( ; iter.hasNext() ; ) {
+            Tuple<NodeId> t = iter.next();
+            System.out.print(t);
+            System.out.print("\n");
         }
     }
-    
-    public static void dumpBlockMgr(PrintStream out, BlockMgr blkMgr)
-    {
+
+    public static void dumpBlockMgr(PrintStream out, BlockMgr blkMgr) {
         try {
-            for ( int id = 0 ; id < 9999999 ; id++)
-            {
-                if ( ! blkMgr.valid(id) ) break ;
-                Block blk = blkMgr.getRead(id) ;
-                out.print("id="+blk.getId()+"  ") ;
-                ByteBufferLib.print(out, blk.getByteBuffer()) ;
+            for ( int id = 0 ; id < 9999999 ; id++ ) {
+                if ( !blkMgr.valid(id) )
+                    break;
+                Block blk = blkMgr.getRead(id);
+                out.print("id=" + blk.getId() + "  ");
+                ByteBufferLib.print(out, blk.getByteBuffer());
             }
-        } catch (Exception ex) { 
-            ex.printStackTrace() ;
+        } catch (Exception ex) {
+            ex.printStackTrace();
         }
     }
-    
-    public static void dumpBPlusTree(PrintStream out, BPlusTree bpt)
-    {
-        IndentedWriter iw = new IndentedWriter(out) ;
-        bpt.dump(iw) ;
+
+    public static void dumpBPlusTree(PrintStream out, BPlusTree bpt) {
+        IndentedWriter iw = new IndentedWriter(out);
+        bpt.dump(iw);
     }
-    
-    
-    public static void dumpBPlusTreeBlocks(BPlusTree bpt)
-    {
+
+    public static void dumpBPlusTreeBlocks(BPlusTree bpt) {
         System.out.println("Data blocks");
-        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr()) ;
+        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr());
         System.out.println("Node blocks");
-        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr()) ;
-    }    
-
-
-    public static void dumpNodeTupleTable(TupleTable tupleTable)
-    {
-        int N = tupleTable.getTupleLen() ;
-        NodeId[] nodeIds = new NodeId[N] ;
-        Arrays.fill(nodeIds, NodeId.NodeIdAny) ;
-        
-        Tuple<NodeId> t = TupleFactory.asTuple(nodeIds) ;
-
-        Iterator<Tuple<NodeId>> iter = tupleTable.find(t) ;
-        for ( ; iter.hasNext() ; )
-        {
-            Tuple<NodeId> tuple = iter.next() ;
-            System.out.print(tuple) ;
-            System.out.print("\n") ;
+        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr());
+    }
+
+    public static void dumpNodeTupleTable(TupleTable tupleTable) {
+        int N = tupleTable.getTupleLen();
+        NodeId[] nodeIds = new NodeId[N];
+        Arrays.fill(nodeIds, NodeId.NodeIdAny);
+
+        Tuple<NodeId> t = TupleFactory.asTuple(nodeIds);
+
+        Iterator<Tuple<NodeId>> iter = tupleTable.find(t);
+        for ( ; iter.hasNext() ; ) {
+            Tuple<NodeId> tuple = iter.next();
+            System.out.print(tuple);
+            System.out.print("\n");
         }
     }
 }
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/BindingTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/BindingTDB.java
index b07bac36255..a75ce419304 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/BindingTDB.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/solver/BindingTDB.java
@@ -27,6 +27,7 @@
 import org.apache.jena.sparql.engine.binding.Binding ;
 import org.apache.jena.sparql.engine.binding.BindingBase ;
 import org.apache.jena.tdb1.TDB1Exception;
+import org.apache.jena.tdb1.lib.DumpOps;
 import org.apache.jena.tdb1.store.NodeId;
 import org.apache.jena.tdb1.store.nodetable.NodeTable;
 
@@ -124,9 +125,15 @@ public Node get1(Var var)
             if ( NodeId.isDoesNotExist(id) )
                 return null;
             n = nodeTable.getNodeForNodeId(id) ;
-            if ( n == null )
+            if ( n == null ) {
+
+                n = nodeTable.getNodeForNodeId(id) ;
+
+                DumpOps.dumpNodeTable(nodeTable);
+
                 // But there was to put it in the BindingNodeId.
                 throw new TDB1Exception("No node in NodeTable for NodeId "+id);
+            }
             // Update cache.
             cachePut(var, n) ;
             return n ;
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/NodeType.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/NodeType.java
index 64cc687934f..35f012094d8 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/NodeType.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/NodeType.java
@@ -181,7 +181,7 @@ static public NodeType lookup(Node n)
 //            if ( n.getLiteralDatatype() == XSDDatatype.XSDdateTime )
 //                return DATETIME ;
         }
-        if ( n.isNodeTriple() ) return TRIPLETERM;
+        if ( n.isTripleTerm() ) return TRIPLETERM;
         return OTHER ;
     }
 
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
index fdc8cb4410d..9444f055647 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/DecoderSSE.java
@@ -62,7 +62,7 @@ protected static Node parseNode(String str) {
 
     protected static Node parseNode(Tokenizer tokens) {
         Token token = nextToken(tokens);
-        if ( token.hasType(TokenType.LT2) )
+        if ( token.hasType(TokenType.L_TRIPLE) )
             return parseTripleTerm(tokens);
         return tokenAsNode(token);
     }
@@ -71,9 +71,9 @@ protected static Node parseNode(Tokenizer tokens) {
     protected static Node parseTripleTerm(Tokenizer tokens) {
         Triple t = parseTriple(tokens);
         Token x = nextToken(tokens);
-        if ( x.getType() != TokenType.GT2 )
-            exception(x, "Triple term not terminated by >>: %s");
-        return NodeFactory.createTripleNode(t);
+        if ( x.getType() != TokenType.R_TRIPLE )
+            exception(x, "Triple term not terminated by )>>: %s");
+        return NodeFactory.createTripleTerm(t);
     }
 
     // Parse three terms and produce a triple.
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTableInline.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTableInline.java
index 2c4549de26e..f0ae60a360d 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTableInline.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodeTableInline.java
@@ -25,47 +25,46 @@
 /** NodeTable wrapper to handle inline node ids.
  * If a node can be made inline, then the underlying table never sees it.
  * If an inline Nodeid is seen, it is decoded and returned without
- * the underlying table being called. 
+ * the underlying table being called.
  */
 
-public class NodeTableInline extends NodeTableWrapper
-{
+public class NodeTableInline extends NodeTableWrapper {
     // Stack order: Inline > Cache > Actual
-    
-    public static NodeTable create(NodeTable nodeTable)
-    {
-        return new NodeTableInline(nodeTable) ;
+
+    public static NodeTable create(NodeTable nodeTable) {
+        return new NodeTableInline(nodeTable);
     }
-    
-    private NodeTableInline(NodeTable nodeTable)
-    {
-        super(nodeTable) ;
+
+    private NodeTableInline(NodeTable nodeTable) {
+        super(nodeTable);
     }
-    
+
     @Override
-    public final NodeId getAllocateNodeId(Node node)
-    {
-        NodeId nid = NodeId.inline(node) ;
-        if ( nid != null ) return nid ;
-        return super.getAllocateNodeId(node) ;
+    public final NodeId getAllocateNodeId(Node node) {
+        NodeId nid = NodeId.inline(node);
+        if ( nid != null )
+            return nid;
+        return super.getAllocateNodeId(node);
     }
 
     @Override
-    public final NodeId getNodeIdForNode(Node node)
-    {
-        NodeId nid = NodeId.inline(node) ;
-        if ( nid != null ) return nid ;
-        return super.getNodeIdForNode(node) ;
+    public final NodeId getNodeIdForNode(Node node) {
+        NodeId nid = NodeId.inline(node);
+        if ( nid != null )
+            return nid;
+        return super.getNodeIdForNode(node);
     }
+
     @Override
-    public final Node getNodeForNodeId(NodeId id)
-    {
-        Node n = NodeId.extract(id) ;
+    public final Node getNodeForNodeId(NodeId id) {
+        Node n = NodeId.extract(id);
         if ( n != null )
-            return n ;
-        return super.getNodeForNodeId(id) ;
+            return n;
+        return super.getNodeForNodeId(id);
     }
-    
+
     @Override
-    public String toString() { return "Inline("+nodeTable.toString()+")" ; }
+    public String toString() {
+        return "Inline(" + nodeTable.toString() + ")";
+    }
 }
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java
index 3b8c2480cb4..0c9a079fa92 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb1/store/nodetable/NodecSSE.java
@@ -79,7 +79,7 @@ public int encode(Node node, ByteBuffer bb, PrefixMapping pmap) {
         } else if ( node.isBlank() && ! onlySafeBNodeLabels ) {
             // Special case.
             str = "_:"+node.getBlankNodeLabel();
-        } else if ( node.isNodeTriple() ) {
+        } else if ( node.isTripleTerm() ) {
             // See comments in DecodeSSE.
             str = NodeFmtLib.strNT(node);
         }
@@ -161,7 +161,7 @@ else if ( !NodeUtils.isSimpleString(node) )
         if ( node.isVariable() )
             // "?"
             return 1 + maxLength(node.getName());
-        if ( node.isNodeTriple() ) {
+        if ( node.isTripleTerm() ) {
             Triple t = node.getTriple();
             // Leading an trailing <<>>, 4 spaces
             return (2 + 4 + 2) + maxLength(t.getSubject()) + maxLength(t.getPredicate()) + maxLength(t.getObject());
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java
index 1cd2aa110f4..67cb5b1dec8 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/Scripts_TDB1.java
@@ -34,8 +34,9 @@
 @Prefix("TDB1-")
 @Manifests
 ({
-    "testing/manifest.ttl",
-    "../jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl"
+    "testing/manifest.ttl"
+    // RDF-star CG tests - no longer valid
+    // ,"../jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl"
 })
 
 public class Scripts_TDB1
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java
index d1e1820c778..7b0237fbfaa 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/TestQuadFilter.java
@@ -62,8 +62,8 @@ private static Dataset setup2() {
         Dataset ds = createDataset();
         DatasetGraph dsg = ds.asDatasetGraph();
         Txn.executeWrite(dsg, () -> {
-            Quad q1 = SSE.parseQuad("(:g1 << :s :p :o1 >> :q :z1)");
-            Quad q2 = SSE.parseQuad("(:g2 << :s :p :o2 >> :q :z2)");
+            Quad q1 = SSE.parseQuad("(:g1 :r1 rdf:reifies <<( :s :p :o1 )>>)");
+            Quad q2 = SSE.parseQuad("(:g2 :r2 rdf:reifies <<( :s :p :o2 )>>)");
             dsg.add(q1);
             dsg.add(q2);
         });
@@ -85,8 +85,14 @@ private static Predicate<Tuple<NodeId>> createFilter(Dataset dataset) {
     @Test public void quad_filter_2()   { test(ds1, "SELECT * { ?s ?p ?o }", 1, 2); }
     @Test public void quad_filter_3()   { test(ds1, "SELECT * { GRAPH ?g { } }", 1, 2); }
 
-    @Test public void quad_filter_4()   { test(ds2, "SELECT * { GRAPH ?g { << ?s ?p ?o >> ?q ?z } }", 1, 2); }
-    @Test public void quad_filter_5()   { test(ds2, "SELECT * { << ?s ?p ?o >> ?q ?z }", 1, 2); }
+    @Test public void quad_filter_4()   { test(ds2, "SELECT * { GRAPH ?g { ?x ?q <<( ?s ?p ?o )>> } }", 1, 2); }
+    @Test public void quad_filter_5()   { test(ds2, "SELECT * { ?x ?q <<( ?s ?p ?o )>> }", 1, 2); }
+
+    @Test public void quad_filter_6()   { test(ds2, "SELECT * { << ?s ?p ?o >> }", 1, 2); }
+    @Test public void quad_filter_7()   { test(ds2, "SELECT * { <http://example/r1> ?P ?O }", 1, 1); }
+
+    // Reified triple.
+    @Test public void quad_filter_8()   { test(ds2, "SELECT * { << ?s ?p <http://example/o2> >> }", 0, 1); }
 
     private static void test(Dataset dataset, String qs, int withFilter, int withoutFilter) {
         Predicate<Tuple<NodeId>> filter = createFilter(dataset);
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/AbstractTestNodeTable.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/AbstractTestNodeTable.java
index 23c0b292cf0..5f633c51468 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/AbstractTestNodeTable.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/AbstractTestNodeTable.java
@@ -78,9 +78,10 @@ protected static void writeBadNode(NodeTable nt, Node badNode) {
     @Test public void nodetable_03()    { testNode("_:x"); }
     @Test public void nodetable_04()    { testNode("'x'"); }
     @Test public void nodetable_05()    { testNode("'x'@en"); }
-    @Test public void nodetable_06()    { testNode("'x'^^<http://example/dt>"); }
-    @Test public void nodetable_07()    { testNode("'نواف'"); }
-    @Test public void nodetable_08()    { testNode(SSE.parseNode("<<_:b :p 123>>")); }
+    @Test public void nodetable_06()    { testNode("'x'@en--ltr"); }
+    @Test public void nodetable_07()    { testNode("'x'^^<http://example/dt>"); }
+    @Test public void nodetable_08()    { testNode("'نواف'"); }
+    @Test public void nodetable_09()    { testNode(SSE.parseNode("<<(_:b :p 123)>>")); }
 
     static Node badNode1 = org.apache.jena.graph.NodeFactory.createLiteralLang("abc", "99bad");
 
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/TestNodec.java b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/TestNodec.java
index fa54da60624..872b90fe0ce 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/TestNodec.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb1/store/nodetable/TestNodec.java
@@ -103,7 +103,7 @@ public static Collection<Object[]> data() {
         Node s = NodeFactory.createBlankNode("a");
         Node p = NodeFactory.createURI("http://ex/p");
         Node o = NodeFactory.createLiteralLang("testcase", "en");
-        Node t = NodeFactory.createTripleNode(s, p, o);
+        Node t = NodeFactory.createTripleTerm(s, p, o);
         test (t);
     }
 
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/DumpOps.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/DumpOps.java
new file mode 100644
index 00000000000..0ee440a4dbe
--- /dev/null
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/DumpOps.java
@@ -0,0 +1,169 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.tdb2.lib;
+
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.ByteBufferLib;
+import org.apache.jena.atlas.lib.Pair;
+import org.apache.jena.atlas.lib.tuple.Tuple;
+import org.apache.jena.atlas.lib.tuple.TupleFactory;
+import org.apache.jena.dboe.base.block.Block;
+import org.apache.jena.dboe.base.block.BlockMgr;
+import org.apache.jena.dboe.trans.bplustree.BPlusTree;
+import org.apache.jena.graph.Node;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.riot.out.NodeFmtLib;
+import org.apache.jena.tdb2.TDBException;
+import org.apache.jena.tdb2.store.DatasetGraphTDB;
+import org.apache.jena.tdb2.store.NodeId;
+import org.apache.jena.tdb2.store.StoragePrefixesTDB;
+import org.apache.jena.tdb2.store.nodetable.NodeTable;
+import org.apache.jena.tdb2.store.nodetupletable.NodeTupleTable;
+import org.apache.jena.tdb2.store.tupletable.TupleIndex;
+import org.apache.jena.tdb2.store.tupletable.TupleTable;
+
+public class DumpOps {
+    public static void dump(Dataset ds) {
+        DatasetGraphTDB dsg = (DatasetGraphTDB)(ds.asDatasetGraph());
+
+        NodeTupleTable nodeTupleTableTriples = dsg.getTripleTable().getNodeTupleTable();
+        NodeTupleTable nodeTupleTableQuads = dsg.getQuadTable().getNodeTupleTable();
+
+        if ( nodeTupleTableTriples.getNodeTable() != nodeTupleTableQuads.getNodeTable() )
+            throw new TDBException("Different node tables for triples and quads");
+
+        NodeTable nodeTable = nodeTupleTableTriples.getNodeTable();
+        // V special.
+        Set<NodeTable> dumpedNodeTables = new HashSet<>();
+
+        if ( true ) {
+            System.out.print("## Node Table\n");
+            dumpNodeTable(nodeTupleTableTriples.getNodeTable(), dumpedNodeTables);
+            dumpNodeTable(nodeTupleTableQuads.getNodeTable(), dumpedNodeTables);
+        }
+
+        if ( false ) {
+            System.out.print("## Triple Table\n");
+            dumpNodeTupleTable(nodeTupleTableTriples.getTupleTable());
+            System.out.print("## Quad Table\n");
+            dumpNodeTupleTable(nodeTupleTableQuads.getTupleTable());
+        }
+
+        // Indexes.
+        if ( true ) {
+            dumpTupleIndexes(nodeTupleTableTriples.getTupleTable().getIndexes());
+            dumpTupleIndexes(nodeTupleTableQuads.getTupleTable().getIndexes());
+        }
+
+        // Prefixes
+        if ( true ) {
+            System.out.print("## Prefix Table\n");
+            StoragePrefixesTDB prefixes = (StoragePrefixesTDB)dsg.getStoragePrefixes();
+
+            NodeTupleTable pntt = prefixes.getNodeTupleTable();
+            if ( !dumpedNodeTables.contains(pntt.getNodeTable()) ) {
+                dumpNodeTable(pntt.getNodeTable(), dumpedNodeTables);
+                dumpedNodeTables.add(pntt.getNodeTable());
+            }
+            dumpTupleIndexes(prefixes.getNodeTupleTable().getTupleTable().getIndexes());
+        }
+    }
+
+    public static void dumpNodeTable(NodeTable nodeTable) {
+        dumpNodeTable(nodeTable, null);
+    }
+
+    public static void dumpNodeTable(NodeTable nodeTable, Set<NodeTable> dumpedNodeTables) {
+        if ( dumpedNodeTables != null && dumpedNodeTables.contains(nodeTable) )
+            return;
+
+        Iterator<Pair<NodeId, Node>> iter = nodeTable.all();
+        for ( ; iter.hasNext() ; ) {
+            Pair<NodeId, Node> pair = iter.next();
+            NodeId nid = pair.car();
+            Node n = pair.cdr();
+            String x = NodeFmtLib.displayStr(n);
+            System.out.printf("%016X %s\n", nid.getPtrLocation(), x);
+        }
+        if ( dumpedNodeTables != null )
+            dumpedNodeTables.add(nodeTable);
+    }
+
+    public static void dumpTupleIndexes(TupleIndex[] tupleIndexes) {
+        for ( TupleIndex tIdx : tupleIndexes )
+            dumpTupleIndex(tIdx);
+    }
+
+    public static void dumpTupleIndex(TupleIndex tIdx) {
+        System.out.print("## " + tIdx.getMappingStr() + "\n");
+        Iterator<Tuple<NodeId>> iter = tIdx.all();
+        for ( ; iter.hasNext() ; ) {
+            Tuple<NodeId> t = iter.next();
+            System.out.print(t);
+            System.out.print("\n");
+        }
+    }
+
+    public static void dumpBlockMgr(PrintStream out, BlockMgr blkMgr) {
+        try {
+            for ( int id = 0 ; id < 9999999 ; id++ ) {
+                if ( !blkMgr.valid(id) )
+                    break;
+                Block blk = blkMgr.getRead(id);
+                out.print("id=" + blk.getId() + "  ");
+                ByteBufferLib.print(out, blk.getByteBuffer());
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    public static void dumpBPlusTree(PrintStream out, BPlusTree bpt) {
+        IndentedWriter iw = new IndentedWriter(out);
+        bpt.dump(iw);
+    }
+
+    public static void dumpBPlusTreeBlocks(BPlusTree bpt) {
+        System.out.println("Data blocks");
+        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr());
+        System.out.println("Node blocks");
+        DumpOps.dumpBlockMgr(System.out, bpt.getRecordsMgr().getBlockMgr());
+    }
+
+    public static void dumpNodeTupleTable(TupleTable tupleTable) {
+        int N = tupleTable.getTupleLen();
+        NodeId[] nodeIds = new NodeId[N];
+        Arrays.fill(nodeIds, NodeId.NodeIdAny);
+
+        Tuple<NodeId> t = TupleFactory.asTuple(nodeIds);
+
+        Iterator<Tuple<NodeId>> iter = tupleTable.find(t);
+        for ( ; iter.hasNext() ; ) {
+            Tuple<NodeId> tuple = iter.next();
+            System.out.print(tuple);
+            System.out.print("\n");
+        }
+    }
+}
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/NodeLib.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/NodeLib.java
index 93ba1aa1b35..07b81cc8366 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/NodeLib.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/lib/NodeLib.java
@@ -67,7 +67,7 @@ else if ( n.isLiteral() ) {
                 dt = null;
             }
             hash(h, n.getLiteralLexicalForm(), n.getLiteralLanguage(), dt, LITERAL);
-        } else if ( n.isNodeTriple() ) {
+        } else if ( n.isTripleTerm() ) {
             String lex = NodeFmtLib.strNT(n);
             hash(h, lex, null, null, TRIPLE_TERM);
             return;
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableOps.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableOps.java
index c995b6b66d2..751170a7733 100644
--- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableOps.java
+++ b/jena-tdb2/src/main/java/org/apache/jena/tdb2/store/nodetable/NodeTableOps.java
@@ -45,7 +45,4 @@ public static List<Node> bulkNodeIdToNodeImpl(NodeTable nt, List<NodeId> nodeIds
         }
         return nodes;
     }
-
-
 }
-
diff --git a/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java b/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java
index c2f65dd73b9..7826dfb8aa2 100644
--- a/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java
+++ b/jena-tdb2/src/test/java/org/apache/jena/tdb2/Scripts_TDB2.java
@@ -34,8 +34,9 @@
 @Prefix("TDB2-")
 @Manifests
 ({
-    "testing/manifest.ttl",
-    "../jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl"
+    "testing/manifest.ttl"
+    // RDF-star CG tests - no longer valid
+    // ,"../jena-arq/testing/rdf-star-cg/sparql/eval/manifest.ttl"
 })
 
 public class Scripts_TDB2
diff --git a/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestQuadFilter.java b/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestQuadFilter.java
index 4cd978f0bcc..cc74f1b3638 100644
--- a/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestQuadFilter.java
+++ b/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/TestQuadFilter.java
@@ -19,6 +19,7 @@
 package org.apache.jena.tdb2.store;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.util.function.Predicate;
 
@@ -61,15 +62,14 @@ private static Dataset setup2() {
         Dataset ds = createDataset();
         DatasetGraph dsg = ds.asDatasetGraph();
         Txn.executeWrite(dsg, () -> {
-            Quad q1 = SSE.parseQuad("(:g1 << :s :p :o1 >> :q :z1)");
-            Quad q2 = SSE.parseQuad("(:g2 << :s :p :o2 >> :q :z2)");
+            Quad q1 = SSE.parseQuad("(:g1 :r1 rdf:reifies <<( :s :p :o1 )>>)");
+            Quad q2 = SSE.parseQuad("(:g2 :r2 rdf:reifies <<( :s :p :o2 )>>)");
             dsg.add(q1);
             dsg.add(q2);
         });
         return ds;
     }
 
-
     /** Create a filter to exclude the graph http://example/g2 */
     private static Predicate<Tuple<NodeId>> createFilter(Dataset dataset) {
         return Txn.calculateRead(dataset, ()->{
@@ -85,8 +85,15 @@ private static Predicate<Tuple<NodeId>> createFilter(Dataset dataset) {
     @Test public void quad_filter_2()   { test(ds1, "SELECT * { ?s ?p ?o }", 1, 2); }
     @Test public void quad_filter_3()   { test(ds1, "SELECT * { GRAPH ?g { } }", 1, 2); }
 
-    @Test public void quad_filter_4()   { test(ds2, "SELECT * { GRAPH ?g { << ?s ?p ?o >> ?q ?z } }", 1, 2); }
-    @Test public void quad_filter_5()   { test(ds2, "SELECT * { << ?s ?p ?o >> ?q ?z }", 1, 2); }
+    @Test public void quad_filter_4()   { test(ds2, "SELECT * { GRAPH ?g { ?x ?q <<( ?s ?p ?o )>> } }", 1, 2); }
+    @Test public void quad_filter_5()   { test(ds2, "SELECT * { ?x ?q <<( ?s ?p ?o )>> }", 1, 2); }
+
+    @Test public void quad_filter_6()   { test(ds2, "SELECT * { << ?s ?p ?o >> }", 1, 2); }
+    @Test public void quad_filter_7()   { test(ds2, "SELECT * { <http://example/r1> ?P ?O }", 1, 1); }
+
+    // Reified triple.
+    @Test public void quad_filter_8()   { test(ds2, "SELECT * { << ?s ?p <http://example/o2> >> }", 0, 1); }
+
 
     private static void test(Dataset dataset, String qs, int withFilter, int withoutFilter) {
         Predicate<Tuple<NodeId>> filter = createFilter(dataset);
@@ -103,6 +110,8 @@ private static void test(Dataset dataset, String qs, int withFilter, int without
             // No filter.
             try(QueryExecution qExec = QueryExecutionFactory.create(query, dataset)) {
                 qExec.getContext().setTrue(TDB2.symUnionDefaultGraph);
+                Dataset dsx = qExec.getDataset();
+                assertNotNull(dsx);
                 long x2 = ResultSetFormatter.consume(qExec.execSelect());
                 assertEquals(withoutFilter, x2);
             }
diff --git a/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/nodetable/AbstractTestNodeTable.java b/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/nodetable/AbstractTestNodeTable.java
index ab668b55059..c52647feb5d 100644
--- a/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/nodetable/AbstractTestNodeTable.java
+++ b/jena-tdb2/src/test/java/org/apache/jena/tdb2/store/nodetable/AbstractTestNodeTable.java
@@ -62,6 +62,8 @@ protected static void writeNode(NodeTable nt, Node n) {
     @Test public void nodetable_03()    { testNode("_:x"); }
     @Test public void nodetable_04()    { testNode("'x'"); }
     @Test public void nodetable_05()    { testNode("'x'@en"); }
-    @Test public void nodetable_06()    { testNode("'x'^^<http://example/dt>"); }
-    @Test public void nodetable_07()    { testNode("'نواف'"); }
+    @Test public void nodetable_06()    { testNode("'x'@en--ltr"); }
+    @Test public void nodetable_07()    { testNode("'x'^^<http://example/dt>"); }
+    @Test public void nodetable_08()    { testNode("'نواف'"); }
+    @Test public void nodetable_09()    { testNode("'نواف'"); }
 }
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
index bf53deb48aa..cdff708449b 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java
@@ -36,7 +36,6 @@
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.sparql.core.Var;
-import org.apache.jena.sparql.util.NodeFactoryExtra ;
 import org.apache.lucene.analysis.Analyzer ;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.KeywordAnalyzer ;
@@ -809,7 +808,6 @@ public EntityDefinition getDocDef() {
     }
 
     private Node entryToNode(String v) {
-        // TEMP
-        return NodeFactoryExtra.createLiteralNode(v, null, null) ;
+        return NodeFactory.createLiteralString(v) ;
     }
 }