Skip to content

Azaroth suggestions #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Sep 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d7e29d5
"This specification defines JSON-LD" => "This specification defines J…
gkellogg Sep 23, 2019
10c0dd5
Remove "if desired"
gkellogg Sep 23, 2019
d33b8ab
Improve _default language_ definition.
gkellogg Sep 23, 2019
7eb6097
it's => its fixes.
gkellogg Sep 23, 2019
e710ab9
ore => or.
gkellogg Sep 23, 2019
e420430
Simplify simplicity.
gkellogg Sep 23, 2019
3202b31
Improve data model overview.
gkellogg Sep 23, 2019
e91acf2
Clarify that literals are not blank nodes.
gkellogg Sep 23, 2019
11bb148
Improve definition of `@nest`.
gkellogg Sep 23, 2019
a8a11f9
Update `@none` definition.
gkellogg Sep 23, 2019
51f7e58
sccope => scope.
gkellogg Sep 23, 2019
1c672da
Clarify that `@version` is set to `1.1`, not `"json-ld-1.1"`.
gkellogg Sep 23, 2019
ecfe226
Improve requirements of terms.
gkellogg Sep 23, 2019
f4f25bc
Reference security considerations for remote contexts.
gkellogg Sep 23, 2019
6ce672a
Update local dfns to not be links by removing data-cite.
gkellogg Sep 24, 2019
fb92d4b
Add a missing description of list objects and set objects.
gkellogg Sep 24, 2019
f855a41
Fix wording of nested properties.
gkellogg Sep 24, 2019
a92d5fe
Add forward references for other things that affect the context in se…
gkellogg Sep 24, 2019
61c818d
Better describe example 25.
gkellogg Sep 24, 2019
00de271
Move subsection on using the document base for the default vocabulary…
gkellogg Sep 24, 2019
70aa073
Fix grammar in Scoped Contexts section.
gkellogg Sep 24, 2019
23318b7
Split example 46 into separate examples.
gkellogg Sep 24, 2019
693b076
Re-defined => Redefined.
gkellogg Sep 24, 2019
8a0c2ca
limits => limit.
gkellogg Sep 24, 2019
d60961c
Fix grammar in Imported Contexts section.
gkellogg Sep 24, 2019
71c402b
effect => affect.
gkellogg Sep 24, 2019
4b7fab0
Further clarify that type coercion takes place only on strings, not m…
gkellogg Sep 24, 2019
fe99d40
Make examples clearer.
gkellogg Sep 24, 2019
16250c9
Remove old warning in note about redefining IRIs to have a different …
gkellogg Sep 24, 2019
d528735
Use a scoped, rather than an embedded context for default language ex…
gkellogg Sep 24, 2019
25d2011
Note that indexing of language tags depends on their not using sub-ta…
gkellogg Sep 24, 2019
d027967
Remove uninformative note on type coercion from 4.5.
gkellogg Sep 24, 2019
09dcd19
Fix examples.
gkellogg Sep 24, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/ruby-rdf/json-ld.git
revision: 172e0c960c9771fa9f963eca55d28fb63bce56b0
revision: adbd407fa4b5783c8a7f7b79653b6e38815ff854
branch: develop
specs:
json-ld (3.0.2)
Expand All @@ -14,8 +14,8 @@ GIT
GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
bcp47 (0.3.3)
i18n
builder (3.2.3)
Expand All @@ -28,7 +28,7 @@ GEM
sxp (~> 1.0)
equivalent-xml (0.6.0)
nokogiri (>= 1.4.3)
haml (5.1.1)
haml (5.1.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
Expand All @@ -37,7 +37,7 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
json-canonicalization (0.1.0)
json-ld-preloaded (3.0.3)
json-ld-preloaded (3.0.4)
json-ld (~> 3.0)
multi_json (~> 1.12)
rdf (~> 3.0)
Expand Down Expand Up @@ -77,11 +77,11 @@ GEM
multi_json (1.13.1)
net-http-persistent (3.1.0)
connection_pool (~> 2.2)
nokogiri (1.10.3)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0)
nokogiri
public_suffix (3.1.1)
public_suffix (4.0.1)
rack (2.0.7)
rake (12.3.3)
rdf (3.0.12)
Expand Down Expand Up @@ -135,7 +135,7 @@ GEM
rdf-turtle (3.0.6)
ebnf (~> 1.1)
rdf (~> 3.0)
rdf-vocab (3.0.8)
rdf-vocab (3.0.10)
rdf (~> 3.0, >= 3.0.11)
rdf-xsd (3.0.1)
rdf (~> 3.0)
Expand All @@ -160,8 +160,8 @@ GEM
rdf (~> 3.0)
sxp (1.0.2)
rdf (~> 3.0)
temple (0.8.1)
tilt (2.0.9)
temple (0.8.2)
tilt (2.0.10)

PLATFORMS
ruby
Expand Down
21 changes: 15 additions & 6 deletions common/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,23 @@ function restrictReferences(utils, content) {
return (base.innerHTML);
}

// add a handler to come in after all the definitions are resolved
//
// New logic: If the reference is within a 'dl' element of
// class 'termlist', and if the target of that reference is
// also within a 'dl' element of class 'termlist', then
// consider it an internal reference and ignore it.
require(["core/pubsubhub"], (respecEvents) => {
"use strict";

// remote data-cite on where the citation is to ourselves.
respecEvents.sub('end', (message) => {
const selfDfns = document.querySelectorAll("dfn[data-cite^='" + respecConfig.shortName.toUpperCase() + "']");
for (const dfn of selfDfns) {
delete dfn.dataset.cite;
}
});

// add a handler to come in after all the definitions are resolved
//
// New logic: If the reference is within a 'dl' element of
// class 'termlist', and if the target of that reference is
// also within a 'dl' element of class 'termlist', then
// consider it an internal reference and ignore it.
respecEvents.sub('end', (message) => {
if (message === 'core/link-to-dfn') {
// all definitions are linked; find any internal references
Expand Down
9 changes: 5 additions & 4 deletions common/terms.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@
A set of rules for interpreting a <a>JSON-LD document</a>
as specified in the <a data-cite="JSON-LD11#the-context">The Context</a> section of JSON-LD 1.1.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-default-language">default language</dfn></dt><dd>
The default language is set in the <a>context</a> using the <code>@language</code> key
The <a>default language</a> is the language used when a string does not have a language associated with it directly.
It can be set in the <a>context</a> using the <code>@language</code> key
whose value MUST be a <a>string</a> representing a [[BCP47]] language code or <code>null</code>.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-default-object">default object</dfn></dt><dd>
A <a>default object</a> is a <a>map</a> that has a <code>@default</code> key.</dd>
Expand Down Expand Up @@ -223,14 +224,14 @@
and its keys are interpreted as <a>IRIs</a> representing
the <code>@id</code> of the associated <a>node object</a>.
If a value in the <a>id map</a> contains a key expanding to <code>@id</code>,
it's value MUST be equivalent to the referencing key in the <a>id map</a>.</dd>
its value MUST be equivalent to the referencing key in the <a>id map</a>.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-implicitly-named-graph">implicitly named graph</dfn></dt><dd>
A <a>named graph</a> created from the value of a <a>map entry</a>
having an <a>expanded term definition</a>
where <code>@container</code> is set to <code>@graph</code>.</dd>
<dt class="changed"><dfn data-cite="JSON-LD11#dfn-included-block">included block</dfn></dt><dd class="changed">
An <a>included block</a> is an <a>entry</a> in a <a>node object</a> where the key is either `@included` or an alias of `@included`
and the value is one ore more <a>node objects</a>.</dd>
and the value is one or more <a>node objects</a>.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-index-map">index map</dfn></dt><dd>
An <a>index map</a> is a <a>map</a> value of a <a>term</a>
defined with <code>@container</code> set to <code>@index</code>,
Expand Down Expand Up @@ -344,7 +345,7 @@
representing the <code>@type</code> of the associated <a>node object</a>;
the value MUST be a <a>node object</a>, or <a>array</a> of node objects.
If the value contains a <a>term</a> expanding to <code>@type</code>,
it's values are merged with the map value when expanding.</dd>
its values are merged with the map value when expanding.</dd>
<dt><dfn data-cite="JSON-LD11#dfn-typed-value" class="preserve">typed value</dfn></dt><dd>
A <a>typed value</a> consists of a value,
which is a <a>string</a>,
Expand Down
Loading