diff --git a/spec/latest/common/typographical-conventions.html b/spec/latest/common/typographical-conventions.html index 73b306e0e..989c5ace7 100644 --- a/spec/latest/common/typographical-conventions.html +++ b/spec/latest/common/typographical-conventions.html @@ -19,6 +19,8 @@
A hyperlink is underlined and in blue.
[reference]
A document reference (normative or informative) is enclosed in square brackets and links to the references section.
+
Changes from Recommendation
+
Sections or phrases changed from the previous Recommendation are highlighted.

Notes are in light green boxes with a green left border and with a "Note" header in green. Notes are normative or informative depending on the whether they are in a normative or informative section, respectively.

diff --git a/spec/latest/json-ld-api/index.html b/spec/latest/json-ld-api/index.html index 400d46d63..842a6f84b 100644 --- a/spec/latest/json-ld-api/index.html +++ b/spec/latest/json-ld-api/index.html @@ -70,7 +70,7 @@ ], bugTracker: { - open: "https://github.com/json-ld/json-ld.org/issues?q=is%3Aopen+is%3Aissue+label%3A1.1+label%3Aapi", + open: "https://github.com/json-ld/json-ld.org/issues?utf8=✓&q=is%3Aissue%20label%3Aapi%20is%3Aopen%20milestone%3A%22JSON-LD%201.1%22%20", new: "https://github.com/json-ld/json-ld.org/issues/new" }, @@ -127,6 +127,13 @@ counter-increment: numsection; content: counters(numsection, ".") ") "; } + .changed { + background-color: rgb(215, 238, 197); + } + .changed:hover { + color: green; + background-color: inherit; + } @@ -577,8 +584,9 @@

RDF Serialization/Deserialization

A conforming JSON-LD Processor is a system which can perform the Expansion, Compaction, - and Flattening operations in a manner consistent with - the algorithms defined in this specification.

+ and Flattening operations + in a manner consistent with + the algorithms defined in this specification.

JSON-LD Processors MUST NOT attempt to correct malformed IRIs or language tags; @@ -621,7 +629,8 @@

Context Processing Algorithm

term definition consists of an IRI mapping, a boolean flag reverse property, an optional type mapping or language mapping, - an optional context, and an optional container mapping. + an optional context, + and an optional container mapping. A term definition can not only be used to map a term to an IRI, but also to map a term to a keyword, in which case it is referred to as a keyword alias.

@@ -985,7 +994,7 @@

Algorithm

container. -
  • If value contains the key @context: +
  • If value contains the key @context:
    1. Initialize context to the value associated with the @context key, which is treated as a local context.
      2. @@ -1205,7 +1214,7 @@

      Algorithm

      To begin, the active property is set to null, and element is set to the JSON-LD input.

      -

      The algorithm also performs processing steps specific to expanding +

      The algorithm also performs processing steps specific to expanding a JSON-LD Frame. For a frame, the @id and @type properties can accept an array of IRIs or an empty dictionary. The properties of a value object can also @@ -1288,12 +1297,13 @@

      Algorithm

      IRI Expansion algorithm, passing active context, value, and true for document relative. - When the frame expansion flag is set, value - may be an empty dictionary, or an array of one - or more strings. Expanded value will be - an array of one or more of these, with string - values expanded using the IRI Expansion Algorithm. + + When the frame expansion flag is set, value + may be an empty dictionary, or an array of one + or more strings. Expanded value will be + an array of one or more of these, with string + values expanded using the IRI Expansion Algorithm.
    2. If expanded property is @type and value is neither a string nor an array of strings, an @@ -1304,13 +1314,15 @@

      Algorithm

      active context, true for vocab, and true for document relative to expand the value or each of its items. - When the frame expansion flag is set, value - may also be an empty dictionary.
      3. + + When the frame expansion flag is set, value + may also be an empty dictionary.
    3. If expanded property is @graph, set expanded value to the result of using this algorithm recursively passing active context, @graph for active property, and value for element, - ensuring that expanded value is an array of one or more dictionaries.
      4. + + ensuring that expanded value is an array of one or more dictionaries.
    4. If expanded property is @value and value is not a scalar or null, an invalid value object value @@ -1321,19 +1333,21 @@

      Algorithm

      next key from element. Null values need to be preserved in this case as the meaning of an @type member depends on the existence of an @value member. - When the frame expansion flag is set, value - may also be an empty dictionary or an array of - scalar values. Expanded value will be null, or an - array of one or more scalar values.
      5. + + When the frame expansion flag is set, value + may also be an empty dictionary or an array of + scalar values. Expanded value will be null, or an + array of one or more scalar values.
    5. If expanded property is @language and value is not a string, an invalid language-tagged string - error has been detected and processing is aborted. Otherwise, - set expanded value to lowercased value. - When the frame expansion flag is set, value - may also be an empty dictionary or an array of zero or - strings. Expanded value will be an - array of one or more string values converted to lower case.
      6. + error has been detected and processing is aborted. + + Otherwise, set expanded value to lowercased value. + When the frame expansion flag is set, value + may also be an empty dictionary or an array of zero or + strings. Expanded value will be an + array of one or more string values converted to lower case.
    6. If expanded property is @index and value is not a string, an invalid @index value @@ -1403,7 +1417,7 @@

      Algorithm

    7. Continue with the next key from element.
    • -
  • When the frame expansion flag is set, +
  • When the frame expansion flag is set, if expanded property is any other framing keyword (@explicit, @default, @embed, @explicit, @omitDefault, or @@ -1418,14 +1432,14 @@

    Algorithm

  • Continue with the next key from element.
    • -
  • If key's term definition in active context +
  • If key's term definition in active context has a local context, set term context to the result of the Context Processing algorithm, passing active context and the value of the key's local context as local context. Otherwise, set term context to active context.
  • If key's container mapping in - term context is @language and + term context is @language and value is a JSON object then value is expanded from a language map as follows: @@ -1456,7 +1470,7 @@

    Algorithm

  • Otherwise, if key's container mapping in - term context is @index and + term context is @index and value is a JSON object then value is expanded from an index map as follows:
      @@ -1470,7 +1484,7 @@

      Algorithm

      index value.
    1. Initialize index value to the result of using this algorithm recursively, passing - term context as active context, + term context as active context, key as active property, and index value as element.
    2. For each item in index value: @@ -1487,13 +1501,13 @@

      Algorithm

  • Otherwise, initialize expanded value to the result of - using this algorithm recursively, passing term context as active context, + using this algorithm recursively, passing term context as active context, key for active property, and value for element.
  • If expanded value is null, ignore key by continuing to the next key from element.
  • If the container mapping associated to key in - term context is @list and + term context is @list and expanded value is not already a list object, convert expanded value to a list object by first setting it to an array containing only @@ -1750,7 +1764,7 @@

    Algorithm

    is set to true.

      -
    1. If the term definition for active property has a +
    2. If the term definition for active property has a local context:
      1. Set active context to the result of the @@ -2960,7 +2974,7 @@

        Algorithm

        -
        +

        Merge Node Maps

        This algorithm creates a new map of subjects to nodes using all graphs contained in the graph map created using the Node Map Generation algorithm @@ -3410,8 +3424,9 @@

        Algorithm

      2. While property equals rdf:rest, the array value of the member of node usages map associated with the @id member of node has only one member, - the value associated to the usages member of node has - exactly 1 entry, + + the value associated to the usages member of node has + exactly 1 entry, node has a rdf:first and rdf:rest property, both of which have as value an array consisting of a single element, and node has no other members apart from an optional @type @@ -4131,8 +4146,8 @@

        JsonLdErrorCode

        invalid reverse property value
        An invalid value for a reverse property has been detected. The value of an inverse property must be a node object.
        -
        invalid scoped context
        -
        The local context defined within a term definition is invalid.
        +
        invalid scoped context
        +
        The local context defined within a term definition is invalid.
        invalid set or list object
        A set object or list object with disallowed members has been detected.
        @@ -4181,37 +4196,40 @@

        JsonLdErrorCode

        Changes since 1.0 Recommendation of 16 January 2014

        Open Issues

        The following is a list of open issues being worked on for the next release.

        -

        -

        -

        -

        -

        +

        diff --git a/spec/latest/json-ld-framing/index.html b/spec/latest/json-ld-framing/index.html index fd367217c..7afd71fa4 100644 --- a/spec/latest/json-ld-framing/index.html +++ b/spec/latest/json-ld-framing/index.html @@ -74,7 +74,7 @@ ], bugTracker: { - open: "https://github.com/json-ld/json-ld.org/issues?q=is%3Aopen+is%3Aissue+label%3A1.1+label%3Aframing", + open: "https://github.com/json-ld/json-ld.org/issues?q=is%3Aissue+label%3Aframing+is%3Aopen+milestone%3A%22JSON-LD+1.1%22", new: "https://github.com/json-ld/json-ld.org/issues/new" }, @@ -136,6 +136,20 @@ } ol.algorithm>li p, ol.algorithm>li div {text-indent: 0em} ol.algorithm>li>p:first-child {position: relative; display: inline;} + .highlight { + font-weight: bold; + color: #0a3; + } + .comment { + color: #999; + } + .changed { + background-color: rgb(215, 238, 197); + } + .changed:hover { + color: green; + background-color: inherit; + } @@ -613,7 +627,7 @@

        Reverse Framing

        -
        +

        Framing Named Graphs

        Frames can include @graph, which allows information from named graphs contained within a JSON-LD document to be exposed within it's proper @@ -795,8 +809,8 @@

        Syntax Tokens and Keywords

        Is this flag really useful? Easier to simply not have a default value, if it shouldn't match.
        -
        @requireAll
        -
        Used in Framing to override the +
        @requireAll
        +
        Used in Framing to override the value of require all flag within a specific frame.
        @@ -855,11 +869,11 @@

        Framing Algorithm

        generate a JsonLdFramingError with code set to invalid frame. Need more specifics as to what constitutes a valid frame.

        -

        Set graph map to the result of performing the +

        Set graph map to the result of performing the Node Map Generation algorithm on expanded input.

        -

        If the frameDefault option +

        If the frameDefault option is present with the value true, set graph name to @default. Otherwise, create merged node map using the the Merge Node Maps algorithm with graph map and add merged node map as the value of @merged @@ -931,7 +945,7 @@

        Framing Algorithm

        just the first matched node. With sorting, we could also consider @first.
      3. If embed is @last or @always
          -
        1. If graph map in state has an entry for id: +
        2. If graph map in state has an entry for id:
          1. If frame does not have the key @graph, set recurse to true, unless graph name in state is @merged @@ -1014,7 +1028,7 @@

            Framing Algorithm

          3. -
        3. If frame has the property @reverse, then +
        4. If frame has the property @reverse, then for each reverse property and sub frame that are the values of @reverse in frame:
          1. Create a @reverse property in output with a new dictionary reverse dict as its value.
            2. @@ -1058,7 +1072,7 @@

            Framing Algorithm

        4. -
        +

        Frame Matching Algorithm

        The Frame Matching Algorithm is used as part of the Framing algorithm @@ -1140,7 +1154,7 @@

        Frame Matching Algorithm

      -
      +

      Value Pattern Matching Algorithm

      The Value Pattern Matching Algorithm is used as part of the Framing @@ -1396,18 +1410,37 @@

      application/ld-frame+json

      +
      +

      Changes since 1.0 Draft of 30 August 2012

      +
        +
      • There are numerous formatting and terminology changes intended to align with + the 1.0 Recommendations of JSON-LD and JSON-LD-API in addition to the use + of common term definition sections.
        • +
      • The object embed flag (@embed) can take on different + values to better control object embedding.
        • +
      • Framing supports More specific fram matching, where + general wildcard and match none + can be used for type and property values.
        • +
      • Frame matching also supports value object matching, where + values for @value, @type, and @language + can use wildcard and match none + and may also use a set of specific strings to match (e.g., a set of specific + languages).
        • +
      • Framing allows specific graphs to be matched, and the outer-most frame + can either come from the merged graph or the default graph.
        • +
      • Framing supports @reverse.
        • +
      • Through the use of scoped contexts, parts of a frame can be + compacted using a different context than is used for the outer-most + object.
        • +
      • Frames can use one or more values for @id to allow for matching + specific objects in a frame.
        • +
      +
      +

      Open Issues

      The following is a list of open issues being worked on for the next release.

      -

      -

      -

      -

      -

      -

      -

      -

      diff --git a/spec/latest/json-ld/index.html b/spec/latest/json-ld/index.html index b1651f19f..632eb7af3 100644 --- a/spec/latest/json-ld/index.html +++ b/spec/latest/json-ld/index.html @@ -69,7 +69,7 @@ ], bugTracker: { - open: "https://github.com/json-ld/json-ld.org/issues?q=is%3Aopen+is%3Aissue+label%3A1.1+label%3Asyntax", + open: "https://github.com/json-ld/json-ld.org/issues?utf8=✓&q=is%3Aissue%20label%3Asyntax%20is%3Aopen%20milestone%3A%22JSON-LD%201.1%22%20", new: "https://github.com/json-ld/json-ld.org/issues/new" }, @@ -105,6 +105,20 @@ .highlight { font-weight: bold; color: #0a3; } .comment { color: #999; } table, thead, tr, td { padding: 5px; border-width: 1px; border-spacing: 0px; border-style: solid; border-collapse: collapse; } + .highlight { + font-weight: bold; + color: #0a3; + } + .comment { + color: #999; + } + .changed { + background-color: rgb(215, 238, 197); + } + .changed:hover { + color: green; + background-color: inherit; + } @@ -2085,7 +2099,7 @@

      Reverse Properties

      --> -

      The @reverse keyword can also be used in +

      The @reverse keyword can also be used in expanded term definitions to create reverse properties as shown in the following example:

      @@ -2115,7 +2129,7 @@

      Reverse Properties

      -
      +

      Scoped Contexts

      An expanded term definition can include a @context @@ -3207,7 +3221,7 @@

      Context Definitions

      An expanded term definition MUST be a JSON object composed of zero or more keys from @id, @reverse, - @type, @language, @context or @container. An + @type, @language, @context or @container. An expanded term definition SHOULD NOT contain any other keys.

      If an expanded term definition has an @reverse member, @@ -3242,7 +3256,7 @@

      Context Definitions

      the @context, the associated value MUST be an index map.

      -

      If an expanded term definition has an @context member, +

      If an expanded term definition has an @context member, it MUST be a valid context definition.

      Terms MUST NOT be used in a circular manner. That is, @@ -3461,6 +3475,9 @@

      Open Issues

      +

      +

      +