From 8ec1a87a52f106b826636c0e7455817ae28168b6 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Wed, 20 Nov 2019 13:52:41 -0800
Subject: [PATCH 1/3] * Remove pointless step in expansion algorithm. Fixes
 #213.

---
 index.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/index.html b/index.html
index bae136ab..cfd26ce4 100644
--- a/index.html
+++ b/index.html
@@ -2483,8 +2483,6 @@ <h3>Algorithm</h3>
                   (unless <a>processing mode</a> is `json-ld-1.0`)</span>,
                   a <a data-link-for="JsonLdErrorCode">colliding keywords</a>
                   error has been detected and processing is aborted.</li>
-                <li class="changed">If <var>result</var> already has an <var>expanded property</var> <a>entry</a>,
-                  for `@included` or `@type`.</li>
                 <li>If <var>expanded property</var> is <code>@id</code>:
                   <ol>
                     <li>If <var>value</var> is not a <a>string</a>, an

From 19b4ef5884fff2ccfefbcffa346f5e7f726cfd99 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Wed, 20 Nov 2019 13:55:39 -0800
Subject: [PATCH 2/3] * Add missing hyphen to "property-scoped context"
 variable in expansion algorithm. Fixes #214.

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index cfd26ce4..8d87ea08 100644
--- a/index.html
+++ b/index.html
@@ -2375,7 +2375,7 @@ <h3>Algorithm</h3>
         <li class="changed">If <var>active property</var> is <code>@default</code>,
           initialize the {{JsonLdOptions/frameExpansion}} flag to <code>false</code>.</li>
         <li class="changed">If <var>active property</var> has a <a>term definition</a> in <var>active context</var>
-          with a <a>local context</a>, initialize <var>property scoped context</var> to that <a>local context</a>.</li>
+          with a <a>local context</a>, initialize <var>property-scoped context</var> to that <a>local context</a>.</li>
         <li>If <var>element</var> is a <a>scalar</a>,
           <ol>
             <li>If <var>active property</var> is <code>null</code> or <code>@graph</code>,

From a3a664e63d94f70461c413d9d50c2b967ee3e322 Mon Sep 17 00:00:00 2001
From: Gregg Kellogg <gregg@greggkellogg.net>
Date: Wed, 20 Nov 2019 14:01:39 -0800
Subject: [PATCH 3/3] Clarify when input does not have `@type` when setting
 "input type" variable. Fixes #215.

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 8d87ea08..7c6ae21a 100644
--- a/index.html
+++ b/index.html
@@ -2458,7 +2458,7 @@ <h3>Algorithm</h3>
         <li>Initialize two empty <a class="changed">maps</a>, <var>result</var>
           <span class="changed">and <var>nests</var>.
             Initialize <var>input type</var> to the last value of the first <a>entry</a> in <var>element</var>
-            expanding to <code>@type</code>, ordering <a>entries</a> lexicographically by key</span>.
+            expanding to <code>@type</code> (if any), ordering <a>entries</a> lexicographically by key</span>.
         </li>
         <li id="alg-expand-each-key-value">
           For each <var>key</var> and <var>value</var> in <var>element</var>,