Fix generation of equivalent/subProperty in 4.4 to come after contextual.
authorGregg Kellogg <gregg@kellogg-assoc.com>
Mon, 03 Sep 2012 08:54:21 -0600
changeset 126 262c3a83cbfb
parent 125 9a4af2b90c87
child 127 eb789a117c19
Fix generation of equivalent/subProperty in 4.4 to come after contextual.
microdata-rdf/index.html
--- a/microdata-rdf/index.html	Mon Sep 03 08:39:22 2012 -0600
+++ b/microdata-rdf/index.html	Mon Sep 03 08:54:21 2012 -0600
@@ -1284,70 +1284,81 @@
   
   <section>
     <h3>Generate Predicate URI</h3>
-    <p>Predicate URI generation makes use of <a>current type</a>, <a>current name</a>,
-      and <a>current vocabulary</a> from an <a>evaluation context</a> <em>context</em>
-      along with <em>name</em>.</p>
+    <p>Predicate URI generation makes use of <a>current type</a>,
+      <a>current name</a>, and <a>current vocabulary</a> from an <a>evaluation
+      context</a> <em>context</em> along with <em>name</em>.</p>
 
     <ol class="algorithm">
       <li>If <em>name</em> is an <a>absolute URL</a>, return <em>name</em>
         as a <a>URI reference</a>.</li>
-      <li>If <a>current type</a> from <em>context</em> is null, there can be no <a>current vocabulary</a>.        
-        Return the <a>URI reference</a> that is the <a>document base</a> with its <cite><a
-        href="http://tools.ietf.org/html/rfc3986#section-3.5">fragment</a></cite> set to the <a>fragment-escape</a>d value
-        of <em>name</em>.
+      <li>If <a>current type</a> from <em>context</em> is null,
+        there can be no <a>current vocabulary</a>. Return the <a>URI reference</a>
+        that is the <a>document base</a> with its <cite><a
+        href="http://tools.ietf.org/html/rfc3986#section-3.5">fragment</a></cite>
+        set to the <a>fragment-escape</a>d value of <em>name</em>.
         <div class="note">
-          This rule is intended to allow for a the case where no type is set, and therefore there is no
-          vocabulary from which to extract rules. For example, if there is a <a>document base</a> of
-          <code>http://example.org/doc</code> and an <a class="aref">itemprop</a> of 'title', a URI will be constructed
-          to be <code>http://example.org/doc#title</code>.
+          This rule is intended to allow for a the case where no type is set, and
+          therefore there is no vocabulary from which to extract rules. For
+          example, if there is a <a>document base</a> of
+          <code>http://example.org/doc</code> and an <a class="aref">itemprop</a>
+          of 'title', a URI will be constructed to be
+          <code>http://example.org/doc#title</code>.
         </div>
       </li>
-      <li>Otherwise, if <a>current vocabulary</a> from <em>context</em> is not null
-        and <a>registry</a> has an entry for <a>current vocabulary</a> having a
-        <a>propertyURI</a> entry that is not null, set that as <em>scheme</em>. Otherwise,
-        set <em>scheme</em> to <code>vocabulary</code>.</li>
-      <li>If the <a>registry</a> entry for <a>propertyURI</a> has an <code>equivalentProperty</code> key,
-        and such a triple has not already been generated, generate the following triple using
-        the <em>value</em> of that key:
+      <li>Otherwise, if <a>current vocabulary</a> from <em>context</em>
+        is not null and <a>registry</a> has an entry for <a>current vocabulary</a>
+        having a <a>propertyURI</a> entry that is not null, set that as
+        <em>scheme</em>. Otherwise, set <em>scheme</em> to
+        <code>vocabulary</code>.</li>
+      <li id="scheme-vocab">If <em>scheme</em> is <code>vocabulary</code>
+        set <em>expandedURI</em> to the <a>URI reference</a> constructed by
+        appending the <a>fragment-escape</a>d value of <em>name</em> to <a>current
+        vocabulary</a>, separated by a U+0023 NUMBER SIGN character (#) unless the
+        <a>current vocabulary</a> ends with either a U+0023 NUMBER SIGN character
+        (#) or SOLIDUS U+002F (/).</li>
+      <li id="scheme-context">Otherwise, if <em>scheme</em> is
+        <code>contextual</code>, set <em>expandedURI</em> to the <a>URI
+        reference</a> constructed as follows:
+        <ol class="algorithm">
+          <li>Let <em>s</em> be <a>current name</a> from <em>context</em>.</li>
+          <li>If <code>http://www.w3.org/ns/md?type=</code>
+            is a prefix of <em>s</em>, return the concatenation of <em>s</em>, a
+            U+002E FULL STOP character (.) and the <a>fragment-escape</a>d value
+            of <em>name</em>.</li>
+          <li>Otherwise, return the concatenation of
+            <code>http://www.w3.org/ns/md?type=</code>, the
+            <a>fragment-escape</a>d value of <a>current type</a>, the string
+            <code>&amp;prop=</code>, and the <a>fragment-escape</a>d value of
+            <em>name</em>. </li>
+        </ol>
+      </li>
+      <li>If the <a>registry</a> entry for <a>propertyURI</a>
+        has an <code>equivalentProperty</code> key, and such a triple has not
+        already been generated, generate the following triple using the
+        <em>value</em> of that key:
         <dl class="triple">
           <dt>subject</dt>
-          <dd><em>propertyURI</em></dd>
+          <dd><em>expandedURI</em></dd>
           <dt>predicate</dt>
           <dd><code>http://www.w3.org/2002/07/owl#equivalentProperty</code></dd>
           <dt>object</dt>
           <dd><em>value</em></dd>
         </dl>
       </li>
-      <li>If the <a>registry</a> entry for <a>propertyURI</a> has an <code>subPropertyOf</code> key,
-        and such a triple has not already been generated, generate the following triple using
-        the <em>value</em> of that key:
+      <li>If the <a>registry</a> entry for <a>propertyURI</a>
+        has an <code>subPropertyOf</code> key, and such a triple has not
+        already been generated, generate the following triple using the
+        <em>value</em> of that key:
         <dl class="triple">
           <dt>subject</dt>
-          <dd><em>propertyURI</em></dd>
+          <dd><em>expandedURI</em></dd>
           <dt>predicate</dt>
           <dd><code>http://www.w3.org/2000/01/rdf-schema#subPropertyOf</code></dd>
           <dt>object</dt>
           <dd><em>value</em></dd>
         </dl>
       </li>
-      <li id="scheme-vocab">If <em>scheme</em> is <code>vocabulary</code> return the <a>URI reference</a> constructed
-        by appending the <a>fragment-escape</a>d value of <em>name</em> to <a>current vocabulary</a>,
-        separated by a U+0023 NUMBER SIGN character (#) unless the <a>current vocabulary</a> ends
-        with either a U+0023 NUMBER SIGN character (#) or SOLIDUS U+002F (/).</li>
-      <li id="scheme-context">If <em>scheme</em> is <code>contextual</code>, return the <a>URI reference</a>
-        constructed as follows:
-        <ol class="algorithm">
-          <li>Let <em>s</em> be <a>current name</a> from <em>context</em>.</li>
-          <li>If <code>http://www.w3.org/ns/md?type=</code> is a prefix of <em>s</em>,
-            return the concatenation of <em>s</em>, a U+002E FULL STOP character (.) and
-            the <a>fragment-escape</a>d value of <em>name</em>.
-          </li>
-          <li>Otherwise, return the concatenation of <code>http://www.w3.org/ns/md?type=</code>,
-            the <a>fragment-escape</a>d value of <a>current type</a>, the string <code>&amp;prop=</code>,
-            and the <a>fragment-escape</a>d value of <em>name</em>.
-          </li>
-        </ol>
-      </li>
+      <li>Return <em>expandedURI</em>.</li>
     </ol>
   </section>