From 516a7ea4208393748fd83ac8c8749459c333f756 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Thu, 26 Dec 2019 17:22:02 -0800
Subject: [PATCH 1/3] Rework Create Term Definition step 16 (again), to restore
 step 16.1, and move 16.2-16.n to a new 16.2 "Otherwise" substep.

---
 index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 8947fb04..c4ccccd9 100644
--- a/index.html
+++ b/index.html
@@ -6931,8 +6931,9 @@ <h2>Changes since Candidate Release of 12 December 2019</h2>
       <ul>
         <li>Added missing `@none` in <a href="#ctd-invalid-type">13.4</a>.
           This is in response to <a href="https://github.com/w3c/json-ld-api/issues/259">Issue 259</a>.</li>
-        <li>Merged <a href="#ctd-id-null">the former substep 16.1</a> into step 16
-          to make the control flow clearer and homogeneous with the rest of the specification.
+        <li>Moved step <a href="#ctd-id-not-null">16.2</a>,
+          and subsequent substeps of step 16 into a new grouping, to separate the logic
+          from step <a href="#ctd-id-not-null">16.1</a>.
           This is in response to <a href="https://github.com/w3c/json-ld-api/issues/241">Issue 241</a>.</li>
         <li>Updated step <a href="#ctd-contains-colon">16.4</a>
           to prevent an issue where <var>term</var> might not be defined at the time it is expanded.

From 80307c1f5da7890572c59340316d033e16fce563 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Mon, 30 Dec 2019 11:59:05 -0800
Subject: [PATCH 2/3] Restore lost changes to Create Term Definition step 16
 separating first step from all subsequent steps.

---
 index.html | 92 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/index.html b/index.html
index c4ccccd9..6d1eef91 100644
--- a/index.html
+++ b/index.html
@@ -1618,55 +1618,59 @@ <h3>Algorithm</h3>
         </li>
         <li>Set the <a>reverse property</a> flag of <var>definition</var>
           to <code>false</code>.</li>
-        <li class="changed">If <var>value</var> contains the <a>entry</a> <code>@id</code> and its value
-          neither equals <var>term</var> nor is <code>null</code>:
-          <div id="ctd-id-null" class="note">If the `@id` entry is `null`,
-            the term is not used for IRI expansion, but is
-            retained to be able to detect future redefinitions of this term.</div>
+        <li>If <var>value</var> contains the <a>entry</a> <code>@id</code> and its value
+          does not equal <var>term</var>:
           <ol>
-            <li>If the value associated with the <code>@id</code> <a>entry</a> is not a <a>string</a>, an
-              <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
-              error has been detected and processing is aborted.</li>
-            <li>If the value associated with the `@id` <a>entry</a>
-              is not a <a>keyword</a>, but
-              has the form of a <a>keyword</a>
-              (i.e., it matches the ABNF rule `"@"1*ALPHA` from [[RFC5234]]),
-              return; processors SHOULD generate a warning.</li>
-            <li>Otherwise, set the <a>IRI mapping</a> of <var>definition</var> to the
-              result of using the <a href="#iri-expansion">IRI Expansion algorithm</a>, passing
-              <var>active context</var>, the value associated with the <code>@id</code> <a>entry</a> for
-              <var>value</var>, <code>true</code> for <var>vocab</var>,
-              <var>local context</var>, and <var>defined</var>. If the resulting
-              <a>IRI mapping</a> is neither a <a>keyword</a>, nor an
-              <a>IRI</a>, nor a <a>blank node identifier</a>, an
-              <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
-              error has been detected and processing is aborted; if it equals <code>@context</code>, an
-              <a data-link-for="JsonLdErrorCode">invalid keyword alias</a>
-              error has been detected and processing is aborted.</li>
-            <li id="ctd-contains-colon" class="changed">If the <var>term</var> contains a colon (`:`)
-              anywhere but as the first or last character of <var>term</var>,
-              or if it contains a slash (`/`) anywhere:
+            <li id="ctd-id-null">If <var>value</var> contains the <code>@id</code> <a>entry</a>
+              is <code>null</code>, the term is not used for IRI expansion, but is
+              retained to be able to detect future redefinitions of this term.</li>
+            <li id="ctd-id-not-null">Otherwise:
               <ol>
-                <li>Set the value associated with <var>defined</var>'s <var>term</var> <a>entry</a> to
-                  <code>true</code>.</li>
-                <li>If the result of expanding <var>term</var>
-                  using the <a href="#iri-expansion">IRI Expansion algorithm</a>,
-                  passing <var>active context</var>,
-                  <var>term</var> for <var>value</var>,
-                  <code>true</code> for <var>vocab</var>,
-                  <var>local context</var>,
-                  and <var>defined</var>,
-                  is not the same as the <a>IRI mapping</a> of <var>definition</var>,
-                  an <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
+                <li>If the value associated with the <code>@id</code> <a>entry</a> is not a <a>string</a>, an
+                  <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
+                  error has been detected and processing is aborted.</li>
+                <li>If the value associated with the `@id` <a>entry</a>
+                  is not a <a>keyword</a>, but
+                  has the form of a <a>keyword</a>
+                  (i.e., it matches the ABNF rule `"@"1*ALPHA` from [[RFC5234]]),
+                  return; processors SHOULD generate a warning.</li>
+                <li>Otherwise, set the <a>IRI mapping</a> of <var>definition</var> to the
+                  result of using the <a href="#iri-expansion">IRI Expansion algorithm</a>, passing
+                  <var>active context</var>, the value associated with the <code>@id</code> <a>entry</a> for
+                  <var>value</var>, <code>true</code> for <var>vocab</var>,
+                  <var>local context</var>, and <var>defined</var>. If the resulting
+                  <a>IRI mapping</a> is neither a <a>keyword</a>, nor an
+                  <a>IRI</a>, nor a <a>blank node identifier</a>, an
+                  <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
+                  error has been detected and processing is aborted; if it equals <code>@context</code>, an
+                  <a data-link-for="JsonLdErrorCode">invalid keyword alias</a>
                   error has been detected and processing is aborted.</li>
+                <li id="ctd-contains-colon" class="changed">If the <var>term</var> contains a colon (`:`)
+                  anywhere but as the first or last character of <var>term</var>,
+                  or if it contains a slash (`/`) anywhere:
+                  <ol>
+                    <li>Set the value associated with <var>defined</var>'s <var>term</var> <a>entry</a> to
+                      <code>true</code>.</li>
+                    <li>If the result of expanding <var>term</var>
+                      using the <a href="#iri-expansion">IRI Expansion algorithm</a>,
+                      passing <var>active context</var>,
+                      <var>term</var> for <var>value</var>,
+                      <code>true</code> for <var>vocab</var>,
+                      <var>local context</var>,
+                      and <var>defined</var>,
+                      is not the same as the <a>IRI mapping</a> of <var>definition</var>,
+                      an <a data-link-for="JsonLdErrorCode">invalid IRI mapping</a>
+                      error has been detected and processing is aborted.</li>
+                  </ol>
+                </li>
+                <li class="changed">If <var>term</var> contains neither a colon (`:`) nor a slash (`/`),
+                  <span class="changed"><var>simple term</var> is <code>true</code></span>,
+                  and if the <a>IRI mapping</a> of <var>definition</var>
+                  is either an <a>IRI</a> ending with a <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
+                  or a <a>blank node identifier</a>,
+                  set the <a>prefix flag</a> in <var>definition</var> to <code>true</code>.</li>
               </ol>
             </li>
-            <li class="changed">If <var>term</var> contains neither a colon (`:`) nor a slash (`/`),
-              <span class="changed"><var>simple term</var> is <code>true</code></span>,
-              and if the <a>IRI mapping</a> of <var>definition</var>
-              is either an <a>IRI</a> ending with a <a data-cite="RFC3986#section-2.2">gen-delim</a> character,
-              or a <a>blank node identifier</a>,
-              set the <a>prefix flag</a> in <var>definition</var> to <code>true</code>.</li>
           </ol>
         </li>
         <li>

From 0f3bd0bcc2fccddcd329083c02c723eabb79a27a Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Tue, 31 Dec 2019 10:38:33 -0800
Subject: [PATCH 3/3] Update index.html via @pchampin

Co-Authored-By: Pierre-Antoine Champin <pchampin@liris.cnrs.fr>
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 6d1eef91..20d1673a 100644
--- a/index.html
+++ b/index.html
@@ -1621,7 +1621,7 @@ <h3>Algorithm</h3>
         <li>If <var>value</var> contains the <a>entry</a> <code>@id</code> and its value
           does not equal <var>term</var>:
           <ol>
-            <li id="ctd-id-null">If <var>value</var> contains the <code>@id</code> <a>entry</a>
+            <li id="ctd-id-null">If the <code>@id</code> <a>entry</a> of <var>value</var>
               is <code>null</code>, the term is not used for IRI expansion, but is
               retained to be able to detect future redefinitions of this term.</li>
             <li id="ctd-id-not-null">Otherwise: