Merge pull request #184 from w3c/issue-175

Clarify that expansion steps looking for entries

Author: gkellogg

index.html

@@ -2865,30 +2865,30 @@ <h3>Algorithm</h3>
               set <var>result</var> to the <a data-lt="entry">entry's</a> associated value.</li>
           </ol>
         </li>
-        <li>If <var>result</var> contains only the <a>entry</a>
+        <li>If <var>result</var> is a <a>map</a> that contains only the <a>entry</a>
           <code>@language</code>, set <var>result</var> to <code>null</code>.</li>
         <li>If <var>active property</var> is <code>null</code> or <code>@graph</code>,
           drop free-floating values as follows:
           <ol>
-            <li>If <var>result</var> is an empty <a class="changed">map</a> or contains
-              the <a>entries</a> <code>@value</code> or <code>@list</code>, set <var>result</var> to
-              <code>null</code>.</li>
+            <li>If <var>result</var> is a <a>map</a> which is empty,
+              or contains only the <a>entries</a> <code>@value</code> or <code>@list</code>,
+              set <var>result</var> to <code>null</code>.</li>
             <li>Otherwise, if <var>result</var> is a <a class="changed">map</a> whose only
               <a>entry</a> is <code>@id</code>, set <var>result</var> to <code>null</code>.
               <span class="changed">
                 When the {{JsonLdOptions/frameExpansion}} flag is set, a <a>map</a>
                 containing only the <code>@id</code> <a>entry</a> is retained.</span></li>
           </ol>
         </li>
+        <li>If <var>result</var> is a
+          <a class="changed">map</a> that contains only an <code>@graph</code> <a>entry</a>,
+          set <var>result</var> that value.</li>
+        <li>If <var>result</var> is <code>null</code>,
+          set <var>result</var> to an empty <a>array</a>.</li>
+        <li>If <var>result</var> is not an <a>array</a>,
+          set <var>result</var> to an <a>array</a> containing only <var>result</var>.</li>
         <li>Return <var>result</var>.</li>
       </ol>
-
-      <p>If, after the above algorithm is run, the result is a
-        <a class="changed">map</a> that contains only an <code>@graph</code> <a>entry</a>, set the
-        result to the value of <code>@graph</code>'s value. Otherwise, if the result
-        is <code>null</code>, set it to an empty <a>array</a>. Finally, if
-        the result is not an <a>array</a>, then set the result to an
-        <a>array</a> containing only the result.</p>
     </section>
   </section> <!-- end of Expansion Algorithm -->