From f3a7af52a077f69703a0fb63b4552054d4f126e0 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 1 Oct 2019 13:52:29 -0700 Subject: [PATCH 01/18] First stab at describing `@direction` in the syntax document. Note that examples won't build properly until it's fully supported in the Ruby implementation. For #11. --- common/extract-examples.rb | 12 ++ common/terms.html | 4 + index.html | 248 +++++++++++++++++++++++++++++++++++-- 3 files changed, 253 insertions(+), 11 deletions(-) diff --git a/common/extract-examples.rb b/common/extract-examples.rb index 44fc8eb3..622a6e97 100755 --- a/common/extract-examples.rb +++ b/common/extract-examples.rb @@ -119,6 +119,18 @@ def table_to_dataset(table) # We might think something was an IRI, but determine that it's not object = RDF::Literal(object.to_s, language: cell.to_sym) end + when 'Direction' + case cell + when '-', /^\s*$/ + else + value = object.to_s + language = object.language + object = RDF::Node.new + repo << RDF::Statement.new(object, RDF.value, RDF::Literal(value)) + repo << RDF::Statement.new(object, RDF.to_uri + "language", RDF::Literal(language.to_s)) if language + repo << RDF::Statement.new(object, RDF.to_uri + "direction", RDF::Literal(cell.to_s)) + # We might think something was an IRI, but determine that it's not + end end end repo << RDF::Statement.new(subject, predicate, object, graph_name: gname) diff --git a/common/terms.html b/common/terms.html index 2f75e8ae..71a9f45d 100644 --- a/common/terms.html +++ b/common/terms.html @@ -174,6 +174,10 @@ whose value MUST be a string representing a [[BCP47]] language code or null.
default object
A default object is a map that has a @default key.
+
default text direction
+ The default text direction is the direction used when a string does not have a direction associated with it directly. + It can be set in the context using the @direction key + whose value MUST be one of the strings `"ltr"`, `"rtl"`, or null.
embedded context
An embedded context is a context which appears as the @context entry of one of the following: diff --git a/index.html b/index.html index 50dbf364..42c881c3 100644 --- a/index.html +++ b/index.html @@ -522,6 +522,11 @@

Syntax Tokens and Keywords

developers to express specific identifiers in a compact manner. The @context keyword is described in detail in .
+
@direction
+
Used to set the text direction of a JSON-LD value, + which are not typed values (e.g. strings, or language-tagged strings). + This keyword is described in + .
@id
Used to uniquely identify node objects that are being described in the document with IRIs or @@ -4460,7 +4465,7 @@

Using the Document Base for the Default Vocabulary

When transformed into RDF, the JSON literal will have a lexical form based on a specific serialization of the JSON, - as described in Compaction algorithm of [[JSON-LD11-API]] + as described in Compaction algorithm of [[JSON-LD11-API]] and the JSON datatype.

The following example shows an example of a JSON Literal contained as the @@ -4944,7 +4949,6 @@

Using the Document Base for the Default Vocabulary

String Internationalization

-

At times, it is important to annotate a string with its language. In JSON-LD this is possible in a variety of ways. First, it is possible to define a default language for a JSON-LD document @@ -5009,8 +5013,9 @@

Using the Document Base for the Default Vocabulary

The example above would associate the ja language - code with the two strings 花澄 and 科学者. - Languages codes are defined in [[BCP47]]. The default language applies to all + code with the two strings 花澄 and 科学者 + Languages codes are defined in [[BCP47]]. + The default language applies to all string values that are not type coerced.

To clear the default language for a subtree, @language can @@ -5156,6 +5161,204 @@

Using the Document Base for the Default Vocabulary

See for a description of using language maps to set the language of mapped values.

+ +

Text Direction

+

It is also possible to annotate a string, or language-tagged string, + with its text direction. + As with language, it is possible to define a default text direction for a JSON-LD document + by setting the `@direction` key in the context:

+ + + +

The example above would associate the ar language + and "rtl" text direction + code with the two strings HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة. + The default text direction applies to all + string values that are not type coerced.

+ +

To clear the default text direction for a subtree, @direction can + be set to null in an intervening context, such as a scoped context as follows:

+ + 
+  
+
+ +

Second, it is possible to associate a text direction with a specific term + using an expanded term definition:

+ + 
+  
+
+ +

The example above would associate مكتبة with the specified default + language code ar and no text direction, + HTML and CSS: Design and Build Websites with the language code + en and text direction `ltr`, + and HTML و CSS: تصميم و إنشاء مواقع الويب with the language code ar + and text direction `rtl`.

+ +

Text direction associations are only applied to plain + strings and language-tagged strings. + Typed values or values that are subject to type coercion + are not given a text direction.

+ +

Third, it is possible to override the default text direction by using a + value object:

+ + 
+  
+
+ +

See [[[string-meta]]] [[string-meta]] for a deeper discussion of text direction.

+
@@ -11238,8 +11441,8 @@

Data Model

JSON-LD is a serialization format for Linked Data based on JSON. It is therefore important to distinguish between the syntax, which is defined by JSON in [[RFC8259]], and the data model which is - an extension of the RDF data model [[RDF11-CONCEPTS]]. The precise - details of how JSON-LD relates to the RDF data model are given in + an extension of the RDF data model [[RDF11-CONCEPTS]]. + The precise details of how JSON-LD relates to the RDF data model are given in .

To ease understanding for developers unfamiliar with the RDF model, the @@ -11320,6 +11523,9 @@

Data Model

The language tag MUST be well-formed according to section 2.2.9 Classes of Conformance of [[BCP47]]. +
  • Either strings, or language-tagged strings may include + a text direction, which represents an extension to the underlying + RDF data model.
  • A list is a sequence of zero or more IRIs, blank nodes, and JSON-LD values. Lists are interpreted as @@ -11744,13 +11950,17 @@

    Graph Objects

    Value Objects

    A value object is used to explicitly associate a type or a - language with a value to create a typed value or a language-tagged - string.

    + language with a value to create a typed value or a language-tagged string + and possibly associate a text direction.

    A value object MUST be a map containing the @value key. It MAY also contain an @type, - an @language, an @index, or an @context key but MUST NOT contain - both an @type and an @language key at the same time. + an @language, + an `@direction`, + an @index, or an @context key but MUST NOT contain + both an @type and either @language + or `@direction` + keys at the same time. A value object MUST NOT contain any other keys that expand to an absolute IRI or keyword.

    @@ -11771,6 +11981,9 @@

    Value Objects

    The value associated with the @language key MUST have the lexical form described in [[BCP47]], or be null.

    +

    The value associated with the @direction key MUST be + one of `ltr` or `rtl`, or be null.

    +

    The value associated with the @index key MUST be a string.

    @@ -11786,7 +11999,12 @@

    Value Patterns

    extends a value object to allow entries used specifically for framing.

      -
    • The values of @value, @language and @type MAY additionally be +
    • The values of + @value, + @language, + @direction and + @type + MAY additionally be an empty map (wildcard), an array containing only an empty map, an empty array (match none) @@ -12381,6 +12599,14 @@

      Relationship to RDF

      and false. The JSON-LD 1.1 Processing Algorithms and API specification [[JSON-LD11-API]] defines the conversion rules between JSON's native data types and RDF's counterparts to allow round-tripping.
      • +
    • As an extension to the RDF data model, + typed literals, where the datatype is `xsd:string`, or language-tagged strings + MAY include a text direction. + As there is not yet any standardized mechanism for representing the text direction + of RDF literals, the JSON-LD to RDF transformation can loose this direction. + The Deserialize JSON-LD to RDF Algorithm + also provides a means of representing text direction + using non-standardized mechanisms which will preserve round-tripping through RDF.

    The use of blank node identifiers to label properties is obsolete, From 329d1d02ca28e23bc0e23f1fc0ea0d5f815a94ac Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Tue, 1 Oct 2019 14:04:59 -0700 Subject: [PATCH 02/18] Set language and direction on HTML representations in different languages. --- index.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index 42c881c3..d01e19dc 100644 --- a/index.html +++ b/index.html @@ -4992,8 +4992,8 @@

    Using the Document Base for the Default Vocabulary

    data-to-rdf> SubjectPropertyValueLanguage - _:b0http://example.org/name花澄ja - _:b0http://example.org/occupation科学者ja + _:b0http://example.org/name花澄ja + _:b0http://example.org/occupation科学者ja 
    Using the Document Base for the Default Vocabulary
   
 
   
    The example above would associate the ja language
-    code with the two strings 花澄 and 科学者
+    code with the two strings 花澄 and 科学者
     Languages codes are defined in [[BCP47]].
     The default language applies to all
     string values that are not type coerced.
    
@@ -5069,7 +5069,7 @@ 
    Using the Document Base for the Default Vocabulary
    
 
   
    The example above would associate 忍者 with the specified default
     language code ja, Ninja with the language code
-    en, and Nindža with the language code cs.
+    en, and Nindža with the language code cs.
     The value of name, Yagyū Muneyoshi wouldn't be
     associated with any language code since @language was reset to
     null in the expanded term definition.
    
@@ -5209,8 +5209,8 @@ 
    Using the Document Base for the Default Vocabulary
    
            data-to-rdf>
       SubjectPropertyValueLanguageDirection
       
-        _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبarrtl
-        _:b0http://example.org/publisherمكتبةarrtl
+        _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبarrtl
+        _:b0http://example.org/publisherمكتبةarrtl
       
     
     
    Using the Document Base for the Default Vocabulary
 
   
    The example above would associate the ar language
     and "rtl" text direction
-    code with the two strings HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة.
+    code with the two strings
+    HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة.
     The default text direction applies to all
     string values that are not type coerced.
    
 
@@ -5324,11 +5325,11 @@ 
    Using the Document Base for the Default Vocabulary
    
   -->
   
    
 
-  
    The example above would associate مكتبة with the specified default
+  
    The example above would associate مكتبة with the specified default
     language code ar and no text direction,
     HTML and CSS: Design and Build Websites with the language code
     en and text direction `ltr`,
-    and HTML و CSS: تصميم و إنشاء مواقع الويب with the language code ar
+    and HTML و CSS: تصميم و إنشاء مواقع الويب with the language code ar
     and text direction `rtl`.
    
 
   
    Text direction associations are only applied to plain
@@ -5501,7 +5502,7 @@ 
    Using the Document Base for the Default Vocabulary
    
   
     http://example.org/articles/8
     dcterms:title
-    Das Kapital
+    Das Kapital
     de
   
   
@@ -7538,8 +7539,8 @@ 
    Using the Document Base for the Default Vocabulary
    
       SubjectPropertyValueLanguage
       
         http://example.com/queenhttp://example.com/vocab/labelThe Queenen
-        http://example.com/queenhttp://example.com/vocab/labelDie Königinde
-        http://example.com/queenhttp://example.com/vocab/labelIhre Majestätde
+        http://example.com/queenhttp://example.com/vocab/labelDie Königinde
+        http://example.com/queenhttp://example.com/vocab/labelIhre Majestätde
       
     
     
    Date: Tue, 1 Oct 2019 14:08:12 -0700
Subject: [PATCH 03/18] Minor tweak.

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d01e19dc..51c620fe 100644
--- a/index.html
+++ b/index.html
@@ -12603,7 +12603,7 @@ 
    Relationship to RDF
    
     
  • As an extension to the RDF data model,
       typed literals, where the datatype is `xsd:string`, or language-tagged strings
       MAY include a text direction.
-      As there is not yet any standardized mechanism for representing the text direction
+      As there is currently no standardized mechanism for representing the text direction
       of RDF literals, the JSON-LD to RDF transformation can loose this direction.
       The Deserialize JSON-LD to RDF Algorithm
       also provides a means of representing text direction

From 1fe24aecda0079293ed21a7783c413b9e322d5d6 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg 
Date: Wed, 2 Oct 2019 11:11:50 -0700
Subject: [PATCH 04/18] Suggestions from @aphillips.

---
 index.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 51c620fe..d778b388 100644
--- a/index.html
+++ b/index.html
@@ -5067,11 +5067,11 @@ 
    Using the Document Base for the Default Vocabulary
    
   -->
   
    • 
 
-  
    The example above would associate 忍者 with the specified default
-    language code ja, Ninja with the language code
-    en, and Nindža with the language code cs.
-    The value of name, Yagyū Muneyoshi wouldn't be
-    associated with any language code since @language was reset to
+  
    The example above would associate 忍者 with the specified default
+    language tag ja, Ninja with the language tag
+    en, and Nindža with the language tag cs.
+    The value of name, Yagyū Muneyoshi wouldn't be
+    associated with any language tag since @language was reset to
     null in the expanded term definition.
    
 
   
    Language associations are only applied to plain
@@ -5326,10 +5326,10 @@ 
    Using the Document Base for the Default Vocabulary

    The example above would associate مكتبة with the specified default - language code ar and no text direction, - HTML and CSS: Design and Build Websites with the language code + language tag ar and no text direction, + HTML and CSS: Design and Build Websites with the language tag en and text direction `ltr`, - and HTML و CSS: تصميم و إنشاء مواقع الويب with the language code ar + and HTML و CSS: تصميم و إنشاء مواقع الويب with the language tag ar and text direction `rtl`.

    Text direction associations are only applied to plain @@ -12065,7 +12065,7 @@

    Language Maps

    or an array containing both @language and @set . The keys of a language map MUST be strings representing - [[BCP47]] language codes, the keyword @none, + [[BCP47]] language tags, the keyword @none, or a term which expands to @none, and the values MUST be any of the following types:

    @@ -12604,7 +12604,7 @@

    Relationship to RDF

    typed literals, where the datatype is `xsd:string`, or language-tagged strings MAY include a text direction. As there is currently no standardized mechanism for representing the text direction - of RDF literals, the JSON-LD to RDF transformation can loose this direction. + of RDF literals, the JSON-LD to RDF transformation loses the base direction. The Deserialize JSON-LD to RDF Algorithm also provides a means of representing text direction using non-standardized mechanisms which will preserve round-tripping through RDF.
    • From 737a602331c77e5c880a874789ea2d8dfcd250b5 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 2 Oct 2019 11:21:51 -0700 Subject: [PATCH 05/18] Set `@direction` in example 72 to `null`. --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index d778b388..a929cebd 100644 --- a/index.html +++ b/index.html @@ -5352,7 +5352,8 @@

    Using the Document Base for the Default Vocabulary

    "title": "HTML و CSS: تصميم و إنشاء مواقع الويب", "author": ****{ "@value": "Jon Duckett", - "@language": "en" + "@language": "en", + "@direction": null }**** } --> From e924c63012d7874c861a56db85e5ef383e20fdbe Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 2 Oct 2019 11:22:11 -0700 Subject: [PATCH 06/18] Update to use "base direction" instead of "text direction". --- common/terms.html | 4 +-- index.html | 68 ++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/common/terms.html b/common/terms.html index 71a9f45d..17641ac2 100644 --- a/common/terms.html +++ b/common/terms.html @@ -174,8 +174,8 @@ whose value MUST be a string representing a [[BCP47]] language code or null.
    default object
    A default object is a map that has a @default key.
    -
    default text direction
    - The default text direction is the direction used when a string does not have a direction associated with it directly. +
    default base direction
    + The default base direction is the direction used when a string does not have a direction associated with it directly. It can be set in the context using the @direction key whose value MUST be one of the strings `"ltr"`, `"rtl"`, or null.
    embedded context
    diff --git a/index.html b/index.html index a929cebd..9bb13d15 100644 --- a/index.html +++ b/index.html @@ -523,7 +523,7 @@

    Syntax Tokens and Keywords

    @context keyword is described in detail in .
    @direction
    -
    Used to set the text direction of a JSON-LD value, +
    Used to set the base direction of a JSON-LD value, which are not typed values (e.g. strings, or language-tagged strings). This keyword is described in .
    @@ -5162,14 +5162,14 @@

    Using the Document Base for the Default Vocabulary

    See for a description of using language maps to set the language of mapped values.

    -

    Text Direction

    +

    Base Direction

    It is also possible to annotate a string, or language-tagged string, - with its text direction. - As with language, it is possible to define a default text direction for a JSON-LD document + with its base direction. + As with language, it is possible to define a default base direction for a JSON-LD document by setting the `@direction` key in the context:

    @@ -11526,7 +11526,7 @@

    Data Model

    2.2.9 Classes of Conformance of [[BCP47]].
  • Either strings, or language-tagged strings may include - a text direction, which represents an extension to the underlying + a base direction, which represents an extension to the underlying RDF data model.
  • A list is a sequence of zero or more IRIs, blank nodes, and JSON-LD values. @@ -11953,7 +11953,7 @@

    Value Objects

    A value object is used to explicitly associate a type or a language with a value to create a typed value or a language-tagged string - and possibly associate a text direction.

    + and possibly associate a base direction.

    A value object MUST be a map containing the @value key. It MAY also contain an @type, @@ -12603,11 +12603,11 @@

    Relationship to RDF

    between JSON's native data types and RDF's counterparts to allow round-tripping.
  • As an extension to the RDF data model, typed literals, where the datatype is `xsd:string`, or language-tagged strings - MAY include a text direction. - As there is currently no standardized mechanism for representing the text direction + MAY include a base direction. + As there is currently no standardized mechanism for representing the base direction of RDF literals, the JSON-LD to RDF transformation loses the base direction. The Deserialize JSON-LD to RDF Algorithm - also provides a means of representing text direction + also provides a means of representing base direction using non-standardized mechanisms which will preserve round-tripping through RDF.
    • @@ -12862,14 +12862,14 @@

    Internationalization Considerations

    such as the [[HTML]] dir attribute, which currently has no counterpart for RDF literals.

    -

    The issue of properly representing text direction in RDF is not something that +

    The issue of properly representing base direction in RDF is not something that this Working Group can handle, as it is a limitation or the core RDF data model. This Working Group expects that a future RDF Working Group will consider the matter - and add the ability to specify the text direction of language-tagged strings.

    + and add the ability to specify the base direction of language-tagged strings.

    Until a more comprehensive solution can be addressed in a future version of this specification, publishers should consider this issue when representing strings - where the text direction of the string cannot otherwise be correctly inferred + where the base direction of the string cannot otherwise be correctly inferred based on the content of the string. See [[?string-meta]] for a discussion best practices for identifying language and base direction for strings used on the Web.

    @@ -13499,6 +13499,8 @@

    Changes since JSON-LD Community Group Final Report

    are not embedded as values of the containing node object.
  • The `alternate` link relation can be used to supply an alternate location for retrieving a JSON-LD document when the returned document is not JSON.
    • +
  • Value objects, and associated context and term definitions have been updated to + support `@direction` for setting the base direction of strings.
    • From 528d4c4043ba7813b9d224bb42c594d7969a1268 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 2 Oct 2019 12:04:35 -0700 Subject: [PATCH 07/18] Minor tweaks to attempt to fix HTML presentation of ltr example. --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 9bb13d15..e4e2a12c 100644 --- a/index.html +++ b/index.html @@ -5305,7 +5305,7 @@

    Using the Document Base for the Default Vocabulary

    using an expanded term definition:

    +       title="Expanded term definition with language and direction">
    -

    The example above would associate مكتبة with the specified default - language tag ar and no base direction, - HTML and CSS: Design and Build Websites with the language tag - en and base direction `ltr`, and - HTML و CSS: تصميم و إنشاء مواقع الويب - with the language tag ar and base direction `rtl`.

    +

    The example above would create three properties:

    + + + + + + + +
    SubjectPropertyValueLanguage CodeBase Direction
    _:b0ex:publisherمكتبةar`null`
    _:b0ex:titleHTML و CSS: تصميم و إنشاء مواقع الويبar`rtl`
    _:b0ex:titleHTML and CSS: Design and Build Websitesen`ltr`

    Base direction associations are only applied to plain strings and language-tagged strings. From 471095d5953d479b63453c60a86f99062e43bf59 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Thu, 3 Oct 2019 16:19:52 -0700 Subject: [PATCH 09/18] Describe datatype and bnode mechanisms for describing base direction in RDF. --- common/extract-examples.rb | 7 +-- index.html | 99 +++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 7 deletions(-) diff --git a/common/extract-examples.rb b/common/extract-examples.rb index 622a6e97..6b589061 100755 --- a/common/extract-examples.rb +++ b/common/extract-examples.rb @@ -123,12 +123,7 @@ def table_to_dataset(table) case cell when '-', /^\s*$/ else - value = object.to_s - language = object.language - object = RDF::Node.new - repo << RDF::Statement.new(object, RDF.value, RDF::Literal(value)) - repo << RDF::Statement.new(object, RDF.to_uri + "language", RDF::Literal(language.to_s)) if language - repo << RDF::Statement.new(object, RDF.to_uri + "direction", RDF::Literal(cell.to_s)) + object = RDF::Literal(object.to_s, datatype: RDF::URI("https://www.w3.org/i18n##{object.language}_#{cell}")) # We might think something was an IRI, but determine that it's not end end diff --git a/index.html b/index.html index 3b70c91d..4730cc50 100644 --- a/index.html +++ b/index.html @@ -674,6 +674,10 @@

    Syntax Tokens and Keywords

    prov http://www.w3.org/ns/prov# + + i18n + https://www.w3.org/i18n# + rdf http://www.w3.org/1999/02/22-rdf-syntax-ns# @@ -5232,6 +5236,7 @@

    Using the Document Base for the Default Vocabulary

    data-content-type="text/turtle" data-result-for="Setting the default base direction of a JSON-LD document-expanded" data-transform="updateExample" + data-options="rdfDirection=datatype" data-to-rdf> + +

    See for more details + on using base direction for strings.

    + + +

    The `rdf:CompoundLiteral` class and the `rdf:language` and `rdf:direction` Datatypes

    +

    This specification defines the `rdf:CompoundLiteral` datatype, which is in the domain + of `rdf:language` and `rdf:direction` to be used for describing RDF literal values + containing base direction and a possible language tag to be associated with the + string value of `rdf:value` on the same subject.

    + +
    +
    `rdf:CompoundLiteral`
    +
    A class representing a compound literal.
    +
    `rdf:language`
    +
    An RDF property. + The range of the property is an `rdfs:Literal`, whose value MUST be a well-formed [[BCP47]] language tag. + The domain of the property is `rdf:CompoundLiteral`.
    +
    `rdf:direction`
    +
    An RDF property. + The range of the property is an `rdfs:Literal`, whose value MUST be either `"ltr"` or `"rtl"`. + The domain of the property is `rdf:CompoundLiteral`.
    +
    + +

    The Deserialize JSON-LD to RDF Algorithm + can be used with the rdfDirection + set to `bnode` to generate RDF literals using these properties to + describe the base direction and optional language tag from + value objects containing `@direction` and optionally `@language`.

    + +

    The following example shows two statements with compoud literals + representing strings with the language tag `ar` and base direction `rtl`.

    + 
    +    
+
    +

    See for more details + on using base direction for strings.

    +
    From 61d59ac783acfc99edd098be888d3859a001c6ef Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Champin Date: Fri, 4 Oct 2019 17:29:42 +0200 Subject: [PATCH 10/18] changed a few remaining "language code" into "language tag" --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 4730cc50..80edc836 100644 --- a/index.html +++ b/index.html @@ -5017,8 +5017,8 @@

    Using the Document Base for the Default Vocabulary

    The example above would associate the ja language - code with the two strings 花澄 and 科学者 - Languages codes are defined in [[BCP47]]. + tag with the two strings 花澄 and 科学者 + Languages tags are defined in [[BCP47]]. The default language applies to all string values that are not type coerced.

    @@ -5275,9 +5275,9 @@

    Using the Document Base for the Default Vocabulary

    -

    The example above would associate the ar language +

    The example above would associate the ar language tag and "rtl" base direction - code with the two strings + with the two strings HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة. The default base direction applies to all string values that are not type coerced.

    From 91a3b028f7c324b1d86aed3d69807384b129e0da Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Fri, 4 Oct 2019 10:44:58 -0700 Subject: [PATCH 11/18] Apply suggestions from code review From @pchampin and @dlongley. Co-Authored-By: Pierre-Antoine Champin Co-Authored-By: Dave Longley --- index.html | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 80edc836..78205fbf 100644 --- a/index.html +++ b/index.html @@ -5193,7 +5193,7 @@

    Using the Document Base for the Default Vocabulary

    ****"@language": "ar", "@direction": "rtl"**** }, - ****"title": "HTML و CSS: تصميم و إنشاء مواقع الويب"****, + ****"title": "HTML و CSS: تصميم و إنشاء مواقع الويب", "publisher": "مكتبة"**** } --> @@ -11996,7 +11996,7 @@

    Value Objects

    lexical form described in [[BCP47]], or be null.

    The value associated with the @direction key MUST be - one of `ltr` or `rtl`, or be null.

    + one of "ltr" or "rtl", or be null.

    The value associated with the @index key MUST be a string.

    @@ -12021,7 +12021,7 @@

    Value Patterns

    MAY additionally be an empty map (wildcard), an array containing only an empty map, - an empty array (match none) + an empty array (match none), an array of strings.
    @@ -12614,13 +12614,13 @@

    Relationship to RDF

    defines the conversion rules between JSON's native data types and RDF's counterparts to allow round-tripping.
  • As an extension to the RDF data model, - typed literals, where the datatype is `xsd:string`, or language-tagged strings + literals without an explicit datatype MAY include a base direction. As there is currently no standardized mechanism for representing the base direction - of RDF literals, the JSON-LD to RDF transformation loses the base direction. - The Deserialize JSON-LD to RDF Algorithm - also provides a means of representing base direction - using non-standardized mechanisms which will preserve round-tripping through RDF.
    • + of RDF literals, the JSON-LD to standard RDF transformation loses the base direction. + However, the Deserialize JSON-LD to RDF Algorithm + provides a means of representing base direction + using mechanisms which will preserve round-tripping through non-standard RDF.

    The use of blank node identifiers to label properties is obsolete, @@ -12841,7 +12841,7 @@

    Serializing/Deserializing RDF

    The `i18n` Namespace

    The `i18n:` namespace is used for describing combinations of language tag and base direction in RDF literals. It is used as an alternative mechanism for describing the [[BCP47]] language tag and base direction - of RDF literals that would otherwise be use `xsd:string` or `rdf:langString` datatypes.

    + of RDF literals that would otherwise use the `xsd:string` or `rdf:langString` datatypes.

    Datatypes based on this namespace allow round-tripping of JSON-LD documents using base direction, although the mechanism is not otherwise standardized.

    The Deserialize JSON-LD to RDF Algorithm @@ -12863,7 +12863,7 @@

    Serializing/Deserializing RDF

    @prefix ex: . @prefix i18n: . - # Note that this version preserves the base direction using a datatype. + # Note that this version preserves the base direction using a non-standard datatype. [ ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"^^i18n:ar_rtl****; ex:publisher ****"مكتبة"^^i18n:ar_rtl**** @@ -12874,8 +12874,8 @@

    Serializing/Deserializing RDF

    on using base direction for strings.

    -

    The `rdf:CompoundLiteral` class and the `rdf:language` and `rdf:direction` Datatypes

    -

    This specification defines the `rdf:CompoundLiteral` datatype, which is in the domain +

    The `rdf:CompoundLiteral` class and the `rdf:language` and `rdf:direction` properties

    +

    This specification defines the `rdf:CompoundLiteral` class, which is in the domain of `rdf:language` and `rdf:direction` to be used for describing RDF literal values containing base direction and a possible language tag to be associated with the string value of `rdf:value` on the same subject.

    @@ -12909,7 +12909,6 @@

    Serializing/Deserializing RDF

    @@ -5213,8 +5213,8 @@

    Using the Document Base for the Default Vocabulary

    data-to-rdf> SubjectPropertyValueLanguageDirection - _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبarrtl - _:b0http://example.org/publisherمكتبةarrtl + _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبar-EGrtl + _:b0http://example.org/publisherمكتبةar-EGrtl 
    Using the Document Base for the Default Vocabulary
 
     # Note that this version drops the base direction.
     [
-      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"****@ar;
-      ex:publisher ****"مكتبة"****@ar
+      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"****@ar-EG;
+      ex:publisher ****"مكتبة"****@ar-EG
     ] .
     -->
    @@ -5244,8 +5244,8 @@

    Using the Document Base for the Default Vocabulary

    # Note that this version preserves the base direction using a datatype. [ - ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"^^i18n:ar_rtl****; - ex:publisher ****"مكتبة"^^i18n:ar_rtl**** + ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"^^i18n:ar-EG_rtl****; + ex:publisher ****"مكتبة"^^i18n:ar-EG_rtl**** ] . --> @@ -5262,12 +5262,12 @@

    Using the Document Base for the Default Vocabulary

    [ ex:title ****[ rdf:value "HTML و CSS: تصميم و إنشاء مواقع الويب", - rdf:language "ar", + rdf:language "ar-EG", rdf:direction "rtl" ]****; ex:publisher ****[ rdf:value "مكتبة", - rdf:language "ar", + rdf:language "ar-EG", rdf:direction "rtl" ]**** ] . @@ -5275,10 +5275,10 @@

    Using the Document Base for the Default Vocabulary

    -

    The example above would associate the ar language tag +

    The example above would associate the ar-EG language tag and "rtl" base direction with the two strings - HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة. + HTML و CSS: تصميم و إنشاء مواقع الويب and مكتبة. The default base direction applies to all string values that are not type coerced.

    @@ -5293,7 +5293,7 @@

    Using the Document Base for the Default Vocabulary

    ####...#### ****"@version": 1.1,**** "@vocab": "http://example.com/", - "@language": "ar", + "@language": "ar-EG", "@direction": "rtl", "details": { ****"@context": { @@ -5317,7 +5317,7 @@

    Using the Document Base for the Default Vocabulary

    "@context": { ####...#### "ex": "http://example.com/vocab/", - "@language": "ar", + "@language": "ar-EG", "@direction": "rtl", "publisher": { "@id": "ex:name", ****"@direction": null**** }, "title": { "@id": "ex:title" }, @@ -5338,8 +5338,8 @@

    Using the Document Base for the Default Vocabulary

    data-to-rdf> SubjectPropertyValueLanguageDirection - _:b0ex:publisherمكتبةar`null` - _:b0ex:titleHTML و CSS: تصميم و إنشاء مواقع الويبar`rtl` + _:b0ex:publisherمكتبةar-EG`null` + _:b0ex:titleHTML و CSS: تصميم و إنشاء مواقع الويبar-EG`rtl` _:b0ex:titleHTML and CSS: Design and Build Websitesen`ltr` @@ -5358,7 +5358,7 @@

    Using the Document Base for the Default Vocabulary

    { "@context": { ####...#### - "@language": "ar", + "@language": "ar-EG", "@direction": "rtl" }, "title": "HTML و CSS: تصميم و إنشاء مواقع الويب", @@ -12852,8 +12852,8 @@

    Serializing/Deserializing RDF

    the value of `@language`, if any, followed by an underscore (`"_"`) followed by the value of `@direction`.

    -

    The following example shows two statements with literal values of `i18n:ar_rtl`, - which encodes the language tag `ar` and the base direction `rtl`.

    +

    The following example shows two statements with literal values of `i18n:ar-EG_rtl`, + which encodes the language tag `ar-EG` and the base direction `rtl`.

    Serializing/Deserializing RDF
 
     # Note that this version preserves the base direction using a non-standard datatype.
     [
-      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"^^i18n:ar_rtl****;
-      ex:publisher ****"مكتبة"^^i18n:ar_rtl****
+      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"^^i18n:ar-EG_rtl****;
+      ex:publisher ****"مكتبة"^^i18n:ar-EG_rtl****
     ] .
     -->
    @@ -12900,7 +12900,7 @@

    Serializing/Deserializing RDF

    value objects containing `@direction` and optionally `@language`.

    The following example shows two statements with compoud literals - representing strings with the language tag `ar` and base direction `rtl`.

    + representing strings with the language tag `ar-EG` and base direction `rtl`.

    Serializing/Deserializing RDF
     [
       ex:title ****[
         rdf:value "HTML و CSS: تصميم و إنشاء مواقع الويب",
-        rdf:language "ar",
+        rdf:language "ar-EG",
         rdf:direction "rtl"
       ]****;
       ex:publisher ****[
         rdf:value "مكتبة",
-        rdf:language "ar",
+        rdf:language "ar-EG",
         rdf:direction "rtl"
       ]****
     ] .

From b1caa2e46b7dcec63a24f6ec75472b2e45044b7a Mon Sep 17 00:00:00 2001
From: Gregg Kellogg 
Date: Fri, 4 Oct 2019 11:26:29 -0700
Subject: [PATCH 14/18] Change option values for rdfDirection per @pchampin's
 suggestions.

---
 index.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index f4cd3ad8..f51e41c7 100644
--- a/index.html
+++ b/index.html
@@ -12845,8 +12845,8 @@ 
    Serializing/Deserializing RDF
    
     
    Datatypes based on this namespace allow round-tripping of JSON-LD documents using base direction,
       although the mechanism is not otherwise standardized.
    
     
    The Deserialize JSON-LD to RDF Algorithm
-      can be used with the rdfDirection
-      set to `datatype` to generate RDF literals using the `i18n` base to create an IRI
+      can be used with the rdfDirection option
+      set to `i18n-datatype` to generate RDF literals using the `i18n` base to create an IRI
       encoding the base direction along with optional language tag from
       value objects containing `@direction` by appending to `https://www.w3.org/ns/i18n#`
       the value of `@language`, if any, followed by an underscore (`"_"`) followed
@@ -12894,8 +12894,8 @@ 
    Serializing/Deserializing RDF
    
     
 
     
    The Deserialize JSON-LD to RDF Algorithm
-      can be used with the rdfDirection
-      set to `bnode` to generate RDF literals using these properties to
+      can be used with the rdfDirection option
+      set to `compound-literal` to generate RDF literals using these properties to
       describe the base direction and optional language tag from
       value objects containing `@direction` and optionally `@language`.
    
 
@@ -12955,11 +12955,11 @@ 
    Internationalization Considerations
    
     properly record JSON-LD Values which are strings with left-to-right or right-to-left direction indicators.
     Both JSON-LD and RDF provide a mechanism for specifying the language associated with
     a string (language-tagged string), but do not provide a means of indicating
-    the base direction of the string.
    
+    the base direction of the string.
    
 
   
    Unicode provides a mechanism for signaling direction within a string
     (see [[[UAX9]]] [[UAX9]]),
-    however, when a string has an overall base direction which cannot be determined by the
+    however, when a string has an overall base direction which cannot be determined by the
     beginning of the string, an external indicator is required,
     such as the [[HTML]] dir attribute,
     which currently has no counterpart for RDF literals.
    
@@ -12971,7 +12971,7 @@ 
    Internationalization Considerations
    
 
   
    Until a more comprehensive solution can be addressed in a future version of this
     specification, publishers should consider this issue when representing strings
-    where the base direction of the string cannot otherwise be correctly inferred
+    where the base direction of the string cannot otherwise be correctly inferred
     based on the content of the string.
     See [[?string-meta]] for a discussion best practices for
     identifying language and base direction for strings used on the Web.
    

From ddc0a50fccf212430a3939ff389077730435f663 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg 
Date: Fri, 4 Oct 2019 11:47:13 -0700
Subject: [PATCH 15/18] Add warning to i18n and compound-literal sections.

---
 index.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/index.html b/index.html
index f51e41c7..7fadca1a 100644
--- a/index.html
+++ b/index.html
@@ -12852,6 +12852,10 @@ 
    Serializing/Deserializing RDF
    
       the value of `@language`, if any, followed by an underscore (`"_"`) followed
       by the value of `@direction`.
    
 
+    
    This feature is experimental, as RDF does not have a
+      standard way to represent base direction in RDF literals.
+      A future RDF Working Group may support base direction differently.
    
+
     
    The following example shows two statements with literal values of `i18n:ar-EG_rtl`,
       which encodes the language tag `ar-EG` and the base direction `rtl`.
    
     
    Serializing/Deserializing RDF
       describe the base direction and optional language tag from
       value objects containing `@direction` and optionally `@language`.
    
 
+    
    This feature is experimental, as RDF does not have a
+      standard way to represent base direction in RDF literals.
+      A future RDF Working Group may support base direction differently.
    
+
     
    The following example shows two statements with compoud literals
       representing strings with the language tag `ar-EG` and base direction `rtl`.
    
     
    Date: Mon, 7 Oct 2019 16:06:37 -0700
Subject: [PATCH 16/18] Update `base direction` definition.

---
 common/terms.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/terms.html b/common/terms.html
index 17641ac2..1a122622 100644
--- a/common/terms.html
+++ b/common/terms.html
@@ -174,8 +174,8 @@
     whose value MUST be a string representing a [[BCP47]] language code or null.
   
    default object
    
     A default object is a map that has a @default key.
    
-  
    default base direction
    
-    The default base direction is the direction used when a string does not have a direction associated with it directly.
+  
    base direction
    
+    The base direction is the direction used when a string does not have a direction associated with it directly.
     It can be set in the context using the @direction key
     whose value MUST be one of the strings `"ltr"`, `"rtl"`, or null.
    
   
    embedded context
    

From e4f87ba76c34048b6312dfc54cba3d2feb8c37c8 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg 
Date: Thu, 10 Oct 2019 13:23:14 -0700
Subject: [PATCH 17/18] Change warnings about i18n-datatpe and compound-literal
 sections as being AT RISK (they're already informative).

---
 index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 7fadca1a..e6f04400 100644
--- a/index.html
+++ b/index.html
@@ -12852,9 +12852,11 @@ 
    Serializing/Deserializing RDF
    
       the value of `@language`, if any, followed by an underscore (`"_"`) followed
       by the value of `@direction`.
    
 
-    
    This feature is experimental, as RDF does not have a
+    
    This feature is experimental, as RDF does not have a
       standard way to represent base direction in RDF literals.
-      A future RDF Working Group may support base direction differently.
    
+      A future RDF Working Group may support base direction differently.
+      The JSON-LD Working Group solicits feedback from the community on the
+      usefulness of these transformations.
    
 
     
    The following example shows two statements with literal values of `i18n:ar-EG_rtl`,
       which encodes the language tag `ar-EG` and the base direction `rtl`.
    
@@ -12903,9 +12905,11 @@ 
    Serializing/Deserializing RDF
    
       describe the base direction and optional language tag from
       value objects containing `@direction` and optionally `@language`.
    
 
-    
    This feature is experimental, as RDF does not have a
+    
    This feature is experimental, as RDF does not have a
       standard way to represent base direction in RDF literals.
-      A future RDF Working Group may support base direction differently.
    
+      A future RDF Working Group may support base direction differently.
+      The JSON-LD Working Group solicits feedback from the community on the
+      usefulness of these transformations.
    
 
     
    The following example shows two statements with compoud literals
       representing strings with the language tag `ar-EG` and base direction `rtl`.
    

From 736d67f048b5893b5c38547fda64b86bbf39a957 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg 
Date: Thu, 10 Oct 2019 14:39:24 -0700
Subject: [PATCH 18/18] Fix examples for direction and regenerate example
 files.

---
 Gemfile.lock                                  |  10 +-
 common/extract-examples.rb                    |   2 +-
 ...-linking-to-their-parent-compacted.jsonld} |   0
 ...using-a-reverse-property-compacted.jsonld} |   0
 ...ontext-with-an-exception-compacted.jsonld} |   0
 ...context-with-an-exception-statements.table |   2 +-
 ...e-imported-in-a-type-scoped-context.jsonld |   8 ++
 ...nld => Aliasing-keywords-compacted.jsonld} |   0
 ...ion-of-values-in-JSON-LD-compacted.jsonld} |   0
 ...ion-of-values-in-JSON-LD-compacted.jsonld} |   0
 examples/Clearing-default-language.jsonld     |  19 +--
 ...ernal-and-local-contexts-compacted.jsonld} |   5 +-
 ...xternal-and-local-contexts-expanded.jsonld |   2 +-
 ...ternal-and-local-contexts-statements.table |   2 +-
 ...ing-external-and-local-contexts-turtle.ttl |   2 +-
 ...ents-into-a-single-dataset-compacted.html} |   0
 ...nts-into-a-single-dataset-statements.table |   2 +-
 ...sing-a-default-vocabulary-compacted.jsonld |   2 +-
 ...-using-a-default-vocabulary-context.jsonld |   2 +-
 ...using-a-default-vocabulary-expanded.jsonld |   4 +-
 .../Context-defined-in-an-HTML-document.html  |  32 -----
 ...ted-if-graph-is-not-used-compacted.jsonld} |   0
 ...nates-expressed-in-JSON-LD-compacted.json} |   0
 ...within-a-term-definition-compacted.jsonld} |   0
 ...-definition-used-on-type-compacted.jsonld} |   0
 ...m-definition-used-on-type-statements.table |   2 +-
 .../Defining-property-nesting-Context.jsonld  |  10 ++
 ...ng-property-nesting-Expanded-Input.jsonld} |   0
 ...efining-property-nesting-compacted.jsonld} |   0
 ...Defining-property-nesting-statements.table |   2 +-
 ...nnected-nodes-with-graph-compacted.jsonld} |   0
 ...ected-nodes-with-included-compacted.jsonld |  18 +++
 ...nected-nodes-with-included-expanded.jsonld |  17 +++
 ...ected-nodes-with-included-flattened.jsonld |  15 ++
 ...ected-nodes-with-included-statements.table |  47 +++++++
 ...isconnected-nodes-with-included-turtle.ttl |   7 +
 ...exts-within-node-objects-compacted.jsonld} |   0
 ...LD-containing-HTML-in-HTML-compacted.html} |   0
 ... Embedding-JSON-LD-in-HTML-compacted.html} |   0
 ...nld => Embedding-Objects-compacted.jsonld} |   0
 ...e-of-another-node-object-compacted.jsonld} |   0
 ...ivity-for-type-statements-compacted.table} |   2 +-
 ...inition-with-language-and-direction.jsonld |  14 ++
 ...ition-with-type-coercion-compacted.jsonld} |   0
 ...rm-definition-with-types-compacted.jsonld} |   0
 ...Expanded-value-with-type-compacted.jsonld} |   0
 ...oped-contexts-embedding-equivalent-.jsonld |  24 ++++
 ...-using-embedded-and-scoped-contexts.jsonld |  34 +++++
 ...-form-for-included-blocks-flattened.jsonld |  30 ++++
 ...-form-for-included-blocks-statements.table |  60 ++++++++
 ...ttened-form-for-included-blocks-turtle.ttl |  11 ++
 ...that-describes-a-book-using-microdata.html |   8 +-
 ...ld => Identifying-a-node-compacted.jsonld} |   0
 ...statements-about-a-graph-compacted.jsonld} |   4 +-
 ...g-statements-about-a-graph-expanded.jsonld |   4 +-
 ...-statements-about-a-graph-statements.table |   4 +-
 ...-making-statements-about-a-graph-trig.trig |   2 +-
 ...> Implicitly-named-graph-compacted.jsonld} |   0
 ...-line-context-definition-compacted.jsonld} |   0
 examples/Included-Blocks.jsonld               |  27 ++++
 ...N-LD-by-node-identifiers-compacted.jsonld} |   5 +-
 ...e-identifiers-using-none-compacted.jsonld} |   0
 ...-with-set-representation-compacted.jsonld} |   0
 ...-data-in-JSON-LD-by-type-compacted.jsonld} |   0
 ...ON-LD-by-type-using-none-compacted.jsonld} |   0
 ...-with-set-representation-compacted.jsonld} |   0
 .../Indexing-data-in-JSON-LD-compacted.jsonld |  27 ++++
 .../Indexing-data-in-JSON-LD-expanded.jsonld  |  31 ++---
 .../Indexing-data-in-JSON-LD-original.jsonld  |  27 ----
 .../Indexing-data-in-JSON-LD-statements.table |  98 ++++++-------
 examples/Indexing-data-in-JSON-LD-turtle.ttl  |  25 ++--
 .../Indexing-data-using-none-compacted.jsonld |  32 +++++
 .../Indexing-data-using-none-expanded.jsonld  |  44 +++---
 .../Indexing-data-using-none-original.jsonld  |  33 -----
 .../Indexing-data-using-none-statements.table | 131 +++++++++---------
 examples/Indexing-data-using-none-turtle.ttl  |  33 ++---
 ...ng-graph-data-in-JSON-LD-compacted.jsonld} |   0
 ...-using-none-for-no-index-compacted.jsonld} |   0
 ...agged-strings-in-JSON-LD-compacted.jsonld} |   0
 ...-with-set-representation-compacted.jsonld} |   0
 ...D-with-set-representation-statements.table |   4 +-
 ...ing-none-for-no-language-compacted.jsonld} |   0
 ...l.jsonld => JSON-Literal-compacted.jsonld} |   0
 examples/JSON-Literal-statements.table        |   2 +-
 ...-context-to-not-propagate-compacted.jsonld |  17 +++
 ...a-context-to-not-propagate-expanded.jsonld |   9 ++
 ...-context-to-not-propagate-statements.table |  25 ++++
 ...king-a-context-to-not-propagate-turtle.ttl |   8 ++
 ...alues-of-different-types-compacted.jsonld} |   4 +-
 ...-values-of-different-types-expanded.jsonld |   2 +-
 ...values-of-different-types-statements.table |  10 +-
 ...array-values-of-different-types-turtle.ttl |   4 +-
 ...s-with-no-inherent-order-compacted.jsonld} |   0
 ...nld => Nested-properties-compacted.jsonld} |   0
 ...d-into-containing-object-compacted.jsonld} |   0
 ...e-direction-using-an-expanded-value.jsonld |  12 ++
 ...definitions-are-identical-statements.table |  30 ++++
 ...onld => Prefix-expansion-compacted.jsonld} |   0
 ...perty-based-data-indexing-compacted.jsonld |  26 ++++
 ...operty-based-data-indexing-original.jsonld |  30 ----
 ...ncing-Objects-on-the-Web-compacted.jsonld} |   0
 ...ontext-in-an-HTML-document-expanded.jsonld |  10 --
 ...ontext-in-an-HTML-document-original.jsonld |   7 -
 ...ntext-in-an-HTML-document-statements.table |  29 ----
 ...g-a-Context-in-an-HTML-document-turtle.ttl |   6 -
 ...encing-a-JSON-LD-context-compacted.jsonld} |   0
 ...ing-an-unidentified-node-compacted.jsonld} |   0
 ...d-graphs-using-an-id-map-compacted.jsonld} |   8 +-
 ...med-graphs-using-an-id-map-expanded.jsonld |   8 +-
 ...ed-graphs-using-an-id-map-statements.table |  20 +--
 ...ing-named-graphs-using-an-id-map-trig.trig |  10 +-
 ...sing-an-id-map-with-none-compacted.jsonld} |   4 +-
 ...-using-an-id-map-with-none-expanded.jsonld |   4 +-
 ...using-an-id-map-with-none-statements.table |   4 +-
 ...graphs-using-an-id-map-with-none-trig.trig |   2 +-
 ...Referencing-node-objects-compacted.jsonld} |   0
 ...context-and-setting-it-to-propagate.jsonld |  16 +++
 ...-modify-vocab-and-a-term-definition.jsonld |  13 ++
 ...ption-in-JSON-LD-avoiding-contexts-.jsonld |   8 +-
 ...ion-of-a-JSON-LD-document-compacted.jsonld |  10 ++
 ...tion-of-a-JSON-LD-document-expanded.jsonld |   4 +
 ...ion-of-a-JSON-LD-document-statements.table |  26 ++++
 ...direction-of-a-JSON-LD-document-turtle.ttl |   6 +
 ...ge-of-a-JSON-LD-document-compacted.jsonld} |   0
 ...age-of-a-JSON-LD-document-statements.table |   4 +-
 ...ument-base-in-a-document-compacted.jsonld} |   0
 ...context-and-setting-it-to-propagate.jsonld |  13 ++
 ...-modify-vocab-and-a-term-definition.jsonld |  11 ++
 ...al-blank-node-identifier-compacted.jsonld} |   0
 ...ultiple-types-for-a-node-compacted.jsonld} |   0
 ...s-ordered-in-the-context-compacted.jsonld} |   0
 ...unordered-in-the-context-compacted.jsonld} |   0
 ...ying-the-type-for-a-node-compacted.jsonld} |   0
 ...finition-with-language-and-direction.table |  33 +++++
 ...cific-script-element-by-id-compacted.html} |   0
 ...ific-script-element-by-id-statements.table |   2 +-
 ...ompact-and-absolute-IRIs-compacted.jsonld} |   0
 ...r-values-not-identifiers-compacted.jsonld} |   5 +-
 ...for-values-not-identifiers-expanded.jsonld |  16 +--
 ...or-values-not-identifiers-statements.table |   8 +-
 ...sion-for-values-not-identifiers-turtle.ttl |   2 +-
 ...-from-context-definition-compacted.jsonld} |   0
 ...d-when-document-relative-compacted.jsonld} |   5 +-
 ...ded-when-document-relative-expanded.jsonld |  16 +--
 ...expanded-when-document-relative-turtle.ttl |   2 +-
 ....jsonld => Type-coercion-compacted.jsonld} |   0
 ...ing-a-default-vocabulary-compacted.jsonld} |   0
 ...vious-default-vocabulary-compacted.jsonld} |   0
 ...term-to-specify-the-type-compacted.jsonld} |   0
 ...m-to-set-multiple-values-compacted.jsonld} |   0
 ...rm-to-set-multiple-values-statements.table |   2 +-
 ...cabulary-mapping-expanded-statements.table |  14 +-
 ...xpress-the-default-graph-compacted.jsonld} |   0
 ... Using-multiple-contexts-compacted.jsonld} |   0
 ...efine-reverse-properties-compacted.jsonld} |   0
 ...blish-the-default-base-IRI-compacted.html} |   0
 ...l-keyword-to-ignore-data-compacted.jsonld} |   0
 ...ld => Using-vocabularies-compacted.jsonld} |   0
 ...-property-scoped-context-compacted.jsonld} |   6 +-
 ...n-property-scoped-context-statements.table |   2 +-
 ...tted-in-property-scoped-context-turtle.ttl |   8 +-
 index.html                                    |  40 +++---
 ...en-linking-to-their-parent-compacted.yaml} |   2 +-
 ...dren-linking-to-their-parent-expanded.yaml |   2 +-
 ...n-using-a-reverse-property-compacted.yaml} |   2 +-
 ...ren-using-a-reverse-property-expanded.yaml |   2 +-
 ...en-using-a-reverse-property-flattened.yaml |   2 +-
 ...-context-with-an-exception-compacted.yaml} |   2 +-
 ...ed-context-with-an-exception-expanded.yaml |   2 +-
 ...-be-imported-in-a-type-scoped-context.yaml |   7 +
 ....yaml => Aliasing-keywords-compacted.yaml} |   2 +-
 ...ction-of-values-in-JSON-LD-compacted.yaml} |   2 +-
 ...lection-of-values-in-JSON-LD-expanded.yaml |   2 +-
 ...ction-of-values-in-JSON-LD-compacted.yaml} |   2 +-
 ...lection-of-values-in-JSON-LD-expanded.yaml |   2 +-
 yaml/Clearing-default-language.yaml           |  16 ++-
 .../Coercing-Values-to-Strings-compacted.yaml |   2 +-
 yaml/Coercing-Values-to-Strings-context.yaml  |   2 +-
 yaml/Coercing-Values-to-Strings-expanded.yaml |   2 +-
 ...xternal-and-local-contexts-compacted.yaml} |   6 +-
 ...-external-and-local-contexts-expanded.yaml |   2 +-
 ...ple-context-has-been-applied-original.yaml |   2 +-
 ...Compacting-using-a-base-IRI-compacted.yaml |   2 +-
 yaml/Compacting-using-a-base-IRI-context.yaml |   2 +-
 .../Compacting-using-a-base-IRI-expanded.yaml |   2 +-
 ...-using-a-default-vocabulary-compacted.yaml |   4 +-
 ...ng-using-a-default-vocabulary-context.yaml |   4 +-
 ...g-using-a-default-vocabulary-expanded.yaml |   6 +-
 ...cated-if-graph-is-not-used-compacted.yaml} |   2 +-
 ...licated-if-graph-is-not-used-expanded.yaml |   2 +-
 yaml/Coordinates-expressed-in-GeoJSON.yaml    |   2 +-
 ...nates-expressed-in-JSON-LD-compacted.yaml} |   2 +-
 ...dinates-expressed-in-JSON-LD-expanded.yaml |   2 +-
 ...t-within-a-term-definition-compacted.yaml} |   2 +-
 ...rm-definition-used-on-type-compacted.yaml} |   2 +-
 yaml/Defining-property-nesting-Context.yaml   |  15 ++
 ...ning-property-nesting-Expanded-Input.yaml} |   2 +-
 ... Defining-property-nesting-compacted.yaml} |   2 +-
 ...connected-nodes-with-graph-compacted.yaml} |   2 +-
 ...nnected-nodes-with-included-compacted.yaml |  17 +++
 ...onnected-nodes-with-included-expanded.yaml |  17 +++
 ...nnected-nodes-with-included-flattened.yaml |  16 +++
 ...ntexts-within-node-objects-compacted.yaml} |   2 +-
 ...N-LD-containing-HTML-in-HTML-expanded.yaml |   2 +-
 yaml/Embedding-JSON-LD-in-HTML-expanded.yaml  |   2 +-
 ....yaml => Embedding-Objects-compacted.yaml} |   2 +-
 ...lue-of-another-node-object-compacted.yaml} |   2 +-
 ...value-of-another-node-object-expanded.yaml |   2 +-
 ...ting-the-context-sensitivity-for-type.yaml |   2 +-
 ...orm-for-the-previous-example-expanded.yaml |   2 +-
 ...efinition-with-language-and-direction.yaml |  19 +++
 ...xpanded-term-definition-with-language.yaml |   2 +-
 ...inition-with-type-coercion-compacted.yaml} |   2 +-
 ...efinition-with-type-coercion-expanded.yaml |   2 +-
 ...term-definition-with-types-compacted.yaml} |   2 +-
 ...d-term-definition-with-types-expanded.yaml |   2 +-
 ...> Expanded-value-with-type-compacted.yaml} |   2 +-
 yaml/Expanded-value-with-type-expanded.yaml   |   2 +-
 ...scoped-contexts-embedding-equivalent-.yaml |  20 +++
 ...on-using-embedded-and-scoped-contexts.yaml |  27 ++++
 ...orm-for-the-previous-example-original.yaml |   2 +-
 ...xpanded-form-for-the-previous-example.yaml |   2 +-
 ...ed-form-for-included-blocks-flattened.yaml |  26 ++++
 yaml/Flattened-library-objects.yaml           |   2 +-
 yaml/Forcing-Object-Values-compacted.yaml     |   2 +-
 yaml/Forcing-Object-Values-context.yaml       |   2 +-
 yaml/Forcing-Object-Values-expanded.yaml      |   2 +-
 yaml/Framed-library-objects-original.yaml     |   2 +-
 ...yaml => Identifying-a-node-compacted.yaml} |   2 +-
 ...g-statements-about-a-graph-compacted.yaml} |   6 +-
 ...ing-statements-about-a-graph-expanded.yaml |   6 +-
 ... => Implicitly-named-graph-compacted.yaml} |   2 +-
 yaml/Implicitly-named-graph-expanded.yaml     |   2 +-
 ...In-line-context-definition-compacted.yaml} |   2 +-
 yaml/Included-Blocks.yaml                     |  24 ++++
 ...SON-LD-by-node-identifiers-compacted.yaml} |   7 +-
 ...-JSON-LD-by-node-identifiers-expanded.yaml |   2 +-
 ...ode-identifiers-using-none-compacted.yaml} |   2 +-
 ...-node-identifiers-using-none-expanded.yaml |   2 +-
 ...rs-with-set-representation-compacted.yaml} |   2 +-
 ...iers-with-set-representation-expanded.yaml |   2 +-
 ...ng-data-in-JSON-LD-by-type-compacted.yaml} |   2 +-
 ...xing-data-in-JSON-LD-by-type-expanded.yaml |   2 +-
 ...JSON-LD-by-type-using-none-compacted.yaml} |   2 +-
 ...n-JSON-LD-by-type-using-none-expanded.yaml |   2 +-
 ...pe-with-set-representation-compacted.yaml} |   2 +-
 ...type-with-set-representation-expanded.yaml |   2 +-
 yaml/Indexing-data-in-JSON-LD-compacted.yaml  |  22 +++
 yaml/Indexing-data-in-JSON-LD-expanded.yaml   |  35 ++---
 yaml/Indexing-data-in-JSON-LD-original.yaml   |  22 ---
 yaml/Indexing-data-using-none-compacted.yaml  |  26 ++++
 yaml/Indexing-data-using-none-expanded.yaml   |  44 +++---
 yaml/Indexing-data-using-none-original.yaml   |  27 ----
 ...xing-graph-data-in-JSON-LD-compacted.yaml} |   2 +-
 ...dexing-graph-data-in-JSON-LD-expanded.yaml |   2 +-
 ...hs-using-none-for-no-index-compacted.yaml} |   2 +-
 ...aphs-using-none-for-no-index-expanded.yaml |   2 +-
 ...uage-tagged-strings-and-set-compacted.yaml |   2 +-
 ...nguage-tagged-strings-and-set-context.yaml |   2 +-
 ...guage-tagged-strings-and-set-expanded.yaml |   2 +-
 ...ing-language-tagged-strings-compacted.yaml |   2 +-
 ...exing-language-tagged-strings-context.yaml |   2 +-
 ...xing-language-tagged-strings-expanded.yaml |   2 +-
 ...-tagged-strings-in-JSON-LD-compacted.yaml} |   2 +-
 ...ed-tagged-strings-in-JSON-LD-expanded.yaml |   2 +-
 ...LD-with-set-representation-compacted.yaml} |   2 +-
 ...N-LD-with-set-representation-expanded.yaml |   2 +-
 ...using-none-for-no-language-compacted.yaml} |   2 +-
 ...s-using-none-for-no-language-expanded.yaml |   2 +-
 ...-types-for-numbers-and-boolean-values.yaml |   2 +-
 ...ginal.yaml => JSON-Literal-compacted.yaml} |   2 +-
 yaml/JSON-Literal-expanded.yaml               |   2 +-
 ...ressing-a-property-in-three-languages.yaml |   2 +-
 yaml/Linked-Data-Dataset-compacted.yaml       |   2 +-
 yaml/Linked-Data-Dataset-expanded.yaml        |   2 +-
 ...-a-context-to-not-propagate-compacted.yaml |  12 ++
 ...g-a-context-to-not-propagate-expanded.yaml |   6 +
 ...-values-of-different-types-compacted.yaml} |   6 +-
 ...ay-values-of-different-types-expanded.yaml |   4 +-
 ...ues-with-no-inherent-order-compacted.yaml} |   2 +-
 ...alues-with-no-inherent-order-expanded.yaml |   2 +-
 ....yaml => Nested-properties-compacted.yaml} |   2 +-
 yaml/Nested-properties-expanded.yaml          |   2 +-
 ...ded-into-containing-object-compacted.yaml} |   2 +-
 ...olded-into-containing-object-expanded.yaml |   2 +-
 ...ase-direction-using-an-expanded-value.yaml |  10 ++
 ...ault-language-using-an-expanded-value.yaml |   2 +-
 ...l.yaml => Prefix-expansion-compacted.yaml} |   2 +-
 ...roperty-based-data-indexing-compacted.yaml |  21 +++
 ...Property-based-data-indexing-original.yaml |  25 ----
 ...rencing-Objects-on-the-Web-compacted.yaml} |   2 +-
 ...-Context-in-an-HTML-document-expanded.yaml |  10 --
 ...-Context-in-an-HTML-document-original.yaml |   7 -
 ...erencing-a-JSON-LD-context-compacted.yaml} |   2 +-
 ...ncing-an-unidentified-node-compacted.yaml} |   2 +-
 ...rencing-an-unidentified-node-expanded.yaml |   2 +-
 ...med-graphs-using-an-id-map-compacted.yaml} |  10 +-
 ...named-graphs-using-an-id-map-expanded.yaml |  10 +-
 ...-using-an-id-map-with-none-compacted.yaml} |   6 +-
 ...hs-using-an-id-map-with-none-expanded.yaml |   6 +-
 ...> Referencing-node-objects-compacted.yaml} |   2 +-
 yaml/Referencing-node-objects-expanded.yaml   |   2 +-
 ...e-information-using-an-expanded-value.yaml |   2 +-
 ...d-context-and-setting-it-to-propagate.yaml |  13 ++
 ...to-modify-vocab-and-a-term-definition.yaml |  11 ++
 ...eversing-Node-Relationships-compacted.yaml |   2 +-
 .../Reversing-Node-Relationships-context.yaml |   2 +-
 ...Reversing-Node-Relationships-expanded.yaml |   2 +-
 ...ription-in-JSON-LD-avoiding-contexts-.yaml |  10 +-
 ...LD-context-shared-among-node-objects-.yaml |   2 +-
 yaml/Same-embedding-example-in-JSON-LD.yaml   |   2 +-
 ...mple-with-a-list-of-values-in-JSON-LD.yaml |   2 +-
 ...ample-JSON-LD-document-to-be-expanded.yaml |   2 +-
 ...mple-JSON-LD-document-to-be-flattened.yaml |   2 +-
 yaml/Sample-JSON-LD-document.yaml             |   2 +-
 yaml/Sample-context.yaml                      |   2 +-
 yaml/Sample-expanded-JSON-LD-document.yaml    |   2 +-
 yaml/Sample-library-frame.yaml                |   2 +-
 yaml/Setting-container-set-on-type.yaml       |   2 +-
 ...ction-of-a-JSON-LD-document-compacted.yaml |   9 ++
 ...ection-of-a-JSON-LD-document-expanded.yaml |  10 ++
 ...uage-of-a-JSON-LD-document-compacted.yaml} |   2 +-
 ...nguage-of-a-JSON-LD-document-expanded.yaml |   2 +-
 ...ocument-base-in-a-document-compacted.yaml} |   2 +-
 ...-document-base-in-a-document-expanded.yaml |   2 +-
 ...d-context-and-setting-it-to-propagate.yaml |  10 ++
 ...to-modify-vocab-and-a-term-definition.yaml |   9 ++
 ...ocal-blank-node-identifier-compacted.yaml} |   2 +-
 ...-local-blank-node-identifier-expanded.yaml |   2 +-
 ...-multiple-types-for-a-node-compacted.yaml} |   2 +-
 ...-is-ordered-in-the-context-compacted.yaml} |   2 +-
 ...on-is-ordered-in-the-context-expanded.yaml |   2 +-
 ...s-unordered-in-the-context-compacted.yaml} |   2 +-
 ...-is-unordered-in-the-context-expanded.yaml |   2 +-
 ...ifying-the-type-for-a-node-compacted.yaml} |   2 +-
 yaml/Term-Selection-compacted.yaml            |   2 +-
 yaml/Term-Selection-context.yaml              |   2 +-
 yaml/Term-Selection-expanded.yaml             |   2 +-
 ...-compact-and-absolute-IRIs-compacted.yaml} |   2 +-
 ...ng-compact-and-absolute-IRIs-expanded.yaml |   2 +-
 ...for-values-not-identifiers-compacted.yaml} |   7 +-
 ...n-for-values-not-identifiers-expanded.yaml |   5 +-
 ...on-from-context-definition-compacted.yaml} |   2 +-
 ...ded-when-document-relative-compacted.yaml} |   7 +-
 ...anded-when-document-relative-expanded.yaml |   5 +-
 ...t-of-statements-serialized-in-JSON-LD.yaml |   2 +-
 ...inal.yaml => Type-coercion-compacted.yaml} |   2 +-
 ...Use-a-relative-IRI-as-node-identifier.yaml |   2 +-
 yaml/Using-Arrays-for-Lists-compacted.yaml    |   2 +-
 yaml/Using-Arrays-for-Lists-context.yaml      |   2 +-
 yaml/Using-Arrays-for-Lists-expanded.yaml     |   2 +-
 ...Using-a-default-vocabulary-compacted.yaml} |   2 +-
 ...revious-default-vocabulary-compacted.yaml} |   2 +-
 ...a-term-to-specify-the-type-compacted.yaml} |   2 +-
 ...orm-to-set-multiple-values-compacted.yaml} |   2 +-
 ...-form-to-set-multiple-values-expanded.yaml |   2 +-
 ...-vocabulary-mapping-expanded-expanded.yaml |   2 +-
 yaml/Using-as-the-vocabulary-mapping.yaml     |   2 +-
 ...-express-the-default-graph-compacted.yaml} |   2 +-
 ...ly-express-the-default-graph-expanded.yaml |   2 +-
 ...=> Using-multiple-contexts-compacted.yaml} |   2 +-
 ...-define-reverse-properties-compacted.yaml} |   2 +-
 ...to-define-reverse-properties-expanded.yaml |   2 +-
 ...o-define-reverse-properties-flattened.yaml |   2 +-
 ...tablish-the-default-base-IRI-expanded.yaml |   2 +-
 ...ull-keyword-to-ignore-data-compacted.yaml} |   2 +-
 ...yaml => Using-vocabularies-compacted.yaml} |   2 +-
 ...in-property-scoped-context-compacted.yaml} |   6 +-
 368 files changed, 1588 insertions(+), 869 deletions(-)
 rename examples/{A-document-with-children-linking-to-their-parent-original.jsonld => A-document-with-children-linking-to-their-parent-compacted.jsonld} (100%)
 rename examples/{A-person-and-its-children-using-a-reverse-property-original.jsonld => A-person-and-its-children-using-a-reverse-property-compacted.jsonld} (100%)
 rename examples/{A-protected-context-with-an-exception-original.jsonld => A-protected-context-with-an-exception-compacted.jsonld} (100%)
 create mode 100644 examples/A-remote-context-to-be-imported-in-a-type-scoped-context.jsonld
 rename examples/{Aliasing-keywords-original.jsonld => Aliasing-keywords-compacted.jsonld} (100%)
 rename examples/{An-ordered-collection-of-values-in-JSON-LD-original.jsonld => An-ordered-collection-of-values-in-JSON-LD-compacted.jsonld} (100%)
 rename examples/{An-unordered-collection-of-values-in-JSON-LD-original.jsonld => An-unordered-collection-of-values-in-JSON-LD-compacted.jsonld} (100%)
 rename examples/{Combining-external-and-local-contexts-original.jsonld => Combining-external-and-local-contexts-compacted.jsonld} (68%)
 rename examples/{Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-original.html => Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-compacted.html} (100%)
 delete mode 100644 examples/Context-defined-in-an-HTML-document.html
 rename examples/{Context-needs-to-be-duplicated-if-graph-is-not-used-original.jsonld => Context-needs-to-be-duplicated-if-graph-is-not-used-compacted.jsonld} (100%)
 rename examples/{Coordinates-expressed-in-JSON-LD-original.json => Coordinates-expressed-in-JSON-LD-compacted.json} (100%)
 rename examples/{Defining-an-context-within-a-term-definition-original.jsonld => Defining-an-context-within-a-term-definition-compacted.jsonld} (100%)
 rename examples/{Defining-an-context-within-a-term-definition-used-on-type-original.jsonld => Defining-an-context-within-a-term-definition-used-on-type-compacted.jsonld} (100%)
 create mode 100644 examples/Defining-property-nesting-Context.jsonld
 rename examples/{Defining-property-nesting-expanded.jsonld => Defining-property-nesting-Expanded-Input.jsonld} (100%)
 rename examples/{Defining-property-nesting-original.jsonld => Defining-property-nesting-compacted.jsonld} (100%)
 rename examples/{Describing-disconnected-nodes-with-graph-original.jsonld => Describing-disconnected-nodes-with-graph-compacted.jsonld} (100%)
 create mode 100644 examples/Describing-disconnected-nodes-with-included-compacted.jsonld
 create mode 100644 examples/Describing-disconnected-nodes-with-included-expanded.jsonld
 create mode 100644 examples/Describing-disconnected-nodes-with-included-flattened.jsonld
 create mode 100644 examples/Describing-disconnected-nodes-with-included-statements.table
 create mode 100644 examples/Describing-disconnected-nodes-with-included-turtle.ttl
 rename examples/{Embedded-contexts-within-node-objects-original.jsonld => Embedded-contexts-within-node-objects-compacted.jsonld} (100%)
 rename examples/{Embedding-JSON-LD-containing-HTML-in-HTML-original.html => Embedding-JSON-LD-containing-HTML-in-HTML-compacted.html} (100%)
 rename examples/{Embedding-JSON-LD-in-HTML-original.html => Embedding-JSON-LD-in-HTML-compacted.html} (100%)
 rename examples/{Embedding-Objects-original.jsonld => Embedding-Objects-compacted.jsonld} (100%)
 rename examples/{Embedding-a-node-object-as-property-value-of-another-node-object-original.jsonld => Embedding-a-node-object-as-property-value-of-another-node-object-compacted.jsonld} (100%)
 rename examples/{Example-demonstrating-the-context-sensitivity-for-type-statements-original.table => Example-demonstrating-the-context-sensitivity-for-type-statements-compacted.table} (80%)
 create mode 100644 examples/Expanded-term-definition-with-language-and-direction.jsonld
 rename examples/{Expanded-term-definition-with-type-coercion-original.jsonld => Expanded-term-definition-with-type-coercion-compacted.jsonld} (100%)
 rename examples/{Expanded-term-definition-with-types-original.jsonld => Expanded-term-definition-with-types-compacted.jsonld} (100%)
 rename examples/{Expanded-value-with-type-original.jsonld => Expanded-value-with-type-compacted.jsonld} (100%)
 create mode 100644 examples/Expansion-using-embedded-and-scoped-contexts-embedding-equivalent-.jsonld
 create mode 100644 examples/Expansion-using-embedded-and-scoped-contexts.jsonld
 create mode 100644 examples/Flattened-form-for-included-blocks-flattened.jsonld
 create mode 100644 examples/Flattened-form-for-included-blocks-statements.table
 create mode 100644 examples/Flattened-form-for-included-blocks-turtle.ttl
 rename examples/{Identifying-a-node-original.jsonld => Identifying-a-node-compacted.jsonld} (100%)
 rename examples/{Identifying-and-making-statements-about-a-graph-original.jsonld => Identifying-and-making-statements-about-a-graph-compacted.jsonld} (87%)
 rename examples/{Implicitly-named-graph-original.jsonld => Implicitly-named-graph-compacted.jsonld} (100%)
 rename examples/{In-line-context-definition-original.jsonld => In-line-context-definition-compacted.jsonld} (100%)
 create mode 100644 examples/Included-Blocks.jsonld
 rename examples/{Indexing-data-in-JSON-LD-by-node-identifiers-original.jsonld => Indexing-data-in-JSON-LD-by-node-identifiers-compacted.jsonld} (88%)
 rename examples/{Indexing-data-in-JSON-LD-by-node-identifiers-using-none-original.jsonld => Indexing-data-in-JSON-LD-by-node-identifiers-using-none-compacted.jsonld} (100%)
 rename examples/{Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-original.jsonld => Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-compacted.jsonld} (100%)
 rename examples/{Indexing-data-in-JSON-LD-by-type-original.jsonld => Indexing-data-in-JSON-LD-by-type-compacted.jsonld} (100%)
 rename examples/{Indexing-data-in-JSON-LD-by-type-using-none-original.jsonld => Indexing-data-in-JSON-LD-by-type-using-none-compacted.jsonld} (100%)
 rename examples/{Indexing-data-in-JSON-LD-by-type-with-set-representation-original.jsonld => Indexing-data-in-JSON-LD-by-type-with-set-representation-compacted.jsonld} (100%)
 create mode 100644 examples/Indexing-data-in-JSON-LD-compacted.jsonld
 delete mode 100644 examples/Indexing-data-in-JSON-LD-original.jsonld
 create mode 100644 examples/Indexing-data-using-none-compacted.jsonld
 delete mode 100644 examples/Indexing-data-using-none-original.jsonld
 rename examples/{Indexing-graph-data-in-JSON-LD-original.jsonld => Indexing-graph-data-in-JSON-LD-compacted.jsonld} (100%)
 rename examples/{Indexing-graphs-using-none-for-no-index-original.jsonld => Indexing-graphs-using-none-for-no-index-compacted.jsonld} (100%)
 rename examples/{Indexing-languaged-tagged-strings-in-JSON-LD-original.jsonld => Indexing-languaged-tagged-strings-in-JSON-LD-compacted.jsonld} (100%)
 rename examples/{Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-original.jsonld => Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-compacted.jsonld} (100%)
 rename examples/{Indexing-languaged-tagged-strings-using-none-for-no-language-original.jsonld => Indexing-languaged-tagged-strings-using-none-for-no-language-compacted.jsonld} (100%)
 rename examples/{JSON-Literal-original.jsonld => JSON-Literal-compacted.jsonld} (100%)
 create mode 100644 examples/Marking-a-context-to-not-propagate-compacted.jsonld
 create mode 100644 examples/Marking-a-context-to-not-propagate-expanded.jsonld
 create mode 100644 examples/Marking-a-context-to-not-propagate-statements.table
 create mode 100644 examples/Marking-a-context-to-not-propagate-turtle.ttl
 rename examples/{Multiple-array-values-of-different-types-original.jsonld => Multiple-array-values-of-different-types-compacted.jsonld} (75%)
 rename examples/{Multiple-values-with-no-inherent-order-original.jsonld => Multiple-values-with-no-inherent-order-compacted.jsonld} (100%)
 rename examples/{Nested-properties-original.jsonld => Nested-properties-compacted.jsonld} (100%)
 rename examples/{Nested-properties-folded-into-containing-object-original.jsonld => Nested-properties-folded-into-containing-object-compacted.jsonld} (100%)
 create mode 100644 examples/Overriding-default-language-and-default-base-direction-using-an-expanded-value.jsonld
 create mode 100644 examples/Overriding-permitted-if-both-definitions-are-identical-statements.table
 rename examples/{Prefix-expansion-original.jsonld => Prefix-expansion-compacted.jsonld} (100%)
 create mode 100644 examples/Property-based-data-indexing-compacted.jsonld
 delete mode 100644 examples/Property-based-data-indexing-original.jsonld
 rename examples/{Referencing-Objects-on-the-Web-original.jsonld => Referencing-Objects-on-the-Web-compacted.jsonld} (100%)
 delete mode 100644 examples/Referencing-a-Context-in-an-HTML-document-expanded.jsonld
 delete mode 100644 examples/Referencing-a-Context-in-an-HTML-document-original.jsonld
 delete mode 100644 examples/Referencing-a-Context-in-an-HTML-document-statements.table
 delete mode 100644 examples/Referencing-a-Context-in-an-HTML-document-turtle.ttl
 rename examples/{Referencing-a-JSON-LD-context-original.jsonld => Referencing-a-JSON-LD-context-compacted.jsonld} (100%)
 rename examples/{Referencing-an-unidentified-node-original.jsonld => Referencing-an-unidentified-node-compacted.jsonld} (100%)
 rename examples/{Referencing-named-graphs-using-an-id-map-original.jsonld => Referencing-named-graphs-using-an-id-map-compacted.jsonld} (82%)
 rename examples/{Referencing-named-graphs-using-an-id-map-with-none-original.jsonld => Referencing-named-graphs-using-an-id-map-with-none-compacted.jsonld} (89%)
 rename examples/{Referencing-node-objects-original.jsonld => Referencing-node-objects-compacted.jsonld} (100%)
 create mode 100644 examples/Result-of-sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
 create mode 100644 examples/Result-of-sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
 create mode 100644 examples/Setting-the-default-base-direction-of-a-JSON-LD-document-compacted.jsonld
 create mode 100644 examples/Setting-the-default-base-direction-of-a-JSON-LD-document-expanded.jsonld
 create mode 100644 examples/Setting-the-default-base-direction-of-a-JSON-LD-document-statements.table
 create mode 100644 examples/Setting-the-default-base-direction-of-a-JSON-LD-document-turtle.ttl
 rename examples/{Setting-the-default-language-of-a-JSON-LD-document-original.jsonld => Setting-the-default-language-of-a-JSON-LD-document-compacted.jsonld} (100%)
 rename examples/{Setting-the-document-base-in-a-document-original.jsonld => Setting-the-document-base-in-a-document-compacted.jsonld} (100%)
 create mode 100644 examples/Sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
 create mode 100644 examples/Sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
 rename examples/{Specifying-a-local-blank-node-identifier-original.jsonld => Specifying-a-local-blank-node-identifier-compacted.jsonld} (100%)
 rename examples/{Specifying-multiple-types-for-a-node-original.jsonld => Specifying-multiple-types-for-a-node-compacted.jsonld} (100%)
 rename examples/{Specifying-that-a-collection-is-ordered-in-the-context-original.jsonld => Specifying-that-a-collection-is-ordered-in-the-context-compacted.jsonld} (100%)
 rename examples/{Specifying-that-a-collection-is-unordered-in-the-context-original.jsonld => Specifying-that-a-collection-is-unordered-in-the-context-compacted.jsonld} (100%)
 rename examples/{Specifying-the-type-for-a-node-original.jsonld => Specifying-the-type-for-a-node-compacted.jsonld} (100%)
 create mode 100644 examples/Statements-associated-with-expanded-term-definition-with-language-and-direction.table
 rename examples/{Targeting-a-specific-script-element-by-id-original.html => Targeting-a-specific-script-element-by-id-compacted.html} (100%)
 rename examples/{Term-definitions-using-compact-and-absolute-IRIs-original.jsonld => Term-definitions-using-compact-and-absolute-IRIs-compacted.jsonld} (100%)
 rename examples/{Terms-not-expanded-when-document-relative-original.jsonld => Term-expansion-for-values-not-identifiers-compacted.jsonld} (72%)
 rename examples/{Term-expansion-from-context-definition-original.jsonld => Term-expansion-from-context-definition-compacted.jsonld} (100%)
 rename examples/{Term-expansion-for-values-not-identifiers-original.jsonld => Terms-not-expanded-when-document-relative-compacted.jsonld} (73%)
 rename examples/{Type-coercion-original.jsonld => Type-coercion-compacted.jsonld} (100%)
 rename examples/{Using-a-default-vocabulary-original.jsonld => Using-a-default-vocabulary-compacted.jsonld} (100%)
 rename examples/{Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-original.jsonld => Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-compacted.jsonld} (100%)
 rename examples/{Using-a-term-to-specify-the-type-original.jsonld => Using-a-term-to-specify-the-type-compacted.jsonld} (100%)
 rename examples/{Using-an-expanded-form-to-set-multiple-values-original.jsonld => Using-an-expanded-form-to-set-multiple-values-compacted.jsonld} (100%)
 rename examples/{Using-graph-to-explicitly-express-the-default-graph-original.jsonld => Using-graph-to-explicitly-express-the-default-graph-compacted.jsonld} (100%)
 rename examples/{Using-multiple-contexts-original.jsonld => Using-multiple-contexts-compacted.jsonld} (100%)
 rename examples/{Using-reverse-to-define-reverse-properties-original.jsonld => Using-reverse-to-define-reverse-properties-compacted.jsonld} (100%)
 rename examples/{Using-the-document-base-URL-to-establish-the-default-base-IRI-original.html => Using-the-document-base-URL-to-establish-the-default-base-IRI-compacted.html} (100%)
 rename examples/{Using-the-null-keyword-to-ignore-data-original.jsonld => Using-the-null-keyword-to-ignore-data-compacted.jsonld} (100%)
 rename examples/{Using-vocabularies-original.jsonld => Using-vocabularies-compacted.jsonld} (100%)
 rename examples/{overriding-permitted-in-property-scoped-context-original.jsonld => overriding-permitted-in-property-scoped-context-compacted.jsonld} (89%)
 rename yaml/{A-document-with-children-linking-to-their-parent-original.yaml => A-document-with-children-linking-to-their-parent-compacted.yaml} (79%)
 rename yaml/{A-person-and-its-children-using-a-reverse-property-original.yaml => A-person-and-its-children-using-a-reverse-property-compacted.yaml} (75%)
 rename yaml/{A-protected-context-with-an-exception-original.yaml => A-protected-context-with-an-exception-compacted.yaml} (83%)
 create mode 100644 yaml/A-remote-context-to-be-imported-in-a-type-scoped-context.yaml
 rename yaml/{Aliasing-keywords-original.yaml => Aliasing-keywords-compacted.yaml} (80%)
 rename yaml/{An-ordered-collection-of-values-in-JSON-LD-original.yaml => An-ordered-collection-of-values-in-JSON-LD-compacted.yaml} (67%)
 rename yaml/{An-unordered-collection-of-values-in-JSON-LD-original.yaml => An-unordered-collection-of-values-in-JSON-LD-compacted.yaml} (67%)
 rename yaml/{Combining-external-and-local-contexts-original.yaml => Combining-external-and-local-contexts-compacted.yaml} (55%)
 rename yaml/{Context-needs-to-be-duplicated-if-graph-is-not-used-original.yaml => Context-needs-to-be-duplicated-if-graph-is-not-used-compacted.yaml} (84%)
 rename yaml/{Coordinates-expressed-in-JSON-LD-original.yaml => Coordinates-expressed-in-JSON-LD-compacted.yaml} (86%)
 rename yaml/{Defining-an-context-within-a-term-definition-original.yaml => Defining-an-context-within-a-term-definition-compacted.yaml} (80%)
 rename yaml/{Defining-an-context-within-a-term-definition-used-on-type-original.yaml => Defining-an-context-within-a-term-definition-used-on-type-compacted.yaml} (96%)
 create mode 100644 yaml/Defining-property-nesting-Context.yaml
 rename yaml/{Defining-property-nesting-expanded.yaml => Defining-property-nesting-Expanded-Input.yaml} (84%)
 rename yaml/{Defining-property-nesting-original.yaml => Defining-property-nesting-compacted.yaml} (90%)
 rename yaml/{Describing-disconnected-nodes-with-graph-original.yaml => Describing-disconnected-nodes-with-graph-compacted.yaml} (87%)
 create mode 100644 yaml/Describing-disconnected-nodes-with-included-compacted.yaml
 create mode 100644 yaml/Describing-disconnected-nodes-with-included-expanded.yaml
 create mode 100644 yaml/Describing-disconnected-nodes-with-included-flattened.yaml
 rename yaml/{Embedded-contexts-within-node-objects-original.yaml => Embedded-contexts-within-node-objects-compacted.yaml} (79%)
 rename yaml/{Embedding-Objects-original.yaml => Embedding-Objects-compacted.yaml} (84%)
 rename yaml/{Embedding-a-node-object-as-property-value-of-another-node-object-original.yaml => Embedding-a-node-object-as-property-value-of-another-node-object-compacted.yaml} (66%)
 create mode 100644 yaml/Expanded-term-definition-with-language-and-direction.yaml
 rename yaml/{Expanded-term-definition-with-type-coercion-original.yaml => Expanded-term-definition-with-type-coercion-compacted.yaml} (74%)
 rename yaml/{Expanded-term-definition-with-types-original.yaml => Expanded-term-definition-with-types-compacted.yaml} (86%)
 rename yaml/{Expanded-value-with-type-original.yaml => Expanded-value-with-type-compacted.yaml} (78%)
 create mode 100644 yaml/Expansion-using-embedded-and-scoped-contexts-embedding-equivalent-.yaml
 create mode 100644 yaml/Expansion-using-embedded-and-scoped-contexts.yaml
 create mode 100644 yaml/Flattened-form-for-included-blocks-flattened.yaml
 rename yaml/{Identifying-a-node-original.yaml => Identifying-a-node-compacted.yaml} (72%)
 rename yaml/{Identifying-and-making-statements-about-a-graph-original.yaml => Identifying-and-making-statements-about-a-graph-compacted.yaml} (76%)
 rename yaml/{Implicitly-named-graph-original.yaml => Implicitly-named-graph-compacted.yaml} (85%)
 rename yaml/{In-line-context-definition-original.yaml => In-line-context-definition-compacted.yaml} (84%)
 create mode 100644 yaml/Included-Blocks.yaml
 rename yaml/{Indexing-data-in-JSON-LD-by-node-identifiers-original.yaml => Indexing-data-in-JSON-LD-by-node-identifiers-compacted.yaml} (78%)
 rename yaml/{Indexing-data-in-JSON-LD-by-node-identifiers-using-none-original.yaml => Indexing-data-in-JSON-LD-by-node-identifiers-using-none-compacted.yaml} (88%)
 rename yaml/{Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-original.yaml => Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-compacted.yaml} (85%)
 rename yaml/{Indexing-data-in-JSON-LD-by-type-original.yaml => Indexing-data-in-JSON-LD-by-type-compacted.yaml} (86%)
 rename yaml/{Indexing-data-in-JSON-LD-by-type-using-none-original.yaml => Indexing-data-in-JSON-LD-by-type-using-none-compacted.yaml} (86%)
 rename yaml/{Indexing-data-in-JSON-LD-by-type-with-set-representation-original.yaml => Indexing-data-in-JSON-LD-by-type-with-set-representation-compacted.yaml} (82%)
 create mode 100644 yaml/Indexing-data-in-JSON-LD-compacted.yaml
 delete mode 100644 yaml/Indexing-data-in-JSON-LD-original.yaml
 create mode 100644 yaml/Indexing-data-using-none-compacted.yaml
 delete mode 100644 yaml/Indexing-data-using-none-original.yaml
 rename yaml/{Indexing-graph-data-in-JSON-LD-original.yaml => Indexing-graph-data-in-JSON-LD-compacted.yaml} (91%)
 rename yaml/{Indexing-graphs-using-none-for-no-index-original.yaml => Indexing-graphs-using-none-for-no-index-compacted.yaml} (90%)
 rename yaml/{Indexing-languaged-tagged-strings-in-JSON-LD-original.yaml => Indexing-languaged-tagged-strings-in-JSON-LD-compacted.yaml} (75%)
 rename yaml/{Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-original.yaml => Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-compacted.yaml} (72%)
 rename yaml/{Indexing-languaged-tagged-strings-using-none-for-no-language-original.yaml => Indexing-languaged-tagged-strings-using-none-for-no-language-compacted.yaml} (73%)
 rename yaml/{JSON-Literal-original.yaml => JSON-Literal-compacted.yaml} (79%)
 create mode 100644 yaml/Marking-a-context-to-not-propagate-compacted.yaml
 create mode 100644 yaml/Marking-a-context-to-not-propagate-expanded.yaml
 rename yaml/{Multiple-array-values-of-different-types-original.yaml => Multiple-array-values-of-different-types-compacted.yaml} (62%)
 rename yaml/{Multiple-values-with-no-inherent-order-original.yaml => Multiple-values-with-no-inherent-order-compacted.yaml} (65%)
 rename yaml/{Nested-properties-original.yaml => Nested-properties-compacted.yaml} (91%)
 rename yaml/{Nested-properties-folded-into-containing-object-original.yaml => Nested-properties-folded-into-containing-object-compacted.yaml} (83%)
 create mode 100644 yaml/Overriding-default-language-and-default-base-direction-using-an-expanded-value.yaml
 rename yaml/{Prefix-expansion-original.yaml => Prefix-expansion-compacted.yaml} (70%)
 create mode 100644 yaml/Property-based-data-indexing-compacted.yaml
 delete mode 100644 yaml/Property-based-data-indexing-original.yaml
 rename yaml/{Referencing-Objects-on-the-Web-original.yaml => Referencing-Objects-on-the-Web-compacted.yaml} (78%)
 delete mode 100644 yaml/Referencing-a-Context-in-an-HTML-document-expanded.yaml
 delete mode 100644 yaml/Referencing-a-Context-in-an-HTML-document-original.yaml
 rename yaml/{Referencing-a-JSON-LD-context-original.yaml => Referencing-a-JSON-LD-context-compacted.yaml} (74%)
 rename yaml/{Referencing-an-unidentified-node-original.yaml => Referencing-an-unidentified-node-compacted.yaml} (79%)
 rename yaml/{Referencing-named-graphs-using-an-id-map-original.yaml => Referencing-named-graphs-using-an-id-map-compacted.yaml} (75%)
 rename yaml/{Referencing-named-graphs-using-an-id-map-with-none-original.yaml => Referencing-named-graphs-using-an-id-map-with-none-compacted.yaml} (80%)
 rename yaml/{Referencing-node-objects-original.yaml => Referencing-node-objects-compacted.yaml} (84%)
 create mode 100644 yaml/Result-of-sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.yaml
 create mode 100644 yaml/Result-of-sourcing-a-context-to-modify-vocab-and-a-term-definition.yaml
 create mode 100644 yaml/Setting-the-default-base-direction-of-a-JSON-LD-document-compacted.yaml
 create mode 100644 yaml/Setting-the-default-base-direction-of-a-JSON-LD-document-expanded.yaml
 rename yaml/{Setting-the-default-language-of-a-JSON-LD-document-original.yaml => Setting-the-default-language-of-a-JSON-LD-document-compacted.yaml} (66%)
 rename yaml/{Setting-the-document-base-in-a-document-original.yaml => Setting-the-document-base-in-a-document-compacted.yaml} (70%)
 create mode 100644 yaml/Sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.yaml
 create mode 100644 yaml/Sourcing-a-context-to-modify-vocab-and-a-term-definition.yaml
 rename yaml/{Specifying-a-local-blank-node-identifier-original.yaml => Specifying-a-local-blank-node-identifier-compacted.yaml} (65%)
 rename yaml/{Specifying-multiple-types-for-a-node-original.yaml => Specifying-multiple-types-for-a-node-compacted.yaml} (65%)
 rename yaml/{Specifying-that-a-collection-is-ordered-in-the-context-original.yaml => Specifying-that-a-collection-is-ordered-in-the-context-compacted.yaml} (67%)
 rename yaml/{Specifying-that-a-collection-is-unordered-in-the-context-original.yaml => Specifying-that-a-collection-is-unordered-in-the-context-compacted.yaml} (66%)
 rename yaml/{Specifying-the-type-for-a-node-original.yaml => Specifying-the-type-for-a-node-compacted.yaml} (79%)
 rename yaml/{Term-definitions-using-compact-and-absolute-IRIs-original.yaml => Term-definitions-using-compact-and-absolute-IRIs-compacted.yaml} (83%)
 rename yaml/{Term-expansion-for-values-not-identifiers-original.yaml => Term-expansion-for-values-not-identifiers-compacted.yaml} (61%)
 rename yaml/{Term-expansion-from-context-definition-original.yaml => Term-expansion-from-context-definition-compacted.yaml} (56%)
 rename yaml/{Terms-not-expanded-when-document-relative-original.yaml => Terms-not-expanded-when-document-relative-compacted.yaml} (61%)
 rename yaml/{Type-coercion-original.yaml => Type-coercion-compacted.yaml} (75%)
 rename yaml/{Using-a-default-vocabulary-original.yaml => Using-a-default-vocabulary-compacted.yaml} (72%)
 rename yaml/{Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-original.yaml => Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-compacted.yaml} (89%)
 rename yaml/{Using-a-term-to-specify-the-type-original.yaml => Using-a-term-to-specify-the-type-compacted.yaml} (66%)
 rename yaml/{Using-an-expanded-form-to-set-multiple-values-original.yaml => Using-an-expanded-form-to-set-multiple-values-compacted.yaml} (72%)
 rename yaml/{Using-graph-to-explicitly-express-the-default-graph-original.yaml => Using-graph-to-explicitly-express-the-default-graph-compacted.yaml} (81%)
 rename yaml/{Using-multiple-contexts-original.yaml => Using-multiple-contexts-compacted.yaml} (89%)
 rename yaml/{Using-reverse-to-define-reverse-properties-original.yaml => Using-reverse-to-define-reverse-properties-compacted.yaml} (75%)
 rename yaml/{Using-the-null-keyword-to-ignore-data-original.yaml => Using-the-null-keyword-to-ignore-data-compacted.yaml} (73%)
 rename yaml/{Using-vocabularies-original.yaml => Using-vocabularies-compacted.yaml} (90%)
 rename yaml/{overriding-permitted-in-property-scoped-context-original.yaml => overriding-permitted-in-property-scoped-context-compacted.yaml} (80%)

diff --git a/Gemfile.lock b/Gemfile.lock
index fcfed99e..60f5bfa3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/ruby-rdf/json-ld.git
-  revision: adbd407fa4b5783c8a7f7b79653b6e38815ff854
+  revision: c1e72171960b31bf417c7af9ecea6ebf75fd0316
   branch: develop
   specs:
     json-ld (3.0.2)
@@ -34,10 +34,10 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     htmlentities (4.3.4)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     json-canonicalization (0.1.0)
-    json-ld-preloaded (3.0.4)
+    json-ld-preloaded (3.0.5)
       json-ld (~> 3.0)
       multi_json (~> 1.12)
       rdf (~> 3.0)
@@ -83,7 +83,7 @@ GEM
       nokogiri
     public_suffix (4.0.1)
     rack (2.0.7)
-    rake (12.3.3)
+    rake (13.0.0)
     rdf (3.0.12)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
@@ -135,7 +135,7 @@ GEM
     rdf-turtle (3.0.6)
       ebnf (~> 1.1)
       rdf (~> 3.0)
-    rdf-vocab (3.0.10)
+    rdf-vocab (3.0.11)
       rdf (~> 3.0, >= 3.0.11)
     rdf-xsd (3.0.1)
       rdf (~> 3.0)
diff --git a/common/extract-examples.rb b/common/extract-examples.rb
index 6b589061..23e1f841 100755
--- a/common/extract-examples.rb
+++ b/common/extract-examples.rb
@@ -123,7 +123,7 @@ def table_to_dataset(table)
         case cell
         when '-', /^\s*$/
         else
-          object = RDF::Literal(object.to_s, datatype: RDF::URI("https://www.w3.org/i18n##{object.language}_#{cell}"))
+          object = RDF::Literal(object.to_s, datatype: RDF::URI("https://www.w3.org/ns/i18n##{object.language}_#{cell}"))
           # We might think something was an IRI, but determine that it's not
         end
       end
diff --git a/examples/A-document-with-children-linking-to-their-parent-original.jsonld b/examples/A-document-with-children-linking-to-their-parent-compacted.jsonld
similarity index 100%
rename from examples/A-document-with-children-linking-to-their-parent-original.jsonld
rename to examples/A-document-with-children-linking-to-their-parent-compacted.jsonld
diff --git a/examples/A-person-and-its-children-using-a-reverse-property-original.jsonld b/examples/A-person-and-its-children-using-a-reverse-property-compacted.jsonld
similarity index 100%
rename from examples/A-person-and-its-children-using-a-reverse-property-original.jsonld
rename to examples/A-person-and-its-children-using-a-reverse-property-compacted.jsonld
diff --git a/examples/A-protected-context-with-an-exception-original.jsonld b/examples/A-protected-context-with-an-exception-compacted.jsonld
similarity index 100%
rename from examples/A-protected-context-with-an-exception-original.jsonld
rename to examples/A-protected-context-with-an-exception-compacted.jsonld
diff --git a/examples/A-protected-context-with-an-exception-statements.table b/examples/A-protected-context-with-an-exception-statements.table
index 961f9bcd..4bbbe0d3 100644
--- a/examples/A-protected-context-with-an-exception-statements.table
+++ b/examples/A-protected-context-with-an-exception-statements.table
@@ -1,5 +1,5 @@
 
-
+
    
diff --git a/examples/A-remote-context-to-be-imported-in-a-type-scoped-context.jsonld b/examples/A-remote-context-to-be-imported-in-a-type-scoped-context.jsonld
new file mode 100644
index 00000000..e6ff4e1b
--- /dev/null
+++ b/examples/A-remote-context-to-be-imported-in-a-type-scoped-context.jsonld
@@ -0,0 +1,8 @@
+{
+  "@context": {
+    "Type1": "http://example.com/vocab/Type1",
+    "Type2": "http://example.com/vocab/Type2",
+    "term1": "http://example.com/vocab#term1",
+    "term2": "http://example.com/vocab#term2"
+  }
+}
\ No newline at end of file
diff --git a/examples/Aliasing-keywords-original.jsonld b/examples/Aliasing-keywords-compacted.jsonld
similarity index 100%
rename from examples/Aliasing-keywords-original.jsonld
rename to examples/Aliasing-keywords-compacted.jsonld
diff --git a/examples/An-ordered-collection-of-values-in-JSON-LD-original.jsonld b/examples/An-ordered-collection-of-values-in-JSON-LD-compacted.jsonld
similarity index 100%
rename from examples/An-ordered-collection-of-values-in-JSON-LD-original.jsonld
rename to examples/An-ordered-collection-of-values-in-JSON-LD-compacted.jsonld
diff --git a/examples/An-unordered-collection-of-values-in-JSON-LD-original.jsonld b/examples/An-unordered-collection-of-values-in-JSON-LD-compacted.jsonld
similarity index 100%
rename from examples/An-unordered-collection-of-values-in-JSON-LD-original.jsonld
rename to examples/An-unordered-collection-of-values-in-JSON-LD-compacted.jsonld
diff --git a/examples/Clearing-default-language.jsonld b/examples/Clearing-default-language.jsonld
index 12034821..67ec9d68 100644
--- a/examples/Clearing-default-language.jsonld
+++ b/examples/Clearing-default-language.jsonld
@@ -1,12 +1,15 @@
 {
   "@context": {
-    "@language": "ja"
+    "@version": 1.1,
+    "@vocab": "http://example.com/",
+    "@language": "ar-EG",
+    "@direction": "rtl",
+    "details": {
+      "@context": {
+        "@direction": null
+      }
+    }
   },
-  "name": "花澄",
-  "details": {
-    "@context": {
-      "@language": null
-    },
-    "occupation": "Ninja"
-  }
+  "title": "HTML و CSS: تصميم و إنشاء مواقع الويب",
+  "details": {"genre": "Technical Publication"}
 }
\ No newline at end of file
diff --git a/examples/Combining-external-and-local-contexts-original.jsonld b/examples/Combining-external-and-local-contexts-compacted.jsonld
similarity index 68%
rename from examples/Combining-external-and-local-contexts-original.jsonld
rename to examples/Combining-external-and-local-contexts-compacted.jsonld
index 769b36e0..a55d650b 100644
--- a/examples/Combining-external-and-local-contexts-original.jsonld
+++ b/examples/Combining-external-and-local-contexts-compacted.jsonld
@@ -2,7 +2,10 @@
   "@context": [
     "https://json-ld.org/contexts/person.jsonld",
     {
-      "pic": "http://xmlns.com/foaf/0.1/depiction"
+      "pic": {
+        "@id": "http://xmlns.com/foaf/0.1/depiction",
+        "@type": "@id"
+      }
     }
   ],
   "name": "Manu Sporny",
diff --git a/examples/Combining-external-and-local-contexts-expanded.jsonld b/examples/Combining-external-and-local-contexts-expanded.jsonld
index a2ed8f07..44efe53b 100644
--- a/examples/Combining-external-and-local-contexts-expanded.jsonld
+++ b/examples/Combining-external-and-local-contexts-expanded.jsonld
@@ -2,6 +2,6 @@
   "http://xmlns.com/foaf/0.1/name": [{"@value": "Manu Sporny"}],
   "http://xmlns.com/foaf/0.1/homepage": [{"@id": "http://manu.sporny.org/"}],
   "http://xmlns.com/foaf/0.1/depiction": [{
-    "@value": "http://twitter.com/account/profile_image/manusporny"
+    "@id": "http://twitter.com/account/profile_image/manusporny"
   }]
 }]
\ No newline at end of file
diff --git a/examples/Combining-external-and-local-contexts-statements.table b/examples/Combining-external-and-local-contexts-statements.table
index 87702d74..2b09ff76 100644
--- a/examples/Combining-external-and-local-contexts-statements.table
+++ b/examples/Combining-external-and-local-contexts-statements.table
@@ -23,7 +23,7 @@
 
-
+
    
       
    
 Subject
 Property_:b0
 foaf:depiction
 http://twitter.com/account/profile_image/manuspornyxsd:stringIRI
 
    
       
     
    
diff --git a/examples/Combining-external-and-local-contexts-turtle.ttl b/examples/Combining-external-and-local-contexts-turtle.ttl
index d7410ebd..5a48c354 100644
--- a/examples/Combining-external-and-local-contexts-turtle.ttl
+++ b/examples/Combining-external-and-local-contexts-turtle.ttl
@@ -2,5 +2,5 @@
 [
   foaf:name "Manu Sporny";
   foaf:homepage ;
-  foaf:depiction "http://twitter.com/account/profile_image/manusporny"
+  foaf:depiction 
 ] .
\ No newline at end of file
diff --git a/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-original.html b/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-compacted.html
similarity index 100%
rename from examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-original.html
rename to examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-compacted.html
diff --git a/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-statements.table b/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-statements.table
index b696240c..ad2caa7a 100644
--- a/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-statements.table
+++ b/examples/Combining-multiple-JSON-LD-script-elements-into-a-single-dataset-statements.table
@@ -1,5 +1,5 @@
 
-
+
    
diff --git a/examples/Compacting-using-a-default-vocabulary-compacted.jsonld b/examples/Compacting-using-a-default-vocabulary-compacted.jsonld
index 215e05cc..600a4791 100644
--- a/examples/Compacting-using-a-default-vocabulary-compacted.jsonld
+++ b/examples/Compacting-using-a-default-vocabulary-compacted.jsonld
@@ -1,6 +1,6 @@
 {
   "@context": {
-    "@vocab": "http://xmlns.com/foaf/0.1/"
+    "@vocab": "http://example.org/"
   },
   "@id": "http://example.org/places#BrewEats",
   "@type": "Restaurant",
diff --git a/examples/Compacting-using-a-default-vocabulary-context.jsonld b/examples/Compacting-using-a-default-vocabulary-context.jsonld
index 686e4b80..68db6fea 100644
--- a/examples/Compacting-using-a-default-vocabulary-context.jsonld
+++ b/examples/Compacting-using-a-default-vocabulary-context.jsonld
@@ -1,5 +1,5 @@
 {
   "@context": {
-    "@vocab": "http://xmlns.com/foaf/0.1/"
+    "@vocab": "http://example.org/"
   }
 }
\ No newline at end of file
diff --git a/examples/Compacting-using-a-default-vocabulary-expanded.jsonld b/examples/Compacting-using-a-default-vocabulary-expanded.jsonld
index 209e47d6..251b08ba 100644
--- a/examples/Compacting-using-a-default-vocabulary-expanded.jsonld
+++ b/examples/Compacting-using-a-default-vocabulary-expanded.jsonld
@@ -1,5 +1,5 @@
 [{
   "@id": "http://example.org/places#BrewEats",
-  "@type": ["http://xmlns.com/foaf/0.1/Restaurant"],
-  "http://xmlns.com/foaf/0.1/name": [{"@value": "Brew Eats"}]
+  "@type": ["http://example.org/Restaurant"],
+  "http://example.org/name": [{"@value": "Brew Eats"}]
 }]
\ No newline at end of file
diff --git a/examples/Context-defined-in-an-HTML-document.html b/examples/Context-defined-in-an-HTML-document.html
deleted file mode 100644
index d775c3d1..00000000
--- a/examples/Context-defined-in-an-HTML-document.html
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-  
-    
-    Context definition of a person
-    
-  
-  
-    
    The Person context
    
-    
    The Person context is based on a combination of FOAF,
-      schema.org ,
-      and vcard vocabularies. It defines the following terms:
    
-    
    
-      
    foaf
    http://xmlns.com/foaf/0.1/
    
-      
    schema
    http://schema.org/
    
-      
    vcard
    http://www.w3.org/2006/vcard/ns#
    
-      
    xsd
    http://www.w3.org/2001/XMLSchema#
    
-      
    Address
    vcard:Address
    
-    
    
-  
-
\ No newline at end of file
diff --git a/examples/Context-needs-to-be-duplicated-if-graph-is-not-used-original.jsonld b/examples/Context-needs-to-be-duplicated-if-graph-is-not-used-compacted.jsonld
similarity index 100%
rename from examples/Context-needs-to-be-duplicated-if-graph-is-not-used-original.jsonld
rename to examples/Context-needs-to-be-duplicated-if-graph-is-not-used-compacted.jsonld
diff --git a/examples/Coordinates-expressed-in-JSON-LD-original.json b/examples/Coordinates-expressed-in-JSON-LD-compacted.json
similarity index 100%
rename from examples/Coordinates-expressed-in-JSON-LD-original.json
rename to examples/Coordinates-expressed-in-JSON-LD-compacted.json
diff --git a/examples/Defining-an-context-within-a-term-definition-original.jsonld b/examples/Defining-an-context-within-a-term-definition-compacted.jsonld
similarity index 100%
rename from examples/Defining-an-context-within-a-term-definition-original.jsonld
rename to examples/Defining-an-context-within-a-term-definition-compacted.jsonld
diff --git a/examples/Defining-an-context-within-a-term-definition-used-on-type-original.jsonld b/examples/Defining-an-context-within-a-term-definition-used-on-type-compacted.jsonld
similarity index 100%
rename from examples/Defining-an-context-within-a-term-definition-used-on-type-original.jsonld
rename to examples/Defining-an-context-within-a-term-definition-used-on-type-compacted.jsonld
diff --git a/examples/Defining-an-context-within-a-term-definition-used-on-type-statements.table b/examples/Defining-an-context-within-a-term-definition-used-on-type-statements.table
index 0d4e8a0a..5faf1e54 100644
--- a/examples/Defining-an-context-within-a-term-definition-used-on-type-statements.table
+++ b/examples/Defining-an-context-within-a-term-definition-used-on-type-statements.table
@@ -1,5 +1,5 @@
 
-
    
       
    
 Subject
 Property
    
+
    
diff --git a/examples/Defining-property-nesting-Context.jsonld b/examples/Defining-property-nesting-Context.jsonld
new file mode 100644
index 00000000..31e15db1
--- /dev/null
+++ b/examples/Defining-property-nesting-Context.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "skos": "http://www.w3.org/2004/02/skos/core#",
+    "labels": "@nest",
+    "main_label": {"@id": "skos:prefLabel", "@nest": "labels"},
+    "other_label": {"@id": "skos:altLabel", "@nest": "labels"},
+    "homepage": {"@id": "http://xmlns.com/foaf/0.1/homepage", "@type": "@id"}
+  }
+}
\ No newline at end of file
diff --git a/examples/Defining-property-nesting-expanded.jsonld b/examples/Defining-property-nesting-Expanded-Input.jsonld
similarity index 100%
rename from examples/Defining-property-nesting-expanded.jsonld
rename to examples/Defining-property-nesting-Expanded-Input.jsonld
diff --git a/examples/Defining-property-nesting-original.jsonld b/examples/Defining-property-nesting-compacted.jsonld
similarity index 100%
rename from examples/Defining-property-nesting-original.jsonld
rename to examples/Defining-property-nesting-compacted.jsonld
diff --git a/examples/Defining-property-nesting-statements.table b/examples/Defining-property-nesting-statements.table
index 1e965530..1d9551f2 100644
--- a/examples/Defining-property-nesting-statements.table
+++ b/examples/Defining-property-nesting-statements.table
@@ -1,5 +1,5 @@
 
-
    
       
    
 Subject
 Property
    
+
    
diff --git a/examples/Describing-disconnected-nodes-with-graph-original.jsonld b/examples/Describing-disconnected-nodes-with-graph-compacted.jsonld
similarity index 100%
rename from examples/Describing-disconnected-nodes-with-graph-original.jsonld
rename to examples/Describing-disconnected-nodes-with-graph-compacted.jsonld
diff --git a/examples/Describing-disconnected-nodes-with-included-compacted.jsonld b/examples/Describing-disconnected-nodes-with-included-compacted.jsonld
new file mode 100644
index 00000000..eed5169d
--- /dev/null
+++ b/examples/Describing-disconnected-nodes-with-included-compacted.jsonld
@@ -0,0 +1,18 @@
+{
+  "@context": {
+    "Person": "http://xmlns.com/foaf/0.1/Person",
+    "name": "http://xmlns.com/foaf/0.1/name",
+    "knows": {"@id": "http://xmlns.com/foaf/0.1/knows", "@type": "@id"}
+  },
+  "@included": [{
+    "@id": "http://manu.sporny.org/about#manu",
+    "@type": "Person",
+    "name": "Manu Sporny",
+    "knows": "https://greggkellogg.net/foaf#me"
+  }, {
+    "@id": "https://greggkellogg.net/foaf#me",
+    "@type": "Person",
+    "name": "Gregg Kellogg",
+    "knows": "http://manu.sporny.org/about#manu"
+  }]
+}
\ No newline at end of file
diff --git a/examples/Describing-disconnected-nodes-with-included-expanded.jsonld b/examples/Describing-disconnected-nodes-with-included-expanded.jsonld
new file mode 100644
index 00000000..244a4453
--- /dev/null
+++ b/examples/Describing-disconnected-nodes-with-included-expanded.jsonld
@@ -0,0 +1,17 @@
+[{
+  "@included": [{
+    "@id": "http://manu.sporny.org/about#manu",
+    "@type": ["http://xmlns.com/foaf/0.1/Person"],
+    "http://xmlns.com/foaf/0.1/name": [{"@value": "Manu Sporny"}],
+    "http://xmlns.com/foaf/0.1/knows": [
+      {"@id": "https://greggkellogg.net/foaf#me"}
+    ]
+  }, {
+    "@id": "https://greggkellogg.net/foaf#me",
+    "@type": ["http://xmlns.com/foaf/0.1/Person"],
+    "http://xmlns.com/foaf/0.1/name": [{"@value": "Gregg Kellogg"}],
+    "http://xmlns.com/foaf/0.1/knows": [
+      {"@id": "http://manu.sporny.org/about#manu"}
+    ]
+  }]
+}]
\ No newline at end of file
diff --git a/examples/Describing-disconnected-nodes-with-included-flattened.jsonld b/examples/Describing-disconnected-nodes-with-included-flattened.jsonld
new file mode 100644
index 00000000..3cd0e75f
--- /dev/null
+++ b/examples/Describing-disconnected-nodes-with-included-flattened.jsonld
@@ -0,0 +1,15 @@
+[{
+  "@id": "http://manu.sporny.org/about#manu",
+  "@type": ["http://xmlns.com/foaf/0.1/Person"],
+  "http://xmlns.com/foaf/0.1/name": [{"@value": "Manu Sporny"}],
+  "http://xmlns.com/foaf/0.1/knows": [
+    {"@id": "https://greggkellogg.net/foaf#me"}
+  ]
+}, {
+  "@id": "https://greggkellogg.net/foaf#me",
+  "@type": ["http://xmlns.com/foaf/0.1/Person"],
+  "http://xmlns.com/foaf/0.1/name": [{"@value": "Gregg Kellogg"}],
+  "http://xmlns.com/foaf/0.1/knows": [
+    {"@id": "http://manu.sporny.org/about#manu"}
+  ]
+}]
\ No newline at end of file
diff --git a/examples/Describing-disconnected-nodes-with-included-statements.table b/examples/Describing-disconnected-nodes-with-included-statements.table
new file mode 100644
index 00000000..207d49d3
--- /dev/null
+++ b/examples/Describing-disconnected-nodes-with-included-statements.table
@@ -0,0 +1,47 @@
+
+
    
     
    
       Subject
       Property
    
+      
+
+
+
+
+
+      
+        
+
+
+
+
+
+        
+
+
+
+
+
+        
+
+
+
+
+
+        
+
+
+
+
+
+        
+
+
+
+
+
+        
+
+
+
+
+
+      
+    
    SubjectPropertyValueValue Type
    http://manu.sporny.org/about#manurdf:typefoaf:Person 
    http://manu.sporny.org/about#manufoaf:nameManu Sporny 
    http://manu.sporny.org/about#manufoaf:knowshttps://greggkellogg.net/foaf#me 
    https://greggkellogg.net/foaf#merdf:typefoaf:Person 
    https://greggkellogg.net/foaf#mefoaf:nameGregg Kellogg 
    https://greggkellogg.net/foaf#mefoaf:knowshttp://manu.sporny.org/about#manu 
    
diff --git a/examples/Describing-disconnected-nodes-with-included-turtle.ttl b/examples/Describing-disconnected-nodes-with-included-turtle.ttl
new file mode 100644
index 00000000..5436fc8b
--- /dev/null
+++ b/examples/Describing-disconnected-nodes-with-included-turtle.ttl
@@ -0,0 +1,7 @@
+@prefix foaf:  .
+ a foaf:Person;
+  foaf:name "Manu Sporny";
+  foaf:knows  .
+ a foaf:Person;
+  foaf:name "Gregg Kellogg";
+  foaf:knows  .
\ No newline at end of file
diff --git a/examples/Embedded-contexts-within-node-objects-original.jsonld b/examples/Embedded-contexts-within-node-objects-compacted.jsonld
similarity index 100%
rename from examples/Embedded-contexts-within-node-objects-original.jsonld
rename to examples/Embedded-contexts-within-node-objects-compacted.jsonld
diff --git a/examples/Embedding-JSON-LD-containing-HTML-in-HTML-original.html b/examples/Embedding-JSON-LD-containing-HTML-in-HTML-compacted.html
similarity index 100%
rename from examples/Embedding-JSON-LD-containing-HTML-in-HTML-original.html
rename to examples/Embedding-JSON-LD-containing-HTML-in-HTML-compacted.html
diff --git a/examples/Embedding-JSON-LD-in-HTML-original.html b/examples/Embedding-JSON-LD-in-HTML-compacted.html
similarity index 100%
rename from examples/Embedding-JSON-LD-in-HTML-original.html
rename to examples/Embedding-JSON-LD-in-HTML-compacted.html
diff --git a/examples/Embedding-Objects-original.jsonld b/examples/Embedding-Objects-compacted.jsonld
similarity index 100%
rename from examples/Embedding-Objects-original.jsonld
rename to examples/Embedding-Objects-compacted.jsonld
diff --git a/examples/Embedding-a-node-object-as-property-value-of-another-node-object-original.jsonld b/examples/Embedding-a-node-object-as-property-value-of-another-node-object-compacted.jsonld
similarity index 100%
rename from examples/Embedding-a-node-object-as-property-value-of-another-node-object-original.jsonld
rename to examples/Embedding-a-node-object-as-property-value-of-another-node-object-compacted.jsonld
diff --git a/examples/Example-demonstrating-the-context-sensitivity-for-type-statements-original.table b/examples/Example-demonstrating-the-context-sensitivity-for-type-statements-compacted.table
similarity index 80%
rename from examples/Example-demonstrating-the-context-sensitivity-for-type-statements-original.table
rename to examples/Example-demonstrating-the-context-sensitivity-for-type-statements-compacted.table
index 1ebf9ffa..9f3d18a7 100644
--- a/examples/Example-demonstrating-the-context-sensitivity-for-type-statements-original.table
+++ b/examples/Example-demonstrating-the-context-sensitivity-for-type-statements-compacted.table
@@ -1,5 +1,5 @@
 
-
+
    
diff --git a/examples/Expanded-term-definition-with-language-and-direction.jsonld b/examples/Expanded-term-definition-with-language-and-direction.jsonld
new file mode 100644
index 00000000..5626f00d
--- /dev/null
+++ b/examples/Expanded-term-definition-with-language-and-direction.jsonld
@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@language": "ar-EG",
+    "@direction": "rtl",
+    "ex": "http://example.com/vocab/",
+    "publisher": { "@id": "ex:publisher", "@direction": null },
+    "title": { "@id": "ex:title" },
+    "title_en": { "@id": "ex:title", "@language": "en", "@direction": "ltr" }
+  },
+  "publisher": "مكتبة",
+  "title": "HTML و CSS: تصميم و إنشاء مواقع الويب",
+  "title_en": "HTML and CSS: Design and Build Websites"
+}
\ No newline at end of file
diff --git a/examples/Expanded-term-definition-with-type-coercion-original.jsonld b/examples/Expanded-term-definition-with-type-coercion-compacted.jsonld
similarity index 100%
rename from examples/Expanded-term-definition-with-type-coercion-original.jsonld
rename to examples/Expanded-term-definition-with-type-coercion-compacted.jsonld
diff --git a/examples/Expanded-term-definition-with-types-original.jsonld b/examples/Expanded-term-definition-with-types-compacted.jsonld
similarity index 100%
rename from examples/Expanded-term-definition-with-types-original.jsonld
rename to examples/Expanded-term-definition-with-types-compacted.jsonld
diff --git a/examples/Expanded-value-with-type-original.jsonld b/examples/Expanded-value-with-type-compacted.jsonld
similarity index 100%
rename from examples/Expanded-value-with-type-original.jsonld
rename to examples/Expanded-value-with-type-compacted.jsonld
diff --git a/examples/Expansion-using-embedded-and-scoped-contexts-embedding-equivalent-.jsonld b/examples/Expansion-using-embedded-and-scoped-contexts-embedding-equivalent-.jsonld
new file mode 100644
index 00000000..ebf5174e
--- /dev/null
+++ b/examples/Expansion-using-embedded-and-scoped-contexts-embedding-equivalent-.jsonld
@@ -0,0 +1,24 @@
+{
+  "@context": {
+    "@vocab": "http://example.com/vocab/",
+    "property": "http://example.com/vocab/property",
+    "Type1": "http://example.com/vocab/Type1",
+    "Type2": "http://example.com/vocab/Type2"
+  },
+  "property": {
+    "@context": [{
+        "term1": "http://example.com/vocab/term1"
+      }, {
+        "term2": "http://example.com/vocab/term2"
+      }, {
+        "term3": "http://example.com/vocab/term3"
+      }, {
+      "term4": "http://example.com/vocab/term4"
+    }],
+    "@type": ["Type2", "Type1"],
+    "term1": "a",
+    "term2": "b",
+    "term3": "c",
+    "term4": "d"
+  }
+}
\ No newline at end of file
diff --git a/examples/Expansion-using-embedded-and-scoped-contexts.jsonld b/examples/Expansion-using-embedded-and-scoped-contexts.jsonld
new file mode 100644
index 00000000..2bd55bec
--- /dev/null
+++ b/examples/Expansion-using-embedded-and-scoped-contexts.jsonld
@@ -0,0 +1,34 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example.com/vocab/",
+    "property": {
+      "@id": "http://example.com/vocab/property",
+      "@context": {
+        "term1": "http://example.com/vocab/term1"
+      }
+    },
+    "Type1": {
+      "@id": "http://example.com/vocab/Type1",
+      "@context": {
+        "term3": "http://example.com/vocab/term3"
+      }
+    },
+    "Type2": {
+      "@id": "http://example.com/vocab/Type2",
+      "@context": {
+        "term4": "http://example.com/vocab/term4"
+      }
+    }
+  },
+  "property": {
+    "@context": {
+      "term2": "http://example.com/vocab/term2"
+    },
+    "@type": ["Type2", "Type1"],
+    "term1": "a",
+    "term2": "b",
+    "term3": "c",
+    "term4": "d"
+  }
+}
\ No newline at end of file
diff --git a/examples/Flattened-form-for-included-blocks-flattened.jsonld b/examples/Flattened-form-for-included-blocks-flattened.jsonld
new file mode 100644
index 00000000..b4f1a2d8
--- /dev/null
+++ b/examples/Flattened-form-for-included-blocks-flattened.jsonld
@@ -0,0 +1,30 @@
+  [{
+    "@id": "http://example.org/base/1",
+    "@type": ["http://example.org/Thing-with-Items"],
+    "http://example.org/items": [
+      {"@id": "http://example.org/base/2"},
+      {"@id": "http://example.org/base/3"}
+    ]
+  }, {
+    "@id": "http://example.org/enum#c6",
+    "@type": ["http://example.org/Type"],
+    "http://example.org/label": [{"@value": "Classification 6"}]
+  }, {
+    "@id": "http://example.org/enum#s2",
+    "@type": ["http://example.org/Service"],
+    "http://example.org/label": [{"@value": "Login Service"}]
+  }, {
+    "@id": "http://example.org/base/2",
+    "http://example.org/classification": [
+      {"@id": "http://example.org/enum#c6"}
+    ],
+    "http://example.org/service": [
+      {"@id": "http://example.org/enum#s2"}
+    ]
+  }, {
+    "@id": "http://example.org/base/3",
+    "http://example.org/classification": [
+      {"@id": "http://example.org/enum#c6"}
+    ]
+  }
+]
\ No newline at end of file
diff --git a/examples/Flattened-form-for-included-blocks-statements.table b/examples/Flattened-form-for-included-blocks-statements.table
new file mode 100644
index 00000000..b324002c
--- /dev/null
+++ b/examples/Flattened-form-for-included-blocks-statements.table
@@ -0,0 +1,60 @@
+
+
    
   
    
     Subject
     Property
    
+      
+
+
+
+
+      
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+
+
+
+
+      
+    
    SubjectPropertyValue
    http://example.org/base/1rdf:typehttp://example.org/Thing-with-Items
    http://example.org/base/1http://example.org/itemshttp://example.org/base/2
    http://example.org/base/1http://example.org/itemshttp://example.org/base/3
    http://example.org/base/2http://example.org/classificationhttp://example.org/enum#c6
    http://example.org/base/2http://example.org/servicehttp://example.org/enum#s2
    http://example.org/base/3http://example.org/classificationhttp://example.org/enum#c6
    http://example.org/enum#c6rdf:typehttp://example.org/Type
    http://example.org/enum#c6http://example.org/labelClassification 6
    http://example.org/enum#s2rdf:typehttp://example.org/Service
    http://example.org/enum#s2http://example.org/labelLogin Service
    
diff --git a/examples/Flattened-form-for-included-blocks-turtle.ttl b/examples/Flattened-form-for-included-blocks-turtle.ttl
new file mode 100644
index 00000000..39f4b400
--- /dev/null
+++ b/examples/Flattened-form-for-included-blocks-turtle.ttl
@@ -0,0 +1,11 @@
+@prefix ex:  .
+@prefix enum:  .
+ a ex:Thing-with-Items;
+  ex:items ,  .
+ ex:classification enum:c6;
+  ex:service enum:s2 .
+ ex:classification enum:c6 .
+enum:c6 a ex:Type;
+  ex:label "Classification 6" .
+enum:s2 a ex:Service;
+  ex:label "Login Service" .
\ No newline at end of file
diff --git a/examples/HTML-that-describes-a-book-using-microdata.html b/examples/HTML-that-describes-a-book-using-microdata.html
index f50ad42d..7c5bb511 100644
--- a/examples/HTML-that-describes-a-book-using-microdata.html
+++ b/examples/HTML-that-describes-a-book-using-microdata.html
@@ -2,22 +2,22 @@
     itemtype="http://purl.org/vocab/frbr/core#Work"
     itemid="http://purl.oreilly.com/works/45U8QJGZSQKDH8N">
  
    Title
    
- 
    Just a Geek
    
+ 
    Just a Geek
    
  
    By
    
- 
    Wil Wheaton
    
+ 
    Wil Wheaton
    
  
    Format
    
  
    
-  
+  
   Print
  
    
  
    
-  
+  
   Ebook
  
    
 
\ No newline at end of file
diff --git a/examples/Identifying-a-node-original.jsonld b/examples/Identifying-a-node-compacted.jsonld
similarity index 100%
rename from examples/Identifying-a-node-original.jsonld
rename to examples/Identifying-a-node-compacted.jsonld
diff --git a/examples/Identifying-and-making-statements-about-a-graph-original.jsonld b/examples/Identifying-and-making-statements-about-a-graph-compacted.jsonld
similarity index 87%
rename from examples/Identifying-and-making-statements-about-a-graph-original.jsonld
rename to examples/Identifying-and-making-statements-about-a-graph-compacted.jsonld
index 3786efcd..e8beca66 100644
--- a/examples/Identifying-and-making-statements-about-a-graph-original.jsonld
+++ b/examples/Identifying-and-making-statements-about-a-graph-compacted.jsonld
@@ -2,14 +2,14 @@
   "@context": {
     "generatedAt": {
       "@id": "http://www.w3.org/ns/prov#generatedAtTime",
-      "@type": "http://www.w3.org/2001/XMLSchema#date"
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
     },
     "Person": "http://xmlns.com/foaf/0.1/Person",
     "name": "http://xmlns.com/foaf/0.1/name",
     "knows": {"@id": "http://xmlns.com/foaf/0.1/knows", "@type": "@id"}
   },
   "@id": "http://example.org/foaf-graph",
-  "generatedAt": "2012-04-09",
+  "generatedAt": "2012-04-09T00:00:00",
   "@graph": [
     {
       "@id": "http://manu.sporny.org/about#manu",
diff --git a/examples/Identifying-and-making-statements-about-a-graph-expanded.jsonld b/examples/Identifying-and-making-statements-about-a-graph-expanded.jsonld
index 00fa9584..aec0c798 100644
--- a/examples/Identifying-and-making-statements-about-a-graph-expanded.jsonld
+++ b/examples/Identifying-and-making-statements-about-a-graph-expanded.jsonld
@@ -1,8 +1,8 @@
 [{
   "@id": "http://example.org/foaf-graph",
   "http://www.w3.org/ns/prov#generatedAtTime": [{
-    "@value": "2012-04-09",
-    "@type": "http://www.w3.org/2001/XMLSchema#date"
+    "@value": "2012-04-09T00:00:00",
+    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
   }],
   "@graph": [{
     "@id": "http://manu.sporny.org/about#manu",
diff --git a/examples/Identifying-and-making-statements-about-a-graph-statements.table b/examples/Identifying-and-making-statements-about-a-graph-statements.table
index b97391ff..b3f18257 100644
--- a/examples/Identifying-and-making-statements-about-a-graph-statements.table
+++ b/examples/Identifying-and-making-statements-about-a-graph-statements.table
@@ -12,8 +12,8 @@
  
 http://example.org/foaf-graph
 prov:generatedAtTime
-2012-04-09
-xsd:date
+2012-04-09T00:00:00
+xsd:dateTime
 
         
 http://example.org/foaf-graph
diff --git a/examples/Identifying-and-making-statements-about-a-graph-trig.trig b/examples/Identifying-and-making-statements-about-a-graph-trig.trig
index c9e81f72..fe24537f 100644
--- a/examples/Identifying-and-making-statements-about-a-graph-trig.trig
+++ b/examples/Identifying-and-making-statements-about-a-graph-trig.trig
@@ -2,7 +2,7 @@
 @prefix prov:  .
 @prefix rdf:  .
 @prefix xsd:  .
- prov:generatedAtTime "2012-04-09"^^xsd:date .
+ prov:generatedAtTime "2012-04-09T00:00:00"^^xsd:dateTime .
  {
    a foaf:Person;
      foaf:name "Manu Sporny";
diff --git a/examples/Implicitly-named-graph-original.jsonld b/examples/Implicitly-named-graph-compacted.jsonld
similarity index 100%
rename from examples/Implicitly-named-graph-original.jsonld
rename to examples/Implicitly-named-graph-compacted.jsonld
diff --git a/examples/In-line-context-definition-original.jsonld b/examples/In-line-context-definition-compacted.jsonld
similarity index 100%
rename from examples/In-line-context-definition-original.jsonld
rename to examples/In-line-context-definition-compacted.jsonld
diff --git a/examples/Included-Blocks.jsonld b/examples/Included-Blocks.jsonld
new file mode 100644
index 00000000..a91e89ab
--- /dev/null
+++ b/examples/Included-Blocks.jsonld
@@ -0,0 +1,27 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@vocab": "http://example.org/",
+    "classification": {"@type": "@vocab"},
+    "service": {"@type": "@vocab"}
+  },
+  "@id": "http://example.org/base/1",
+  "@type": "Thing-with-Items",
+  "items": [{
+    "@id":"http://example.org/base/2",
+    "classification": "enum#c6",
+    "service": "enum#s2"
+  }, {
+    "@id": "http://example.org/base/3",
+    "classification": "enum#c6"
+  }],
+  "@included": [{
+    "@id": "http://example.org/enum#c6",
+    "@type": "Type",
+    "label": "Classification 6"
+  }, {
+    "@id": "http://example.org/enum#s2",
+    "@type": "Service",
+    "label": "Login Service"
+  }]
+}
\ No newline at end of file
diff --git a/examples/Indexing-data-in-JSON-LD-by-node-identifiers-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-node-identifiers-compacted.jsonld
similarity index 88%
rename from examples/Indexing-data-in-JSON-LD-by-node-identifiers-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-node-identifiers-compacted.jsonld
index dc477270..b44e8d03 100644
--- a/examples/Indexing-data-in-JSON-LD-by-node-identifiers-original.jsonld
+++ b/examples/Indexing-data-in-JSON-LD-by-node-identifiers-compacted.jsonld
@@ -1,6 +1,7 @@
 {
   "@context": {
     "@version": 1.1,
+    "@base": "http://example.com/posts/",
     "schema": "http://schema.org/",
     "name": "schema:name",
     "body": "schema:articleBody",
@@ -14,11 +15,11 @@
   "@type": "schema:Blog",
   "name": "World Financial News",
   "post": {
-    "http://example.com/posts/1/en": {
+    "1/en": {
       "body": "World commodities were up today with heavy trading of crude oil...",
       "words": 1539
     },
-    "http://example.com/posts/1/de": {
+    "1/de": {
       "body": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...",
       "words": 1204
     }
diff --git a/examples/Indexing-data-in-JSON-LD-by-node-identifiers-using-none-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-node-identifiers-using-none-compacted.jsonld
similarity index 100%
rename from examples/Indexing-data-in-JSON-LD-by-node-identifiers-using-none-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-node-identifiers-using-none-compacted.jsonld
diff --git a/examples/Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-compacted.jsonld
similarity index 100%
rename from examples/Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-node-identifiers-with-set-representation-compacted.jsonld
diff --git a/examples/Indexing-data-in-JSON-LD-by-type-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-type-compacted.jsonld
similarity index 100%
rename from examples/Indexing-data-in-JSON-LD-by-type-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-type-compacted.jsonld
diff --git a/examples/Indexing-data-in-JSON-LD-by-type-using-none-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-type-using-none-compacted.jsonld
similarity index 100%
rename from examples/Indexing-data-in-JSON-LD-by-type-using-none-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-type-using-none-compacted.jsonld
diff --git a/examples/Indexing-data-in-JSON-LD-by-type-with-set-representation-original.jsonld b/examples/Indexing-data-in-JSON-LD-by-type-with-set-representation-compacted.jsonld
similarity index 100%
rename from examples/Indexing-data-in-JSON-LD-by-type-with-set-representation-original.jsonld
rename to examples/Indexing-data-in-JSON-LD-by-type-with-set-representation-compacted.jsonld
diff --git a/examples/Indexing-data-in-JSON-LD-compacted.jsonld b/examples/Indexing-data-in-JSON-LD-compacted.jsonld
new file mode 100644
index 00000000..0dfe01a3
--- /dev/null
+++ b/examples/Indexing-data-in-JSON-LD-compacted.jsonld
@@ -0,0 +1,27 @@
+{
+  "@context": {
+    "schema": "http://schema.org/",
+    "name": "schema:name",
+    "body": "schema:articleBody",
+    "athletes": {
+      "@id": "schema:athlete",
+      "@container": "@index"
+    },
+    "position": "schema:jobTitle"
+  },
+  "@id": "http://example.com/",
+  "@type": "schema:SportsTeam",
+  "name": "San Franciso Giants",
+  "athletes": {
+    "catcher": {
+      "@type": "schema:Person",
+      "name": "Buster Posey",
+      "position": "Catcher"
+    },
+    "pitcher": {
+      "@type": "schema:Person",
+      "name": "Madison Bumgarner",
+      "position": "Starting Pitcher"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Indexing-data-in-JSON-LD-expanded.jsonld b/examples/Indexing-data-in-JSON-LD-expanded.jsonld
index f57e959e..5e643982 100644
--- a/examples/Indexing-data-in-JSON-LD-expanded.jsonld
+++ b/examples/Indexing-data-in-JSON-LD-expanded.jsonld
@@ -1,22 +1,17 @@
 [{
   "@id": "http://example.com/",
-  "@type": ["http://schema.org/Blog"],
-  "http://schema.org/name": [{"@value": "World Financial News"}],
-  "http://schema.org/blogPost": [{
-    "@id": "http://example.com/posts/1/en",
-    "http://schema.org/articleBody": [
-      {"@value": "World commodities were up today with heavy trading of crude oil..."}
-    ],
-    "http://schema.org/wordCount": [
-      {"@value": 1539}
-    ],
-    "@index": "en"
+  "@type": ["http://schema.org/SportsTeam"],
+  "http://schema.org/name": [{"@value": "San Franciso Giants"}],
+  "http://schema.org/athlete": [{
+    "@type": ["http://schema.org/Person"],
+    "http://schema.org/name": [{"@value": "Buster Posey"}],
+    "http://schema.org/jobTitle": [{"@value": "Catcher"}],
+    "@index": "catcher"
   }, {
-    "@id": "http://example.com/posts/1/de",
-    "http://schema.org/articleBody": [
-      {"@value": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl..."}
-    ],
-    "http://schema.org/wordCount": [{"@value": 1204}],
-    "@index": "de"
-  }]
+    "@type": ["http://schema.org/Person"],
+    "http://schema.org/name": [{"@value": "Madison Bumgarner"}],
+    "http://schema.org/jobTitle": [{"@value": "Starting Pitcher"}],
+    "@index": "pitcher"
+  }
+  ]
 }]
\ No newline at end of file
diff --git a/examples/Indexing-data-in-JSON-LD-original.jsonld b/examples/Indexing-data-in-JSON-LD-original.jsonld
deleted file mode 100644
index fa43a8c5..00000000
--- a/examples/Indexing-data-in-JSON-LD-original.jsonld
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "@context": {
-    "schema": "http://schema.org/",
-    "name": "schema:name",
-    "body": "schema:articleBody",
-    "words": "schema:wordCount",
-    "post": {
-      "@id": "schema:blogPost",
-      "@container": "@index"
-    }
-  },
-  "@id": "http://example.com/",
-  "@type": "schema:Blog",
-  "name": "World Financial News",
-  "post": {
-    "en": {
-      "@id": "http://example.com/posts/1/en",
-      "body": "World commodities were up today with heavy trading of crude oil...",
-      "words": 1539
-    },
-    "de": {
-      "@id": "http://example.com/posts/1/de",
-      "body": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...",
-      "words": 1204
-    }
-  }
-}
\ No newline at end of file
diff --git a/examples/Indexing-data-in-JSON-LD-statements.table b/examples/Indexing-data-in-JSON-LD-statements.table
index 4f29da57..db294fe2 100644
--- a/examples/Indexing-data-in-JSON-LD-statements.table
+++ b/examples/Indexing-data-in-JSON-LD-statements.table
@@ -7,53 +7,55 @@
       Value Type
     
     
-    
-      http://example.com/
-      rdf:type
-      schema:Blog
-      
-    
-    
-      http://example.com/
-      schema:name
-      World Financial News
-      
-    
-    
-      http://example.com/
-      schema:blogPost
-      http://example.com/posts/1/de
-      
-    
-    
-      http://example.com/
-      schema:blogPost
-      http://example.com/posts/1/en
-      
-    
-    
-      http://example.com/posts/1/de
-      schema:articleBody
-      Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...
-      
-    
-    
-      http://example.com/posts/1/de
-      schema:wordCount
-      1204
-      xsd:integer
-    
-    
-      http://example.com/posts/1/en
-      schema:articleBody
-      World commodities were up today with heavy trading of crude oil...
-      
-    
-    
-      http://example.com/posts/1/en
-      schema:wordCount
-      1539
-      xsd:integer
-    
+      
+http://example.com/
+rdf:type
+schema:SportsTeam
+
+      
+http://example.com/
+schema:name
+San Franciso Giants
+
+      
+_:b0
+rdf:type
+schema:Person
+
+      
+_:b0
+schema:name
+Buster Posey
+
+      
+_:b0
+schema:jobTitle
+Catcher
+
+      
+http://example.com/
+schema:athlete
+_:b0
+
+      
+_:b1
+rdf:type
+schema:Person
+
+      
+_:b1
+schema:name
+Madison Bumgarner
+
+      
+_:b1
+schema:jobTitle
+Starting Pitcher
+
+      
+http://example.com/
+schema:athlete
+_:b1
+
     
     
diff --git a/examples/Indexing-data-in-JSON-LD-turtle.ttl b/examples/Indexing-data-in-JSON-LD-turtle.ttl
index 3a38ec31..5bddf805 100644
--- a/examples/Indexing-data-in-JSON-LD-turtle.ttl
+++ b/examples/Indexing-data-in-JSON-LD-turtle.ttl
@@ -1,14 +1,13 @@
 @prefix schema:  .
-@prefix xsd:  .
- a schema:Blog;
-   schema:blogPost ,
-     ;
-   schema:name "World Financial News" .
-
-   schema:articleBody
-      "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...";
-   schema:wordCount 1204 .
-
-   schema:articleBody
-      "World commodities were up today with heavy trading of crude oil...";
-   schema:wordCount 1539 .
\ No newline at end of file
+ a schema:SportsTeam;
+  schema:name "San Franciso Giants";
+  schema:athlete [
+    a schema:Person;
+    schema:jobTitle "Catcher";
+    schema:name "Buster Posey"
+  ], [
+    a schema:Person;
+    schema:jobTitle "Starting Pitcher";
+    schema:name "Madison Bumgarner"
+  ]
+  .
\ No newline at end of file
diff --git a/examples/Indexing-data-using-none-compacted.jsonld b/examples/Indexing-data-using-none-compacted.jsonld
new file mode 100644
index 00000000..575c5b3f
--- /dev/null
+++ b/examples/Indexing-data-using-none-compacted.jsonld
@@ -0,0 +1,32 @@
+{
+  "@context": {
+     "@version": 1.1,
+    "schema": "http://schema.org/",
+    "name": "schema:name",
+    "body": "schema:articleBody",
+    "athletes": {
+      "@id": "schema:athlete",
+      "@container": "@index"
+    },
+    "position": "schema:jobTitle"
+  },
+  "@id": "http://example.com/",
+  "@type": "schema:SportsTeam",
+  "name": "San Franciso Giants",
+  "athletes": {
+    "catcher": {
+      "@type": "schema:Person",
+      "name": "Buster Posey",
+      "position": "Catcher"
+    },
+    "pitcher": {
+      "@type": "schema:Person",
+      "name": "Madison Bumgarner",
+      "position": "Starting Pitcher"
+    },
+    "@none": {
+      "name": "Lou Seal",
+      "position": "Mascot"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Indexing-data-using-none-expanded.jsonld b/examples/Indexing-data-using-none-expanded.jsonld
index 66c6c46b..6a8327ff 100644
--- a/examples/Indexing-data-using-none-expanded.jsonld
+++ b/examples/Indexing-data-using-none-expanded.jsonld
@@ -1,32 +1,20 @@
 [{
   "@id": "http://example.com/",
-  "@type": ["http://schema.org/Blog"],
-  "http://schema.org/name": [
-    {"@value": "World Financial News"}
-  ],
-  "http://schema.org/blogPost": [
-    {
-      "@id": "http://example.com/posts/1/en",
-      "http://schema.org/articleBody": [
-        {"@value": "World commodities were up today with heavy trading of crude oil..."}
-      ],
-      "http://schema.org/wordCount": [{"@value": 1539}],
-      "@index": "en"
-    },
-    {
-      "@id": "http://example.com/posts/1/de",
-      "http://schema.org/articleBody": [
-        {"@value": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl..."}
-      ],
-      "http://schema.org/wordCount": [{"@value": 1204}],
-      "@index": "de"
-    },
-    {
-      "@id": "http://example.com/posts/1/no-language",
-      "http://schema.org/articleBody": [
-        {"@value": "Unindexed description"}
-      ],
-      "http://schema.org/wordCount": [{"@value": 20}]
-    }
+  "@type": ["http://schema.org/SportsTeam"],
+  "http://schema.org/name": [{"@value": "San Franciso Giants"}],
+  "http://schema.org/athlete": [{
+    "@type": ["http://schema.org/Person"],
+    "http://schema.org/name": [{"@value": "Buster Posey"}],
+    "http://schema.org/jobTitle": [{"@value": "Catcher"}],
+    "@index": "catcher"
+  }, {
+    "@type": ["http://schema.org/Person"],
+    "http://schema.org/name": [{"@value": "Madison Bumgarner"}],
+    "http://schema.org/jobTitle": [{"@value": "Starting Pitcher"}],
+    "@index": "pitcher"
+  }, {
+    "http://schema.org/name": [{"@value": "Lou Seal"}],
+    "http://schema.org/jobTitle": [{"@value": "Mascot"}]
+  }
   ]
 }]
\ No newline at end of file
diff --git a/examples/Indexing-data-using-none-original.jsonld b/examples/Indexing-data-using-none-original.jsonld
deleted file mode 100644
index 628a1843..00000000
--- a/examples/Indexing-data-using-none-original.jsonld
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "@context": {
-     "@version": 1.1,
-     "schema": "http://schema.org/",
-     "name": "schema:name",
-     "body": "schema:articleBody",
-     "words": "schema:wordCount",
-     "post": {
-       "@id": "schema:blogPost",
-       "@container": "@index"
-     }
-  },
-  "@id": "http://example.com/",
-  "@type": "schema:Blog",
-  "name": "World Financial News",
-  "post": {
-    "en": {
-      "@id": "http://example.com/posts/1/en",
-      "body": "World commodities were up today with heavy trading of crude oil...",
-      "words": 1539
-    },
-    "de": {
-      "@id": "http://example.com/posts/1/de",
-      "body": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...",
-      "words": 1204
-    },
-    "@none": {
-      "@id": "http://example.com/posts/1/no-language",
-      "body": "Unindexed description",
-      "words": 20
-    }
-  }
-}
\ No newline at end of file
diff --git a/examples/Indexing-data-using-none-statements.table b/examples/Indexing-data-using-none-statements.table
index 3323a5e6..f2035028 100644
--- a/examples/Indexing-data-using-none-statements.table
+++ b/examples/Indexing-data-using-none-statements.table
@@ -7,71 +7,70 @@
       Value Type
     
     
-    
-      http://example.com/
-      rdf:type
-      schema:Blog
-      
-    
-    
-      http://example.com/
-      schema:name
-      World Financial News
-      
-    
-    
-      http://example.com/
-      schema:blogPost
-      http://example.com/posts/1/de
-      
-    
-    
-      http://example.com/
-      schema:blogPost
-      http://example.com/posts/1/en
-      
-    
-    
-      http://example.com/
-      schema:blogPost
-      http://example.com/posts/1/no-language
-      
-    
-    
-      http://example.com/posts/1/de
-      schema:articleBody
-      Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...
-      
-    
-    
-      http://example.com/posts/1/de
-      schema:wordCount
-      1204
-      xsd:integer
-    
-    
-      http://example.com/posts/1/en
-      schema:articleBody
-      World commodities were up today with heavy trading of crude oil...
-      
-    
-    
-      http://example.com/posts/1/en
-      schema:wordCount
-      1539
-      xsd:integer
-    
-    
-      http://example.com/posts/1/no-language
-      schema:articleBody
-      Unindexed description
-      
-    
-    
-      http://example.com/posts/1/no-language
-      schema:wordCount
-      20
-      xsd:integer
-    
+      
+http://example.com/
+rdf:type
+schema:SportsTeam
+
+      
+http://example.com/
+schema:name
+San Franciso Giants
+
+      
+_:b0
+rdf:type
+schema:Person
+
+      
+_:b0
+schema:name
+Buster Posey
+
+      
+_:b0
+schema:jobTitle
+Catcher
+
+      
+http://example.com/
+schema:athlete
+_:b0
+
+      
+_:b1
+rdf:type
+schema:Person
+
+      
+_:b1
+schema:name
+Madison Bumgarner
+
+      
+_:b1
+schema:jobTitle
+Starting Pitcher
+
+      
+http://example.com/
+schema:athlete
+_:b1
+
+      
+_:b2
+schema:name
+Lou Seal
+
+      
+_:b2
+schema:jobTitle
+Mascot
+
+      
+http://example.com/
+schema:athlete
+_:b2
+
     
     
diff --git a/examples/Indexing-data-using-none-turtle.ttl b/examples/Indexing-data-using-none-turtle.ttl
index 24f25323..09adadd1 100644
--- a/examples/Indexing-data-using-none-turtle.ttl
+++ b/examples/Indexing-data-using-none-turtle.ttl
@@ -1,19 +1,16 @@
 @prefix schema:  .
-@prefix xsd:  .
- a schema:Blog;
-   schema:blogPost ,
-     ,
-     ;
-   schema:name "World Financial News" .
-
-   schema:articleBody
-      "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...";
-   schema:wordCount 1204 .
-
-   schema:articleBody
-      "World commodities were up today with heavy trading of crude oil...";
-   schema:wordCount 1539 .
-
-   schema:articleBody
-      "Unindexed description";
-   schema:wordCount 20 .
\ No newline at end of file
+ a schema:SportsTeam;
+  schema:name "San Franciso Giants";
+  schema:athlete [
+    a schema:Person;
+    schema:jobTitle "Catcher";
+    schema:name "Buster Posey"
+  ], [
+    a schema:Person;
+    schema:jobTitle "Starting Pitcher";
+    schema:name "Madison Bumgarner"
+  ], [
+    schema:jobTitle "Mascot";
+    schema:name "Lou Seal"
+  ]
+  .
\ No newline at end of file
diff --git a/examples/Indexing-graph-data-in-JSON-LD-original.jsonld b/examples/Indexing-graph-data-in-JSON-LD-compacted.jsonld
similarity index 100%
rename from examples/Indexing-graph-data-in-JSON-LD-original.jsonld
rename to examples/Indexing-graph-data-in-JSON-LD-compacted.jsonld
diff --git a/examples/Indexing-graphs-using-none-for-no-index-original.jsonld b/examples/Indexing-graphs-using-none-for-no-index-compacted.jsonld
similarity index 100%
rename from examples/Indexing-graphs-using-none-for-no-index-original.jsonld
rename to examples/Indexing-graphs-using-none-for-no-index-compacted.jsonld
diff --git a/examples/Indexing-languaged-tagged-strings-in-JSON-LD-original.jsonld b/examples/Indexing-languaged-tagged-strings-in-JSON-LD-compacted.jsonld
similarity index 100%
rename from examples/Indexing-languaged-tagged-strings-in-JSON-LD-original.jsonld
rename to examples/Indexing-languaged-tagged-strings-in-JSON-LD-compacted.jsonld
diff --git a/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-original.jsonld b/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-compacted.jsonld
similarity index 100%
rename from examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-original.jsonld
rename to examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-compacted.jsonld
diff --git a/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-statements.table b/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-statements.table
index 13c25fd0..5dc05438 100644
--- a/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-statements.table
+++ b/examples/Indexing-languaged-tagged-strings-in-JSON-LD-with-set-representation-statements.table
@@ -16,13 +16,13 @@
         
 http://example.com/queen
 http://example.com/vocab/label
-Die Königin
+Die Königin
 de
 
         
 http://example.com/queen
 http://example.com/vocab/label
-Ihre Majestät
+Ihre Majestät
 de
 
       
diff --git a/examples/Indexing-languaged-tagged-strings-using-none-for-no-language-original.jsonld b/examples/Indexing-languaged-tagged-strings-using-none-for-no-language-compacted.jsonld
similarity index 100%
rename from examples/Indexing-languaged-tagged-strings-using-none-for-no-language-original.jsonld
rename to examples/Indexing-languaged-tagged-strings-using-none-for-no-language-compacted.jsonld
diff --git a/examples/JSON-Literal-original.jsonld b/examples/JSON-Literal-compacted.jsonld
similarity index 100%
rename from examples/JSON-Literal-original.jsonld
rename to examples/JSON-Literal-compacted.jsonld
diff --git a/examples/JSON-Literal-statements.table b/examples/JSON-Literal-statements.table
index 8a0b6212..57a0db4d 100644
--- a/examples/JSON-Literal-statements.table
+++ b/examples/JSON-Literal-statements.table
@@ -1,5 +1,5 @@
 
-
+
    
diff --git a/examples/Marking-a-context-to-not-propagate-compacted.jsonld b/examples/Marking-a-context-to-not-propagate-compacted.jsonld
new file mode 100644
index 00000000..dfb80ae0
--- /dev/null
+++ b/examples/Marking-a-context-to-not-propagate-compacted.jsonld
@@ -0,0 +1,17 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "term": {
+      "@id": "http://example.org/original",
+      "@context": {
+        "@propagate": false,
+        "term": "http://example.org/non-propagated-term"
+      }
+    }
+  },
+  "term": {
+    "term": {
+      "term": "This term is from the first context"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Marking-a-context-to-not-propagate-expanded.jsonld b/examples/Marking-a-context-to-not-propagate-expanded.jsonld
new file mode 100644
index 00000000..edaa3af1
--- /dev/null
+++ b/examples/Marking-a-context-to-not-propagate-expanded.jsonld
@@ -0,0 +1,9 @@
+[{
+  "http://example.org/original": [{
+    "http://example.org/non-propagated-term": [{
+      "http://example.org/original": [
+        {"@value": "This term is from the first context"}
+      ]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/examples/Marking-a-context-to-not-propagate-statements.table b/examples/Marking-a-context-to-not-propagate-statements.table
new file mode 100644
index 00000000..e0eebf4c
--- /dev/null
+++ b/examples/Marking-a-context-to-not-propagate-statements.table
@@ -0,0 +1,25 @@
+
+
    
   
    
     Subject
     Property
    
+      
+
+
+
+
+      
+        
+
+
+
+
+        
+
+
+
+
+        
+
+
+
+
+      
+    
    SubjectPropertyValue
    _:b2http://example.org/originalThis term is from the first context
    _:b1http://example.org/non-propagated-term_:b2
    _:b0http://example.org/original_:b1
    
diff --git a/examples/Marking-a-context-to-not-propagate-turtle.ttl b/examples/Marking-a-context-to-not-propagate-turtle.ttl
new file mode 100644
index 00000000..b9f7a521
--- /dev/null
+++ b/examples/Marking-a-context-to-not-propagate-turtle.ttl
@@ -0,0 +1,8 @@
+@prefix ex:  .
+[
+  ex:original [
+    ex:non-propagated-term [
+      ex:original "This term is from the first context"
+    ]
+  ]
+] .
\ No newline at end of file
diff --git a/examples/Multiple-array-values-of-different-types-original.jsonld b/examples/Multiple-array-values-of-different-types-compacted.jsonld
similarity index 75%
rename from examples/Multiple-array-values-of-different-types-original.jsonld
rename to examples/Multiple-array-values-of-different-types-compacted.jsonld
index cca5ae0b..31ba8b31 100644
--- a/examples/Multiple-array-values-of-different-types-original.jsonld
+++ b/examples/Multiple-array-values-of-different-types-compacted.jsonld
@@ -1,7 +1,7 @@
 {
-  "@context": {"schema": "http://schema.org/"},
+  "@context": {"ex": "http://example.org/"},
   "@id": "http://example.org/people#michael",
-  "schema:name": [
+  "ex:name": [
     "Michael",
     {"@value": "Mike"},
     {"@value": "Miguel", "@language": "es"},
diff --git a/examples/Multiple-array-values-of-different-types-expanded.jsonld b/examples/Multiple-array-values-of-different-types-expanded.jsonld
index 764c8ce1..7bc5a9db 100644
--- a/examples/Multiple-array-values-of-different-types-expanded.jsonld
+++ b/examples/Multiple-array-values-of-different-types-expanded.jsonld
@@ -1,6 +1,6 @@
 [{
   "@id": "http://example.org/people#michael",
-  "http://schema.org/name": [
+  "http://example.org/name": [
     {"@value": "Michael"},
     {"@value": "Mike"},
     {"@value": "Miguel", "@language": "es"},
diff --git a/examples/Multiple-array-values-of-different-types-statements.table b/examples/Multiple-array-values-of-different-types-statements.table
index 2e9edc51..cde36299 100644
--- a/examples/Multiple-array-values-of-different-types-statements.table
+++ b/examples/Multiple-array-values-of-different-types-statements.table
@@ -10,35 +10,35 @@
   
   
     http://example.org/people#michael
-    schema:name
+    http://example.org/name
     Michael
     
     
   
   
     http://example.org/people#michael
-    schema:name
+    http://example.org/name
     Mike
     
     
   
   
     http://example.org/people#michael
-    schema:name
+    http://example.org/name
     Miguel
     es
     
   
   
     http://example.org/people#michael
-    schema:name
+    http://example.org/name
     https://www.wikidata.org/wiki/Q4927524
     
     
   
   
     http://example.org/people#michael
-    schema:name
+    http://example.org/name
     42
      
     xsd:integer
diff --git a/examples/Multiple-array-values-of-different-types-turtle.ttl b/examples/Multiple-array-values-of-different-types-turtle.ttl
index 33949c1f..a00feb2b 100644
--- a/examples/Multiple-array-values-of-different-types-turtle.ttl
+++ b/examples/Multiple-array-values-of-different-types-turtle.ttl
@@ -1,5 +1,5 @@
-@prefix schema:  .
- schema:name
+@prefix ex:  .
+ ex:name
   "Michael",
   "Mike",
   "Miguel"@es,
diff --git a/examples/Multiple-values-with-no-inherent-order-original.jsonld b/examples/Multiple-values-with-no-inherent-order-compacted.jsonld
similarity index 100%
rename from examples/Multiple-values-with-no-inherent-order-original.jsonld
rename to examples/Multiple-values-with-no-inherent-order-compacted.jsonld
diff --git a/examples/Nested-properties-original.jsonld b/examples/Nested-properties-compacted.jsonld
similarity index 100%
rename from examples/Nested-properties-original.jsonld
rename to examples/Nested-properties-compacted.jsonld
diff --git a/examples/Nested-properties-folded-into-containing-object-original.jsonld b/examples/Nested-properties-folded-into-containing-object-compacted.jsonld
similarity index 100%
rename from examples/Nested-properties-folded-into-containing-object-original.jsonld
rename to examples/Nested-properties-folded-into-containing-object-compacted.jsonld
diff --git a/examples/Overriding-default-language-and-default-base-direction-using-an-expanded-value.jsonld b/examples/Overriding-default-language-and-default-base-direction-using-an-expanded-value.jsonld
new file mode 100644
index 00000000..61c108ef
--- /dev/null
+++ b/examples/Overriding-default-language-and-default-base-direction-using-an-expanded-value.jsonld
@@ -0,0 +1,12 @@
+{
+  "@context": {
+    "@language": "ar-EG",
+    "@direction": "rtl"
+  },
+  "title": "HTML و CSS: تصميم و إنشاء مواقع الويب",
+  "author": {
+    "@value": "Jon Duckett",
+    "@language": "en",
+    "@direction": null
+  }
+}
\ No newline at end of file
diff --git a/examples/Overriding-permitted-if-both-definitions-are-identical-statements.table b/examples/Overriding-permitted-if-both-definitions-are-identical-statements.table
new file mode 100644
index 00000000..a1cd499f
--- /dev/null
+++ b/examples/Overriding-permitted-if-both-definitions-are-identical-statements.table
@@ -0,0 +1,30 @@
+
+
+      
+
+
+
+
+      
+        
+
+
+
+
+        
+
+
+
+
+        
+
+
+
+
+        
+
+
+
+
+      
+    
    SubjectPropertyValue
    https://digitalbazaar.com/rdf:typehttp://example.org/orga/Organization
    https://digitalbazaar.com/http://example.org/orga/memberhttp://manu.sporny.org/about#manu
    http://manu.sporny.org/about#manurdf:typeschema:Person
    http://manu.sporny.org/about#manuschema:nameManu Sporny
    
diff --git a/examples/Prefix-expansion-original.jsonld b/examples/Prefix-expansion-compacted.jsonld
similarity index 100%
rename from examples/Prefix-expansion-original.jsonld
rename to examples/Prefix-expansion-compacted.jsonld
diff --git a/examples/Property-based-data-indexing-compacted.jsonld b/examples/Property-based-data-indexing-compacted.jsonld
new file mode 100644
index 00000000..2c7b13a5
--- /dev/null
+++ b/examples/Property-based-data-indexing-compacted.jsonld
@@ -0,0 +1,26 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "schema": "http://schema.org/",
+    "name": "schema:name",
+    "body": "schema:articleBody",
+    "athletes": {
+      "@id": "schema:athlete",
+      "@container": "@index",
+      "@index": "schema:jobTitle"
+    }
+  },
+  "@id": "http://example.com/",
+  "@type": "schema:SportsTeam",
+  "name": "San Franciso Giants",
+  "athletes": {
+    "Catcher": {
+      "@type": "schema:Person",
+      "name": "Buster Posey"
+    },
+    "Starting Pitcher": {
+      "@type": "schema:Person",
+      "name": "Madison Bumgarner"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Property-based-data-indexing-original.jsonld b/examples/Property-based-data-indexing-original.jsonld
deleted file mode 100644
index cff3d861..00000000
--- a/examples/Property-based-data-indexing-original.jsonld
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "@context": {
-    "@version": 1.1,
-    "schema": "http://schema.org/",
-    "dc11": "http://purl.org/dc/elements/1.1/",
-    "name": "schema:name",
-    "body": "schema:articleBody",
-    "words": "schema:wordCount",
-    "post": {
-      "@id": "schema:blogPost",
-      "@container": "@index",
-      "@index": "dc11:language"
-    }
-  },
-  "@id": "http://example.com/",
-  "@type": "schema:Blog",
-  "name": "World Financial News",
-  "post": {
-    "en": {
-      "@id": "http://example.com/posts/1/en",
-      "body": "World commodities were up today with heavy trading of crude oil...",
-      "words": 1539
-    },
-    "de": {
-      "@id": "http://example.com/posts/1/de",
-      "body": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...",
-      "words": 1204
-    }
-  }
-}
\ No newline at end of file
diff --git a/examples/Referencing-Objects-on-the-Web-original.jsonld b/examples/Referencing-Objects-on-the-Web-compacted.jsonld
similarity index 100%
rename from examples/Referencing-Objects-on-the-Web-original.jsonld
rename to examples/Referencing-Objects-on-the-Web-compacted.jsonld
diff --git a/examples/Referencing-a-Context-in-an-HTML-document-expanded.jsonld b/examples/Referencing-a-Context-in-an-HTML-document-expanded.jsonld
deleted file mode 100644
index 9fabe3e7..00000000
--- a/examples/Referencing-a-Context-in-an-HTML-document-expanded.jsonld
+++ /dev/null
@@ -1,10 +0,0 @@
-[{
-  "@id": "http://dbpedia.org/resource/John_Lennon",
-  "http://xmlns.com/foaf/0.1/name": [{"@value": "John Lennon"}],
-  "http://schema.org/birthDate": [
-    {"@value": "1940-10-09", "@type": "http://www.w3.org/2001/XMLSchema#date"}
-  ],
-  "http://schema.org/spouse": [
-    {"@id": "http://dbpedia.org/resource/Cynthia_Lennon"}
-  ]
-}]
\ No newline at end of file
diff --git a/examples/Referencing-a-Context-in-an-HTML-document-original.jsonld b/examples/Referencing-a-Context-in-an-HTML-document-original.jsonld
deleted file mode 100644
index f67c945f..00000000
--- a/examples/Referencing-a-Context-in-an-HTML-document-original.jsonld
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@context": "https://json-ld.org/contexts/person.html",
-  "@id": "http://dbpedia.org/resource/John_Lennon",
-  "name": "John Lennon",
-  "born": "1940-10-09",
-  "spouse": "http://dbpedia.org/resource/Cynthia_Lennon"
-}
\ No newline at end of file
diff --git a/examples/Referencing-a-Context-in-an-HTML-document-statements.table b/examples/Referencing-a-Context-in-an-HTML-document-statements.table
deleted file mode 100644
index d4586ec6..00000000
--- a/examples/Referencing-a-Context-in-an-HTML-document-statements.table
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-        
-
-
-
-
-
-        
-          
-
-
-
-
-
-          
-
-
-
-
-
-          
-
-
-
-
-
-        
-      
    SubjectPropertyValueValue Type
    http://dbpedia.org/resource/John_Lennonfoaf:nameJohn Lennon 
    http://dbpedia.org/resource/John_Lennonschema:birthDate1940-10-09xsd:date
    http://dbpedia.org/resource/John_Lennonschema:spousehttp://dbpedia.org/resource/Cynthia_Lennon 
    
diff --git a/examples/Referencing-a-Context-in-an-HTML-document-turtle.ttl b/examples/Referencing-a-Context-in-an-HTML-document-turtle.ttl
deleted file mode 100644
index 58774790..00000000
--- a/examples/Referencing-a-Context-in-an-HTML-document-turtle.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix foaf:  .
-@prefix schema:  .
-@prefix xsd:  .
- foaf:name "John Lennon";
-   schema:birthDate "1940-10-09"^^xsd:date;
-   schema:spouse  .
\ No newline at end of file
diff --git a/examples/Referencing-a-JSON-LD-context-original.jsonld b/examples/Referencing-a-JSON-LD-context-compacted.jsonld
similarity index 100%
rename from examples/Referencing-a-JSON-LD-context-original.jsonld
rename to examples/Referencing-a-JSON-LD-context-compacted.jsonld
diff --git a/examples/Referencing-an-unidentified-node-original.jsonld b/examples/Referencing-an-unidentified-node-compacted.jsonld
similarity index 100%
rename from examples/Referencing-an-unidentified-node-original.jsonld
rename to examples/Referencing-an-unidentified-node-compacted.jsonld
diff --git a/examples/Referencing-named-graphs-using-an-id-map-original.jsonld b/examples/Referencing-named-graphs-using-an-id-map-compacted.jsonld
similarity index 82%
rename from examples/Referencing-named-graphs-using-an-id-map-original.jsonld
rename to examples/Referencing-named-graphs-using-an-id-map-compacted.jsonld
index 49023c23..b9363781 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-original.jsonld
+++ b/examples/Referencing-named-graphs-using-an-id-map-compacted.jsonld
@@ -3,7 +3,7 @@
     "@version": 1.1,
     "generatedAt": {
       "@id": "http://www.w3.org/ns/prov#generatedAtTime",
-      "@type": "http://www.w3.org/2001/XMLSchema#date"
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
     },
     "Person": "http://xmlns.com/foaf/0.1/Person",
     "name": "http://xmlns.com/foaf/0.1/name",
@@ -17,15 +17,15 @@
     }
   },
   "@id": "http://example.org/foaf-graph",
-  "generatedAt": "2012-04-09",
+  "generatedAt": "2012-04-09T00:00:00",
   "graphMap": {
-    "http://manu.sporny.org/about#manu": {
+    "http://manu.sporny.org/about": {
       "@id": "http://manu.sporny.org/about#manu",
       "@type": "Person",
       "name": "Manu Sporny",
       "knows": "https://greggkellogg.net/foaf#me"
     },
-    "https://greggkellogg.net/foaf#me": {
+    "https://greggkellogg.net/foaf": {
       "@id": "https://greggkellogg.net/foaf#me",
       "@type": "Person",
       "name": "Gregg Kellogg",
diff --git a/examples/Referencing-named-graphs-using-an-id-map-expanded.jsonld b/examples/Referencing-named-graphs-using-an-id-map-expanded.jsonld
index a128d222..76d811ad 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-expanded.jsonld
+++ b/examples/Referencing-named-graphs-using-an-id-map-expanded.jsonld
@@ -1,8 +1,8 @@
 [{
   "@id": "http://example.org/foaf-graph",
   "http://www.w3.org/ns/prov#generatedAtTime": [{
-    "@value": "2012-04-09",
-    "@type": "http://www.w3.org/2001/XMLSchema#date"
+    "@value": "2012-04-09T00:00:00",
+    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
   }],
   "http://example.org/graphMap": [{
     "@graph": [{
@@ -15,7 +15,7 @@
         {"@value": "Manu Sporny"}
       ]
     }],
-    "@id": "http://manu.sporny.org/about#manu"
+    "@id": "http://manu.sporny.org/about"
   }, {
     "@graph": [{
       "@id": "https://greggkellogg.net/foaf#me",
@@ -27,6 +27,6 @@
         {"@value": "Gregg Kellogg"}
       ]
     }],
-    "@id": "https://greggkellogg.net/foaf#me"
+    "@id": "https://greggkellogg.net/foaf"
   }]
 }]
\ No newline at end of file
diff --git a/examples/Referencing-named-graphs-using-an-id-map-statements.table b/examples/Referencing-named-graphs-using-an-id-map-statements.table
index 4d593191..545319fd 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-statements.table
+++ b/examples/Referencing-named-graphs-using-an-id-map-statements.table
@@ -12,60 +12,60 @@
  
 http://example.org/foaf-graph
 http://example.org/graphMap
-https://greggkellogg.net/foaf#me
+https://greggkellogg.net/foaf
  
 
         
  
 http://example.org/foaf-graph
 http://example.org/graphMap
-http://manu.sporny.org/about#manu
+http://manu.sporny.org/about
  
 
         
  
 http://example.org/foaf-graph
 prov:generatedAtTime
-2012-04-09
-xsd:date
+2012-04-09T00:00:00
+xsd:dateTime
 
         
-https://greggkellogg.net/foaf#me
+https://greggkellogg.net/foaf
 https://greggkellogg.net/foaf#me
 rdf:type
 foaf:Person
  
 
         
-https://greggkellogg.net/foaf#me
+https://greggkellogg.net/foaf
 https://greggkellogg.net/foaf#me
 foaf:name
 Gregg Kellogg
  
 
         
-https://greggkellogg.net/foaf#me
+https://greggkellogg.net/foaf
 https://greggkellogg.net/foaf#me
 foaf:knows
 http://manu.sporny.org/about#manu
  
 
         
-http://manu.sporny.org/about#manu
+http://manu.sporny.org/about
 http://manu.sporny.org/about#manu
 rdf:type
 foaf:Person
  
 
         
-http://manu.sporny.org/about#manu
+http://manu.sporny.org/about
 http://manu.sporny.org/about#manu
 foaf:name
 Manu Sporny
  
 
         
-http://manu.sporny.org/about#manu
+http://manu.sporny.org/about
 http://manu.sporny.org/about#manu
 foaf:knows
 https://greggkellogg.net/foaf#me
diff --git a/examples/Referencing-named-graphs-using-an-id-map-trig.trig b/examples/Referencing-named-graphs-using-an-id-map-trig.trig
index f2d11d87..2f357b82 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-trig.trig
+++ b/examples/Referencing-named-graphs-using-an-id-map-trig.trig
@@ -4,15 +4,15 @@
 @prefix xsd:  .
 
   
-    ,
-    ;
-  prov:generatedAtTime "2012-04-09"^^xsd:date .
- {
+    ,
+    ;
+  prov:generatedAtTime "2012-04-09T00:00:00"^^xsd:dateTime .
+ {
    a foaf:Person;
      foaf:knows ;
      foaf:name "Gregg Kellogg" .
 }
- {
+ {
    a foaf:Person;
      foaf:knows ;
      foaf:name "Manu Sporny" .
diff --git a/examples/Referencing-named-graphs-using-an-id-map-with-none-original.jsonld b/examples/Referencing-named-graphs-using-an-id-map-with-none-compacted.jsonld
similarity index 89%
rename from examples/Referencing-named-graphs-using-an-id-map-with-none-original.jsonld
rename to examples/Referencing-named-graphs-using-an-id-map-with-none-compacted.jsonld
index 2f2bad69..3669e7e8 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-with-none-original.jsonld
+++ b/examples/Referencing-named-graphs-using-an-id-map-with-none-compacted.jsonld
@@ -3,7 +3,7 @@
     "@version": 1.1,
     "generatedAt": {
       "@id": "http://www.w3.org/ns/prov#generatedAtTime",
-      "@type": "http://www.w3.org/2001/XMLSchema#date"
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
     },
     "Person": "http://xmlns.com/foaf/0.1/Person",
     "name": "http://xmlns.com/foaf/0.1/name",
@@ -14,7 +14,7 @@
     }
   },
   "@id": "http://example.org/foaf-graph",
-  "generatedAt": "2012-04-09",
+  "generatedAt": "2012-04-09T00:00:00",
   "graphMap": {
     "@none": [{
       "@id": "http://manu.sporny.org/about#manu",
diff --git a/examples/Referencing-named-graphs-using-an-id-map-with-none-expanded.jsonld b/examples/Referencing-named-graphs-using-an-id-map-with-none-expanded.jsonld
index 3bc8fef0..65012332 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-with-none-expanded.jsonld
+++ b/examples/Referencing-named-graphs-using-an-id-map-with-none-expanded.jsonld
@@ -1,8 +1,8 @@
 [{
   "@id": "http://example.org/foaf-graph",
   "http://www.w3.org/ns/prov#generatedAtTime": [{
-    "@value": "2012-04-09",
-    "@type": "http://www.w3.org/2001/XMLSchema#date"
+    "@value": "2012-04-09T00:00:00",
+    "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
   }],
   "http://example.org/graphMap": [{
     "@graph": [{
diff --git a/examples/Referencing-named-graphs-using-an-id-map-with-none-statements.table b/examples/Referencing-named-graphs-using-an-id-map-with-none-statements.table
index 15719108..c6984762 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-with-none-statements.table
+++ b/examples/Referencing-named-graphs-using-an-id-map-with-none-statements.table
@@ -12,8 +12,8 @@
  
 http://example.org/foaf-graph
 prov:generatedAtTime
-2012-04-09
-xsd:date
+2012-04-09T00:00:00
+xsd:dateTime
 
         
  
diff --git a/examples/Referencing-named-graphs-using-an-id-map-with-none-trig.trig b/examples/Referencing-named-graphs-using-an-id-map-with-none-trig.trig
index 83e24d8c..d7716918 100644
--- a/examples/Referencing-named-graphs-using-an-id-map-with-none-trig.trig
+++ b/examples/Referencing-named-graphs-using-an-id-map-with-none-trig.trig
@@ -3,7 +3,7 @@
 @prefix rdf:  .
 @prefix xsd:  .
   _:b0,  _:b1;
-   prov:generatedAtTime "2012-04-09"^^xsd:date .
+   prov:generatedAtTime "2012-04-09T00:00:00"^^xsd:dateTime .
 _:b0 {
    a foaf:Person;
      foaf:name "Manu Sporny";
diff --git a/examples/Referencing-node-objects-original.jsonld b/examples/Referencing-node-objects-compacted.jsonld
similarity index 100%
rename from examples/Referencing-node-objects-original.jsonld
rename to examples/Referencing-node-objects-compacted.jsonld
diff --git a/examples/Result-of-sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld b/examples/Result-of-sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
new file mode 100644
index 00000000..5b03349d
--- /dev/null
+++ b/examples/Result-of-sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
@@ -0,0 +1,16 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "MyType": {
+      "@id": "http://example.com/vocab#MyType",
+      "@context": {
+        "@version": 1.1,
+        "Type1": "http://example.com/vocab/Type1",
+        "Type2": "http://example.com/vocab/Type2",
+        "term1": "http://example.com/vocab#term1",
+        "term2": "http://example.com/vocab#term2",
+        "@propagate": true
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Result-of-sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld b/examples/Result-of-sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
new file mode 100644
index 00000000..6ecf9b1f
--- /dev/null
+++ b/examples/Result-of-sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "Type1": "http://example.com/vocab/Type1",
+    "Type2": "http://example.com/vocab/Type2",
+    "term1": {
+      "@id": "http://example.org/vocab#term1",
+      "@type": "http://www.w3.org/2001/XMLSchema#integer"
+    },
+    "term2": "http://example.com/vocab#term2",
+    "@vocab": "http://example.org/vocab#"
+  }
+}
\ No newline at end of file
diff --git a/examples/Same-book-description-in-JSON-LD-avoiding-contexts-.jsonld b/examples/Same-book-description-in-JSON-LD-avoiding-contexts-.jsonld
index bf62038f..cfcc147e 100644
--- a/examples/Same-book-description-in-JSON-LD-avoiding-contexts-.jsonld
+++ b/examples/Same-book-description-in-JSON-LD-avoiding-contexts-.jsonld
@@ -2,8 +2,8 @@
   {
     "@id": "http://purl.oreilly.com/works/45U8QJGZSQKDH8N",
     "@type": "http://purl.org/vocab/frbr/core#Work",
-    "http://purl.org/dc/terms/title": "Just a Geek",
-    "http://purl.org/dc/terms/creator": "Wil Wheaton",
+    "http://purl.org/dc/elements/1.1/title": "Just a Geek",
+    "http://purl.org/dc/elements/1.1/creator": "Wil Wheaton",
     "http://purl.org/vocab/frbr/core#realization":
     [
       {"@id": "http://purl.oreilly.com/products/9780596007683.BOOK"},
@@ -12,10 +12,10 @@
   }, {
     "@id": "http://purl.oreilly.com/products/9780596007683.BOOK",
     "@type": "http://purl.org/vocab/frbr/core#Expression",
-    "http://purl.org/dc/terms/type": {"@id": "http://purl.oreilly.com/product-types/BOOK"}
+    "http://purl.org/dc/elements/1.1/type": {"@id": "http://purl.oreilly.com/product-types/BOOK"}
   }, {
     "@id": "http://purl.oreilly.com/products/9780596802189.EBOOK",
     "@type": "http://purl.org/vocab/frbr/core#Expression",
-    "http://purl.org/dc/terms/type": {"@id": "http://purl.oreilly.com/product-types/EBOOK"}
+    "http://purl.org/dc/elements/1.1/type": {"@id": "http://purl.oreilly.com/product-types/EBOOK"}
   }
 ]
\ No newline at end of file
diff --git a/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-compacted.jsonld b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-compacted.jsonld
new file mode 100644
index 00000000..fb809dab
--- /dev/null
+++ b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-compacted.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "title": "http://example.org/title",
+    "publisher": "http://example.org/publisher",
+    "@language": "ar-EG",
+    "@direction": "rtl"
+  },
+  "title": "HTML و CSS: تصميم و إنشاء مواقع الويب",
+  "publisher": "مكتبة"
+}
\ No newline at end of file
diff --git a/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-expanded.jsonld b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-expanded.jsonld
new file mode 100644
index 00000000..0092c7ab
--- /dev/null
+++ b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-expanded.jsonld
@@ -0,0 +1,4 @@
+[{
+  "http://example.org/title": [{"@value": "HTML و CSS: تصميم و إنشاء مواقع الويب", "@language": "ar-eg", "@direction": "rtl"}],
+  "http://example.org/publisher": [{"@value": "مكتبة", "@language": "ar-eg", "@direction": "rtl"}]
+}]
\ No newline at end of file
diff --git a/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-statements.table b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-statements.table
new file mode 100644
index 00000000..a3e58634
--- /dev/null
+++ b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-statements.table
@@ -0,0 +1,26 @@
+
+
+      
+
+
+
+
+
+
+      
+        
+
+
+
+
+
+
+        
+
+
+
+
+
+
+      
+    
    SubjectPropertyValueLanguageDirection
    _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبar-egrtl
    _:b0http://example.org/publisherمكتبةar-egrtl
    
diff --git a/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-turtle.ttl b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-turtle.ttl
new file mode 100644
index 00000000..b590f46e
--- /dev/null
+++ b/examples/Setting-the-default-base-direction-of-a-JSON-LD-document-turtle.ttl
@@ -0,0 +1,6 @@
+@prefix ex:  .
+# Note that this version drops the base direction.
+[
+  ex:title "HTML و CSS: تصميم و إنشاء مواقع الويب"@ar-eg;
+  ex:publisher "مكتبة"@ar-eg
+] .
\ No newline at end of file
diff --git a/examples/Setting-the-default-language-of-a-JSON-LD-document-original.jsonld b/examples/Setting-the-default-language-of-a-JSON-LD-document-compacted.jsonld
similarity index 100%
rename from examples/Setting-the-default-language-of-a-JSON-LD-document-original.jsonld
rename to examples/Setting-the-default-language-of-a-JSON-LD-document-compacted.jsonld
diff --git a/examples/Setting-the-default-language-of-a-JSON-LD-document-statements.table b/examples/Setting-the-default-language-of-a-JSON-LD-document-statements.table
index db22e713..1cc92afe 100644
--- a/examples/Setting-the-default-language-of-a-JSON-LD-document-statements.table
+++ b/examples/Setting-the-default-language-of-a-JSON-LD-document-statements.table
@@ -10,13 +10,13 @@
         
 _:b0
 http://example.org/name
-花澄
+花澄
 ja
 
         
 _:b0
 http://example.org/occupation
-科学者
+科学者
 ja
 
       
diff --git a/examples/Setting-the-document-base-in-a-document-original.jsonld b/examples/Setting-the-document-base-in-a-document-compacted.jsonld
similarity index 100%
rename from examples/Setting-the-document-base-in-a-document-original.jsonld
rename to examples/Setting-the-document-base-in-a-document-compacted.jsonld
diff --git a/examples/Sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld b/examples/Sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
new file mode 100644
index 00000000..c3931ad1
--- /dev/null
+++ b/examples/Sourcing-a-context-in-a-type-scoped-context-and-setting-it-to-propagate.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "MyType": {
+      "@id": "http://example.com/vocab#MyType",
+      "@context": {
+        "@version": 1.1,
+        "@import": "https://json-ld.org/contexts/remote-context.jsonld",
+        "@propagate": true
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld b/examples/Sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
new file mode 100644
index 00000000..699bae11
--- /dev/null
+++ b/examples/Sourcing-a-context-to-modify-vocab-and-a-term-definition.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@import": "https://json-ld.org/contexts/remote-context.jsonld",
+    "@vocab": "http://example.org/vocab#",
+    "term1": {
+      "@id": "http://example.org/vocab#term1",
+      "@type": "http://www.w3.org/2001/XMLSchema#integer"
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/Specifying-a-local-blank-node-identifier-original.jsonld b/examples/Specifying-a-local-blank-node-identifier-compacted.jsonld
similarity index 100%
rename from examples/Specifying-a-local-blank-node-identifier-original.jsonld
rename to examples/Specifying-a-local-blank-node-identifier-compacted.jsonld
diff --git a/examples/Specifying-multiple-types-for-a-node-original.jsonld b/examples/Specifying-multiple-types-for-a-node-compacted.jsonld
similarity index 100%
rename from examples/Specifying-multiple-types-for-a-node-original.jsonld
rename to examples/Specifying-multiple-types-for-a-node-compacted.jsonld
diff --git a/examples/Specifying-that-a-collection-is-ordered-in-the-context-original.jsonld b/examples/Specifying-that-a-collection-is-ordered-in-the-context-compacted.jsonld
similarity index 100%
rename from examples/Specifying-that-a-collection-is-ordered-in-the-context-original.jsonld
rename to examples/Specifying-that-a-collection-is-ordered-in-the-context-compacted.jsonld
diff --git a/examples/Specifying-that-a-collection-is-unordered-in-the-context-original.jsonld b/examples/Specifying-that-a-collection-is-unordered-in-the-context-compacted.jsonld
similarity index 100%
rename from examples/Specifying-that-a-collection-is-unordered-in-the-context-original.jsonld
rename to examples/Specifying-that-a-collection-is-unordered-in-the-context-compacted.jsonld
diff --git a/examples/Specifying-the-type-for-a-node-original.jsonld b/examples/Specifying-the-type-for-a-node-compacted.jsonld
similarity index 100%
rename from examples/Specifying-the-type-for-a-node-original.jsonld
rename to examples/Specifying-the-type-for-a-node-compacted.jsonld
diff --git a/examples/Statements-associated-with-expanded-term-definition-with-language-and-direction.table b/examples/Statements-associated-with-expanded-term-definition-with-language-and-direction.table
new file mode 100644
index 00000000..6c7f6b0f
--- /dev/null
+++ b/examples/Statements-associated-with-expanded-term-definition-with-language-and-direction.table
@@ -0,0 +1,33 @@
+
+
+    
+
+
+
+
+
+
+    
+    
+
+
+
+
+
+
+    
+
+
+
+
+
+
+    
+
+
+
+
+
+
+    
+  
    SubjectPropertyValueLanguageDirection
    _:b0http://example.com/vocab/publisherمكتبةar-eg
    _:b0http://example.com/vocab/titleHTML و CSS: تصميم و إنشاء مواقع الويبar-egrtl
    _:b0http://example.com/vocab/titleHTML and CSS: Design and Build Websitesenltr
    
diff --git a/examples/Targeting-a-specific-script-element-by-id-original.html b/examples/Targeting-a-specific-script-element-by-id-compacted.html
similarity index 100%
rename from examples/Targeting-a-specific-script-element-by-id-original.html
rename to examples/Targeting-a-specific-script-element-by-id-compacted.html
diff --git a/examples/Targeting-a-specific-script-element-by-id-statements.table b/examples/Targeting-a-specific-script-element-by-id-statements.table
index e9c53337..72f64c57 100644
--- a/examples/Targeting-a-specific-script-element-by-id-statements.table
+++ b/examples/Targeting-a-specific-script-element-by-id-statements.table
@@ -1,5 +1,5 @@
 
-
+
    
diff --git a/examples/Term-definitions-using-compact-and-absolute-IRIs-original.jsonld b/examples/Term-definitions-using-compact-and-absolute-IRIs-compacted.jsonld
similarity index 100%
rename from examples/Term-definitions-using-compact-and-absolute-IRIs-original.jsonld
rename to examples/Term-definitions-using-compact-and-absolute-IRIs-compacted.jsonld
diff --git a/examples/Terms-not-expanded-when-document-relative-original.jsonld b/examples/Term-expansion-for-values-not-identifiers-compacted.jsonld
similarity index 72%
rename from examples/Terms-not-expanded-when-document-relative-original.jsonld
rename to examples/Term-expansion-for-values-not-identifiers-compacted.jsonld
index 5ff3deb4..535df253 100644
--- a/examples/Terms-not-expanded-when-document-relative-original.jsonld
+++ b/examples/Term-expansion-for-values-not-identifiers-compacted.jsonld
@@ -2,9 +2,10 @@
   "@context": {
     "@base": "http://example1.com/",
     "@vocab": "http://example2.com/",
-    "fred": {"@type": "@id"}
+    "knows": {"@type": "@vocab"}
   },
-  "fred": [
+  "@id": "fred",
+  "knows": [
     {"@id": "barney", "mnemonic": "the sidekick"},
     "barney"
   ]
diff --git a/examples/Term-expansion-for-values-not-identifiers-expanded.jsonld b/examples/Term-expansion-for-values-not-identifiers-expanded.jsonld
index 51d8ae3f..27b79f47 100644
--- a/examples/Term-expansion-for-values-not-identifiers-expanded.jsonld
+++ b/examples/Term-expansion-for-values-not-identifiers-expanded.jsonld
@@ -1,11 +1,9 @@
 [{
-  "http://example2.com/fred": [
-    {
-      "@id": "http://example1.com/barney",
-      "http://example2.com/mnemonic": [{"@value": "the sidekick"}]
-    },
-    {
-      "@id": "http://example2.com/barney"
-    }
-  ]
+  "@id": "http://example1.com/fred",
+  "http://example2.com/knows": [{
+    "@id": "http://example1.com/barney",
+    "http://example2.com/mnemonic": [{"@value": "the sidekick"}]
+  }, {
+    "@id": "http://example2.com/barney"
+  }]
 }]
\ No newline at end of file
diff --git a/examples/Term-expansion-for-values-not-identifiers-statements.table b/examples/Term-expansion-for-values-not-identifiers-statements.table
index 21efa626..da1650dd 100644
--- a/examples/Term-expansion-for-values-not-identifiers-statements.table
+++ b/examples/Term-expansion-for-values-not-identifiers-statements.table
@@ -12,13 +12,13 @@
 
-
-
+
+
-
-
+
+
diff --git a/examples/Term-expansion-for-values-not-identifiers-turtle.ttl b/examples/Term-expansion-for-values-not-identifiers-turtle.ttl
index abf5bdea..01cc3550 100644
--- a/examples/Term-expansion-for-values-not-identifiers-turtle.ttl
+++ b/examples/Term-expansion-for-values-not-identifiers-turtle.ttl
@@ -2,4 +2,4 @@
 @prefix ex1:  .
 @prefix ex2:  .
 ex1:barney ex2:mnemonic "the sidekick" .
-[ ex2:fred ex2:barney, ex1:barney] .
\ No newline at end of file
+ex1:fred ex2:knows ex1:barney, ex2:barney .
\ No newline at end of file
diff --git a/examples/Term-expansion-from-context-definition-original.jsonld b/examples/Term-expansion-from-context-definition-compacted.jsonld
similarity index 100%
rename from examples/Term-expansion-from-context-definition-original.jsonld
rename to examples/Term-expansion-from-context-definition-compacted.jsonld
diff --git a/examples/Term-expansion-for-values-not-identifiers-original.jsonld b/examples/Terms-not-expanded-when-document-relative-compacted.jsonld
similarity index 73%
rename from examples/Term-expansion-for-values-not-identifiers-original.jsonld
rename to examples/Terms-not-expanded-when-document-relative-compacted.jsonld
index 474b14ca..4b147ddf 100644
--- a/examples/Term-expansion-for-values-not-identifiers-original.jsonld
+++ b/examples/Terms-not-expanded-when-document-relative-compacted.jsonld
@@ -2,9 +2,10 @@
   "@context": {
     "@base": "http://example1.com/",
     "@vocab": "http://example2.com/",
-    "fred": {"@type": "@vocab"}
+    "knows": {"@type": "@id"}
   },
-  "fred": [
+  "@id": "fred",
+  "knows": [
     {"@id": "barney", "mnemonic": "the sidekick"},
     "barney"
   ]
diff --git a/examples/Terms-not-expanded-when-document-relative-expanded.jsonld b/examples/Terms-not-expanded-when-document-relative-expanded.jsonld
index 8c1d79cc..8b923b0f 100644
--- a/examples/Terms-not-expanded-when-document-relative-expanded.jsonld
+++ b/examples/Terms-not-expanded-when-document-relative-expanded.jsonld
@@ -1,11 +1,9 @@
 [{
-  "http://example2.com/fred": [
-    {
-      "@id": "http://example1.com/barney",
-      "http://example2.com/mnemonic": [{"@value": "the sidekick"}]
-    },
-    {
-      "@id": "http://example1.com/barney"
-    }
-  ]
+  "@id": "http://example1.com/fred",
+  "http://example2.com/knows": [{
+    "@id": "http://example1.com/barney",
+    "http://example2.com/mnemonic": [{"@value": "the sidekick"}]
+  }, {
+    "@id": "http://example1.com/barney"
+  }]
 }]
\ No newline at end of file
diff --git a/examples/Terms-not-expanded-when-document-relative-turtle.ttl b/examples/Terms-not-expanded-when-document-relative-turtle.ttl
index 8556f62e..ebfc86b8 100644
--- a/examples/Terms-not-expanded-when-document-relative-turtle.ttl
+++ b/examples/Terms-not-expanded-when-document-relative-turtle.ttl
@@ -2,4 +2,4 @@
 @prefix ex1:  .
 @prefix ex2:  .
 ex1:barney ex2:mnemonic "the sidekick" .
-[] ex2:fred ex1:barney, ex1:barney.
\ No newline at end of file
+ex1:fred ex2:knows ex1:barney, ex1:barney .
\ No newline at end of file
diff --git a/examples/Type-coercion-original.jsonld b/examples/Type-coercion-compacted.jsonld
similarity index 100%
rename from examples/Type-coercion-original.jsonld
rename to examples/Type-coercion-compacted.jsonld
diff --git a/examples/Using-a-default-vocabulary-original.jsonld b/examples/Using-a-default-vocabulary-compacted.jsonld
similarity index 100%
rename from examples/Using-a-default-vocabulary-original.jsonld
rename to examples/Using-a-default-vocabulary-compacted.jsonld
diff --git a/examples/Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-original.jsonld b/examples/Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-compacted.jsonld
similarity index 100%
rename from examples/Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-original.jsonld
rename to examples/Using-a-default-vocabulary-relative-to-a-previous-default-vocabulary-compacted.jsonld
diff --git a/examples/Using-a-term-to-specify-the-type-original.jsonld b/examples/Using-a-term-to-specify-the-type-compacted.jsonld
similarity index 100%
rename from examples/Using-a-term-to-specify-the-type-original.jsonld
rename to examples/Using-a-term-to-specify-the-type-compacted.jsonld
diff --git a/examples/Using-an-expanded-form-to-set-multiple-values-original.jsonld b/examples/Using-an-expanded-form-to-set-multiple-values-compacted.jsonld
similarity index 100%
rename from examples/Using-an-expanded-form-to-set-multiple-values-original.jsonld
rename to examples/Using-an-expanded-form-to-set-multiple-values-compacted.jsonld
diff --git a/examples/Using-an-expanded-form-to-set-multiple-values-statements.table b/examples/Using-an-expanded-form-to-set-multiple-values-statements.table
index c0ef7dbc..bb814a9c 100644
--- a/examples/Using-an-expanded-form-to-set-multiple-values-statements.table
+++ b/examples/Using-an-expanded-form-to-set-multiple-values-statements.table
@@ -10,7 +10,7 @@
   
-    
+    
diff --git a/examples/Using-as-the-vocabulary-mapping-expanded-statements.table b/examples/Using-as-the-vocabulary-mapping-expanded-statements.table
index 835492dd..833703e3 100644
--- a/examples/Using-as-the-vocabulary-mapping-expanded-statements.table
+++ b/examples/Using-as-the-vocabulary-mapping-expanded-statements.table
@@ -1,20 +1,20 @@
 
-
    
       
    
 Subject
 Propertythe sidekick
 
    
       
    _:b0http://example2.com/fredhttp://example1.com/fredhttp://example2.com/knows
 http://example1.com/barney
 
    
       
    _:b0http://example2.com/fredhttp://example1.com/fredhttp://example2.com/knows
 http://example2.com/barney
 
    
     
    
     http://example.org/articles/8
     dcterms:titleDas KapitalDas Kapital
     de
   
    
   
    
-      
+
    
+    
-      
-        
+    
+      
-        
+      
-      
-    
    
 Subject
 Property
 Value
 
    
 http://example.org/places#BrewEats
 rdf:type
 http://example/document#Restaurant
 
    
 http://example.org/places#BrewEats
 http://example/document#name
 Brew Eats
 
    
+    
+  
diff --git a/examples/Using-graph-to-explicitly-express-the-default-graph-original.jsonld b/examples/Using-graph-to-explicitly-express-the-default-graph-compacted.jsonld
similarity index 100%
rename from examples/Using-graph-to-explicitly-express-the-default-graph-original.jsonld
rename to examples/Using-graph-to-explicitly-express-the-default-graph-compacted.jsonld
diff --git a/examples/Using-multiple-contexts-original.jsonld b/examples/Using-multiple-contexts-compacted.jsonld
similarity index 100%
rename from examples/Using-multiple-contexts-original.jsonld
rename to examples/Using-multiple-contexts-compacted.jsonld
diff --git a/examples/Using-reverse-to-define-reverse-properties-original.jsonld b/examples/Using-reverse-to-define-reverse-properties-compacted.jsonld
similarity index 100%
rename from examples/Using-reverse-to-define-reverse-properties-original.jsonld
rename to examples/Using-reverse-to-define-reverse-properties-compacted.jsonld
diff --git a/examples/Using-the-document-base-URL-to-establish-the-default-base-IRI-original.html b/examples/Using-the-document-base-URL-to-establish-the-default-base-IRI-compacted.html
similarity index 100%
rename from examples/Using-the-document-base-URL-to-establish-the-default-base-IRI-original.html
rename to examples/Using-the-document-base-URL-to-establish-the-default-base-IRI-compacted.html
diff --git a/examples/Using-the-null-keyword-to-ignore-data-original.jsonld b/examples/Using-the-null-keyword-to-ignore-data-compacted.jsonld
similarity index 100%
rename from examples/Using-the-null-keyword-to-ignore-data-original.jsonld
rename to examples/Using-the-null-keyword-to-ignore-data-compacted.jsonld
diff --git a/examples/Using-vocabularies-original.jsonld b/examples/Using-vocabularies-compacted.jsonld
similarity index 100%
rename from examples/Using-vocabularies-original.jsonld
rename to examples/Using-vocabularies-compacted.jsonld
diff --git a/examples/overriding-permitted-in-property-scoped-context-original.jsonld b/examples/overriding-permitted-in-property-scoped-context-compacted.jsonld
similarity index 89%
rename from examples/overriding-permitted-in-property-scoped-context-original.jsonld
rename to examples/overriding-permitted-in-property-scoped-context-compacted.jsonld
index 6619da61..28879bcf 100644
--- a/examples/overriding-permitted-in-property-scoped-context-original.jsonld
+++ b/examples/overriding-permitted-in-property-scoped-context-compacted.jsonld
@@ -26,9 +26,7 @@
   "@type": "Organization",
   "name": "Digital Bazaar",
   "employee" : {
-    "name": "Sporny"
-  },
-  "location": {
-    "name": "Blacksburg, Virginia"
+    "name": "Sporny",
+    "location": {"name": "Blacksburg, Virginia"}
   }
 }
\ No newline at end of file
diff --git a/examples/overriding-permitted-in-property-scoped-context-statements.table b/examples/overriding-permitted-in-property-scoped-context-statements.table
index 36dbe2c0..9480784b 100644
--- a/examples/overriding-permitted-in-property-scoped-context-statements.table
+++ b/examples/overriding-permitted-in-property-scoped-context-statements.table
@@ -27,7 +27,7 @@
 Sporny
 
         
-_:b0
+_:b1
 foaf:based_near
 _:b2
 
diff --git a/examples/overriding-permitted-in-property-scoped-context-turtle.ttl b/examples/overriding-permitted-in-property-scoped-context-turtle.ttl
index e3ffd968..1e90fcba 100644
--- a/examples/overriding-permitted-in-property-scoped-context-turtle.ttl
+++ b/examples/overriding-permitted-in-property-scoped-context-turtle.ttl
@@ -4,9 +4,9 @@
   a schema:Organization;
   schema:name "Digital Bazaar";
   schema:employee [
-    schema:familyName "Sporny"
-  ];
-  foaf:based_near [
-    foaf:name "Blacksburg, Virginia"
+    schema:familyName "Sporny";
+    foaf:based_near [
+      foaf:name "Blacksburg, Virginia"
+    ];
   ];
 ] .
\ No newline at end of file
diff --git a/index.html b/index.html
index e6f04400..5bf80f5b 100644
--- a/index.html
+++ b/index.html
@@ -5203,18 +5203,19 @@ 
    Using the Document Base for the Default Vocabulary
    
          data-result-for="Setting the default base direction of a JSON-LD document-compacted">
     
     
    
     
-        
-        
+        
+        
    
       
    SubjectPropertyValueLanguageDirection
    
       
    _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبar-EGrtl
    _:b0http://example.org/publisherمكتبةar-EGrtl
    _:b0http://example.org/titleHTML و CSS: تصميم و إنشاء مواقع الويبar-egrtl
    _:b0http://example.org/publisherمكتبةar-egrtl
    
           
     
    
     
    Using the Document Base for the Default Vocabulary
 
     # Note that this version drops the base direction.
     [
-      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"****@ar-EG;
-      ex:publisher ****"مكتبة"****@ar-EG
+      ex:title ****"HTML و CSS: تصميم و إنشاء مواقع الويب"****@ar-eg;
+      ex:publisher ****"مكتبة"****@ar-eg
     ] .
     -->
     
    
@@ -5236,7 +5237,7 @@ 
    Using the Document Base for the Default Vocabulary
    
          data-content-type="text/turtle"
          data-result-for="Setting the default base direction of a JSON-LD document-expanded"
          data-transform="updateExample"
-         data-options="rdfDirection=datatype"
+         data-options="rdfDirection=i18n-datatype"
          data-to-rdf>
     
     
    
@@ -5253,7 +5254,7 @@ 
    Using the Document Base for the Default Vocabulary
    
          data-content-type="text/turtle"
          data-result-for="Setting the default base direction of a JSON-LD document-expanded"
          data-transform="updateExample"
-         data-options="rdfDirection=bnode"
+         data-options="rdfDirection=compound-literal"
          data-to-rdf>