--- a/spec/latest/json-ld-api/index.html Tue Feb 12 15:32:34 2013 +0100
+++ b/spec/latest/json-ld-api/index.html Tue Feb 12 19:04:34 2013 +0100
@@ -1454,10 +1454,8 @@
<em>typeLanguageValue</em> to the value of the <code>@language</code>
member of <em>value</em>. If <em>value</em> has no <code>@index</code>
member, set <em>container</em> to <code>@language</code></li>
- <li>Otherwise, if the value of <em>value's</em> <code>@value</code>
- member is is a <tref>string</tref>, set <em>typeOrLanguage</em> to
- <code>@language</code> and <em>typeLanguageValue</em> to
- <code>@null</code>.</li>
+ <li>Otherwise, set <em>typeOrLanguage</em> to <code>@language</code> and
+ <em>typeLanguageValue</em> to <code>@null</code>.</li>
</ol>
</li>
<li>Otherwise, if <em>value</em> has an <code>@list</code> member,
--- a/test-suite/tests/compact-0048-context.jsonld Tue Feb 12 15:32:34 2013 +0100
+++ b/test-suite/tests/compact-0048-context.jsonld Tue Feb 12 19:04:34 2013 +0100
@@ -1,10 +1,11 @@
{
- "@context": {
- "@language": "de",
- "propertyLanguageNull": {
- "@id": "http://example.com/property",
- "@language": null
- },
- "propertyNoLang": "http://example.com/property"
- }
+ "@context": {
+ "@language": "de",
+ "propertyLanguageNull": {
+ "@id": "http://example.com/propertyA",
+ "@language": null
+ },
+ "propertyNoLang": "http://example.com/propertyA",
+ "propertyB": "http://example.com/propertyB"
+ }
}
--- a/test-suite/tests/compact-0048-in.jsonld Tue Feb 12 15:32:34 2013 +0100
+++ b/test-suite/tests/compact-0048-in.jsonld Tue Feb 12 19:04:34 2013 +0100
@@ -1,3 +1,4 @@
{
- "http://example.com/property": 5
+ "http://example.com/propertyA": 5,
+ "http://example.com/propertyB": 5
}
--- a/test-suite/tests/compact-0048-out.jsonld Tue Feb 12 15:32:34 2013 +0100
+++ b/test-suite/tests/compact-0048-out.jsonld Tue Feb 12 19:04:34 2013 +0100
@@ -2,10 +2,12 @@
"@context": {
"@language": "de",
"propertyLanguageNull": {
- "@id": "http://example.com/property",
+ "@id": "http://example.com/propertyA",
"@language": null
},
- "propertyNoLang": "http://example.com/property"
+ "propertyNoLang": "http://example.com/propertyA",
+ "propertyB": "http://example.com/propertyB"
},
- "propertyNoLang": 5
+ "propertyLanguageNull": 5,
+ "propertyB": 5
}
--- a/test-suite/tests/compact-manifest.jsonld Tue Feb 12 15:32:34 2013 +0100
+++ b/test-suite/tests/compact-manifest.jsonld Tue Feb 12 19:04:34 2013 +0100
@@ -290,7 +290,7 @@
"expect": "compact-0047-out.jsonld"
}, {
"@type": ["test:TestCase", "jld:CompactTest"],
- "name": "Distinguish between no language mapping a mapping to null",
+ "name": "Prefer terms with a language mapping set to null over terms without language-mapping for non-strings",
"input": "compact-0048-in.jsonld",
"context": "compact-0048-context.jsonld",
"expect": "compact-0048-out.jsonld"