[] (0) Restructure how microdata vocabularies are defined; fix microd…

…ata to address some issues found while doing that; clean up the RDF conversion.

git-svn-id: http://svn.whatwg.org/webapps@4069 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -44475,9 +44475,10 @@ document.body.appendChild(outer);</pre>
 
    <li>A <a href=#valid-reversed-dns-identifier>valid reversed DNS identifier</a>, or</li>
 
-   <li>If the item is a <a href=#typed-item>typed item</a>: a string allowed in
-   this situation according to the specification that defines the
-   <a href=#relevant-type>relevant type</a> for the item, or</li>
+   <li>If the item is a <a href=#typed-item>typed item</a>: a <dfn id=defined-property-name>defined
+   property name</dfn> allowed in this situation according to the
+   specification that defines the <a href=#relevant-type>relevant type</a> for the
+   item, or</li>
 
    <li>If the item is not a <a href=#typed-item>typed item</a>: a string that
    contains no U+002E FULL STOP (.) characters and no U+003A COLON (:)
@@ -44811,9 +44812,6 @@ document.body.appendChild(outer);</pre>
 
   <h3 id=converting-html-to-other-formats><span class=secno>5.4 </span>Converting HTML to other formats</h3>
 
-
-
-
   <h4 id=json><span class=secno>5.4.1 </span>JSON</h4>
 
   <p>Given a list of nodes <var title="">nodes</var> in a
@@ -44998,25 +44996,6 @@ document.body.appendChild(outer);</pre>
        <dt>object    <dd> <var title="">item</var>
       </dl></li>
 
-<!--
-     <li>
-
-      <p>If the element is, or is a descendant of, an
-      <code>address</code> element that has no <code>article</code>
-      element ancestors, and the <span
-      title="concept-item">item</span> has the type <code
-      title="md-vcard">vcard</code>, generate the following
-      triple:</p>
-
-      <dl class="triple">
-       <dt>subject   <dd> <span>the document's current address</span>
-       <dt>predicate <dd> <code title="">http://purl.org/dc/terms/creator</code>
-       <dt>object    <dd> <var title="">item</var>
-      </dl>
-
-     </li>
--->
-
     </ol></li>
 
   </ol><p>When the user agent is to <dfn id=generate-the-triples-for-an-item>generate the triples for an
@@ -45097,10 +45076,14 @@ document.body.appendChild(outer);</pre>
          <li><p>Let <var title="">predicate</var> have the same value
          as <var title="">type</var>.</li>
 
-         <li><p>If <var title="">predicate</var> does not end in a
+         <li><p>If <var title="">predicate</var> does not contain a
          U+0023 NUMBER SIGN character (#), then append a U+0023 NUMBER
          SIGN character (#) to <var title="">predicate</var>.</li>
 
+         <li><p>Append a U+003A COLON character (:) to <var title="">predicate</var>.</li> <!-- has to be something
+         not in /name/, so either "." or ":", so that a different
+         type/name combination couldn't generate the same string -->
+
          <li><p>Append the value of <var title="">name</var> to <var title="">predicate</var>, with any characters in <var title="">name</var> that are not valid in the &lt;ifragment&gt;
          production of the IRI syntax being %-escaped.</li>
 
@@ -45150,28 +45133,8 @@ document.body.appendChild(outer);</pre>
    <li><p>Append a <code title="">feed</code> element in the
    <a href=#atom-namespace>Atom namespace</a> to <var title="">R</var>.</li>
 
-<!--
-   <li>
-
-    <p>For each element <var title="">candidate</var> that is, or is a
-    descendant of, an <code>address</code> element that has no
-    <code>article</code> element ancestors, and that is an <span
-    title="concept-item">item</span> that has the type <code
-    title="md-vcard">vcard</code>, if there is a property <var
-    title="">property</var> named <code title="md-vcard-fn">fn</code>
-    whose <span title="concept-item-corresponding">corresponding
-    item</span> is <var title="">candidate</var>, and the <span
-    title="concept-property-value">value</span> of <var
-    title="">property</var> is not an <span
-    title="concept-item">item</span>, then append an <code
-    title="">author</code> element in the <span>Atom namespace</span>
-    to the root element of <var title="">R</var> whose contents is a
-    text node with its data set to the <span
-    title="concept-property-value">value</span> of <var
-    title="">property</var>.</p>
-
-   </li>
--->
+   <!-- <atom:author> is required either at the feed level (here) or
+   the entry level (below) but we don't provide it -->
 
    <li>
 
@@ -45369,30 +45332,8 @@ document.body.appendChild(outer);</pre>
 
      </li>
 
-<!--
-     <li>
-
-      <p>For each element <var title="">candidate</var> that is, or is
-      a descendant of, an <code>address</code> element whose nearest
-      <code>article</code> element ancestor is <var
-      title="">article</var>, and that is an <span
-      title="concept-item">item</span> that has the type <code
-      title="md-vcard">vcard</code>, if there is a property <var
-      title="">property</var> named <code
-      title="md-vcard-fn">fn</code> whose <span
-      title="concept-item-corresponding">corresponding item</span> is
-      <var title="">candidate</var>, and the <span
-      title="concept-property-value">value</span> of <var
-      title="">property</var> is not an <span
-      title="concept-item">item</span>, then append an <code
-      title="">author</code> element in the <span>Atom
-      namespace</span> to <var title="">E</var> whose contents is a
-      text node with its data set to the <span
-      title="concept-property-value">value</span> of <var
-      title="">property</var>.</p>
-
-     </li>
--->
+     <!-- <atom:author> is required either at the feed level (above)
+     or the entry level (here) but we don't provide it -->
 
      <li>