--- a/spec/latest/json-ld-api/alternate2.html Mon Feb 11 16:00:55 2013 -0500
+++ b/spec/latest/json-ld-api/alternate2.html Mon Feb 11 16:15:31 2013 -0500
@@ -2692,8 +2692,9 @@
If <em>expanded value</em> is an empty <tref>array</tref>:
<ol class="algorithm">
<li>
- Initialize <em>activeProperty</em> to the result of using
- the <a href="#iri-compaction-algorithm">IRI Compaction</a>
+ Initialize <em>item active property</em> to the result of
+ using the
+ <a href="#iri-compaction-algorithm">IRI Compaction</a>
algorithm, passing <tref>active context</tref>,
<em>expanded property</em> for <em>iri</em>,
<em>expanded value</em> for <em>value</em>,
@@ -2702,10 +2703,10 @@
</li>
<li>
If <em>result</em> does not have the key that equals
- <em>activeProperty</em>, set this key's value in <em>result</em>
- to an empty <tref>array</tref>. Otherwise, if the key's value
- is not an <tref>array</tref>, then set it equal to one
- containing only the value.
+ <em>item active property</em>, set this key's value in
+ <em>result</em> to an empty <tref>array</tref>. Otherwise, if
+ the key's value is not an <tref>array</tref>, then set it
+ equal to one containing only the value.
</li>
</ol>
</li>
@@ -2716,7 +2717,7 @@
For each item <em>expanded item</em> in <em>expanded value</em>:
<ol class="algorithm">
<li>
- Initialize <em>activeProperty</em> to the result of using
+ Initialize <em>item active property</em> to the result of using
the <a href="#iri-compaction-algorithm">IRI Compaction</a>
algorithm, passing <tref>active context</tref>,
<em>expanded property</em> for <em>iri</em>,
@@ -2727,24 +2728,26 @@
<li>
Initialize <em>container</em> to <tref>null</tref>. If there
is a <tref>container mapping</tref> for
- <em>activeProperty</em> in <tref>active context</tref>,
+ <em>item active property</em> in <tref>active context</tref>,
set <em>container</em> to its value.
</li>
<li>
If there is a <tref>term definition</tref> for
- <em>activeProperty</em> in <tref>active context</tref> that
- is a <tref>property generator</tref>, then invoke the
+ <em>item active property</em> in <tref>active context</tref>
+ that is a <tref>property generator</tref>, then invoke the
<a href="#find-property-generator-duplicates">Find Property Generator Duplicates</a>
algorithm, passing <tref>active context</tref>,
<em>shallow</em> for <em>element</em>,
<em>expanded property</em>, <em>expanded item</em> for
- <em>value</em>, <em>activeProperty</em>, and
+ <em>value</em>, <em>item active property</em> for
+ <tref>active property</tref>, and
<tref>true</tref> for <em>remove</em>.
</li>
<li>
Initialize <em>compacted item</em> to the result of using
this algorithm recursively, passing
- <tref>active context</tref>, <em>activeProperty</em>,
+ <tref>active context</tref>, <em>item active property</em>
+ for </tref>active property</tref>,
<em>expanded item</em> for <em>element</em> if it does
not contain the key <code>@list</code>, otherwise pass
the key's associated value for <em>element</em>.
@@ -2785,7 +2788,7 @@
</ol>
</li>
<li>
- Otherwise, <tref>active property</tref> MUST NOT be a key
+ Otherwise, <em>item active property</em> MUST NOT be a key
in <em>result</em> because there cannot be two
<tref title="list object">list objects</tref> associated
with an <tref>active property</tref> that has a
@@ -2798,9 +2801,9 @@
<code>@index</code>:
<ol class="algorithm">
<li>
- If <em>active property</em> is a key in <em>result</em>,
- then initialize <em>map object</em> to its associated
- value, otherwise initialize it to an empty
+ If <em>item active property</em> is a key in
+ <em>result</em>, then initialize <em>map object</em> to
+ its associated value, otherwise initialize it to an empty
<tref>JSON object</tref>.
</li>
<li>
@@ -2842,14 +2845,15 @@
then set it equal to a new <tref>array</tref>
containing only <em>compacted item</em>.
</li>
- If <tref>active property</tref> is not a key in
+ <li>
+ If <em>item active property</em> is not a key in
<em>result</em> then add the key-value pair,
- (<tref>active property</tref>-<em>compacted item</em>),
+ (<em>item active property</em>-<em>compacted item</em>),
to <em>result</em>.
</li>
<li>
Otherwise, if the value associated with the key that
- equals <tref>active property</tref> in <em>result</em>
+ equals <em>item active property</em> in <em>result</em>
is not an <tref>array</tref>, set it equal to a new
<tref>array</tref> containing only the value. Then
append <em>compacted item</em> to the value if