Remove requirement for extracting a context from HTML.

index.html

@@ -1052,10 +1052,6 @@ <h3>Overview</h3>
         a remote context. We dereference the remote context and replace <a>context</a>
         with the value of the <code>@context</code> <a>entry</a> of the top-level object in the
         retrieved JSON-LD document.
-        <span class="changed">If the result is an HTML document,
-          we attempt to extract JSON-LD from the first <a data-cite="HTML/scripting.html#the-script-element">script element</a>
-          of type <code>application/ld+json;profile=http://www.w3.org/ns/json-ld#context</code>
-          or <code>application/ld+json</code>, if no context profile exists.</span>
         If there's no such <a>entry</a>, an
         <a data-link-for="JsonLdErrorCode">invalid remote context</a>
         has been detected. Otherwise, we process <a>context</a> by recursively using
@@ -1167,7 +1163,8 @@ <h3>Algorithm</h3>
                 <li class="changed">Otherwise, dereference <var>context</var> using
                   the <a>LoadDocumentCallback</a>, passing <var>context</var>
                   for <a data-link-for="LoadDocumentCallback">url</a>,
-                  and <code>http://www.w3.org/ns/json-ld#context</code> for <a data-link-for="LoadDocumentOptions">profile</a></li>
+                  and <code>http://www.w3.org/ns/json-ld#context</code> for <a data-link-for="LoadDocumentOptions">profile</a>
+                  and for <a data-link-for="LoadDocumentOptions">requestProfile</a>.</li>
                 <li>If <var>context</var> cannot be dereferenced,
                   <span class="changed">or cannot be transformed into the <a>internal representation</a></span>,
                   a <a data-link-for="JsonLdErrorCode">loading remote context failed</a>
@@ -1223,7 +1220,8 @@ <h3>Algorithm</h3>
                 <li>Dereference <var>import</var> using
                   the <a>LoadDocumentCallback</a>, passing <var>import</var>
                   for <a data-link-for="LoadDocumentCallback">url</a>,
-                  and <code>http://www.w3.org/ns/json-ld#context</code> for <a data-link-for="LoadDocumentOptions">profile</a></li>
+                  and <code>http://www.w3.org/ns/json-ld#context</code> for <a data-link-for="LoadDocumentOptions">profile</a>
+                  and for <a data-link-for="LoadDocumentOptions">requestProfile</a>.</li>
                 <li>If <var>import</var> cannot be dereferenced,
                   <span>or cannot be transformed into the <a>internal representation</a></span>,
                   a <a data-link-for="JsonLdErrorCode">loading remote context failed</a>
@@ -5800,7 +5798,7 @@ <h3>LoadDocumentCallback</h3>
         <dd>The URL of the remote document or context to load.</dd>
         <dt class="changed"><dfn data-lt="LoadDocumentCallback-options" data-lt-noDefault>options</dfn></dt>
         <dd class="changed">A set of options to determine
-          the behavior of the callback. See <a href="loaddocumentoptions" class="sectionRef"></a>.</dd>
+          the behavior of the callback. See <a href="#loaddocumentoptions" class="sectionRef"></a>.</dd>
       </dl>
 
       <p class="changed">The following algorithm describes the default callback and places
@@ -5820,7 +5818,9 @@ <h3>LoadDocumentCallback</h3>
 
           <p>Processors MAY include other media types using a <code>+json</code> suffix as defined in [[RFC6839]].</p>
 
-          <p>A <a>full Processor</a> MUST include <code>text/html</code> at any preference level.</p></li>
+          <p>A <a>full Processor</a> MUST include <code>text/html</code> at any preference level,
+            unless <a data-link-for="LoadDocumentOptions">requestProfile</a> is `http://www.w3.org/ns/json-ld#context`.</p>
+        </li>
         <li>Set <var>documentUrl</var> to the location of the retrieved resource
           considering redirections (exclusive of HTTP status <code>303</code> "See Other" redirects
           as discussed in [[?cooluris]]).</li>
@@ -6344,10 +6344,6 @@ <h2>Changes since JSON-LD Community Group Final Report</h2>
     <li><a>Term definitions</a> with keys which are of the form of a <a>compact IRI</a> or <a>absolute IRI</a> MUST NOT
       expand to an <a>IRI</a> other than the expansion of the key itself.</li>
     <li>Define different processor modes: <a>pure JSON Processor</a>, <a>event-based JSON processor</a>, and <a>full Processor</a>.</li>
-    <li>For a <a>full Processor</a>, if a retrieved context URL returns an HTML document, the first script element
-      of type <code>application/ld+json;profile=http://www.w3.org/ns/json-ld#context</code>,
-      or <code>application/ld+json</code> is used as the context for further processing.
-      This allows a mechanism for documenting the content of a context using HTML.</li>
     <li>Consolidate <a>RemoteDocument</a> processing into the <a>LoadDocumentCallback</a>
       including variations on HTML processing.</li>
     <li>The <a href="#iri-compaction">IRI compaction algorithm</a> may generate an error if the result is an

tests/expand-manifest.jsonld

@@ -1684,45 +1684,6 @@
       "input": "expand/h022-in.html#second",
       "expect": "expand/h022-out.jsonld",
       "option": {"specVersion": "json-ld-1.1"}
-    }, {
-      "@id": "#thc01",
-      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Expands document using an HTML context",
-      "purpose": "Tests extracting a context from an HTML document.",
-      "input": "expand/hc01-in.jsonld",
-      "expect": "expand/hc01-out.jsonld",
-      "option": {"specVersion": "json-ld-1.1"}
-    }, {
-      "@id": "#thc02",
-      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Expands document using an HTML context with a fragment identifier",
-      "purpose": "Tests extracting a context from an HTML document with script identified by fragment identifier.",
-      "input": "expand/hc02-in.jsonld",
-      "expect": "expand/hc02-out.jsonld",
-      "option": {"specVersion": "json-ld-1.1"}
-    }, {
-      "@id": "#thc03",
-      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Expands document using an HTML context with preference to context profile",
-      "purpose": "Tests extracting a context from an HTML document, skipping other contexts.",
-      "input": "expand/hc03-in.jsonld",
-      "expect": "expand/hc03-out.jsonld",
-      "option": {"specVersion": "json-ld-1.1"}
-    }, {
-      "@id": "#thc04",
-      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
-      "name": "Expands document using an HTML context with expandContext",
-      "purpose": "Tests extracting a context from an HTML document, using expandContext API option.",
-      "input": "expand/hc04-in.jsonld",
-      "expect": "expand/hc04-out.jsonld",
-      "option": {"expandContext": "hc04-context.html", "specVersion": "json-ld-1.1"}
-    }, {
-      "@id": "#thc05",
-      "@type": [ "jld:NegativeEvaluationTest", "jld:ExpandTest" ],
-      "name": "Errors if given an HTML file for a context where no context script element is found",
-      "purpose": "Verifies that an exception is raised on expansion when a remote context is an HTML file but does not contain a script element which is an object containing @context",
-      "input": "expand/hc05-in.jsonld",
-      "expect": "invalid remote context"
     }, {
       "@id": "#tin01",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],