/html

Permalink
Browse files

[] (0) Update the RDF conversion to be unambiguous in all cases. 

git-svn-id: http://svn.whatwg.org/webapps@4068 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information...
1 parent 8c137b3 commit 9d8a7b198bead400e2919ab82de0ec2c7bc26788 @Hixie Hixie committed Oct 4, 2009
Unified Split
Showing with 140 additions and 74 deletions.
  1. +53 −35 index
  2. +87 −39 source
View
88 index
@@ -112,7 +112,7 @@
<div class=head>
<p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
<h1>HTML5</h1>
- <h2 class="no-num no-toc" id=draft-standard-&mdash;-3-october-2009>Draft Standard &mdash; 3 October 2009</h2>
+ <h2 class="no-num no-toc" id=draft-standard-&mdash;-4-october-2009>Draft Standard &mdash; 4 October 2009</h2>
<p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
<p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
<!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -44167,7 +44167,7 @@ contradict people?
<p>When designing new vocabularies, identifiers can be created
either using <a href=#url title=URL>URLs</a>, <a href=#valid-reversed-dns-identifier title="valid
reversed DNS identifier">reversed DNS labels</a>, or, for
- properties, as plain words (with no dots or colons). For URLs
+ properties, as plain words (with no dots or colons). For URLs,
conflicts with other vocabularies can be avoided by only using
identifiers that correspond to pages that the author has control
over. Similarly, for reversed DNS labels conflicts can be avoided by
@@ -44413,7 +44413,7 @@ document.body.appendChild(outer);</pre>
specified, must have a value that is either:</p>
<ul><li>A <a href=#valid-url>valid URL</a> that is an <a href=#absolute-url>absolute URL</a>
- for which the string "<code title="">http://www.w3.org/1999/xhtml/custom#</code>" is not a
+ for which the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" is not a
<a href=#prefix-match>prefix match</a>, or</li>
<li>A <a href=#valid-reversed-dns-identifier>valid reversed DNS identifier</a>.</li>
@@ -44470,7 +44470,7 @@ document.body.appendChild(outer);</pre>
<p>Each token must be either:</p>
<ul><li>A <a href=#valid-url>valid URL</a> that is an <a href=#absolute-url>absolute URL</a>
- for which the string "<code title="">http://www.w3.org/1999/xhtml/custom#</code>" is not a
+ for which the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" is not a
<a href=#prefix-match>prefix match</a>, or</li>
<li>A <a href=#valid-reversed-dns-identifier>valid reversed DNS identifier</a>, or</li>
@@ -44994,7 +44994,7 @@ document.body.appendChild(outer);</pre>
<p>Generate the following triple:</p>
<dl class=triple><dt>subject <dd> <a href="#the-document's-current-address">the document's current address</a>
- <dt>predicate <dd> <code title="">http://www.w3.org/1999/xhtml/vocab#item</code>
+ <dt>predicate <dd> <code title="">http://www.w3.org/1999/xhtml/microdata#item</code>
<dt>object <dd> <var title="">item</var>
</dl></li>
@@ -45029,11 +45029,11 @@ document.body.appendChild(outer);</pre>
<a href=#global-identifier>global identifier</a>. Otherwise, let <var title="">subject</var> be a new blank node.</li>
<li><p>Let <var title="">type</var> be the <a href=#item-type>item type</a>
- of <var title="">item</var>.</li>
+ of <var title="">item</var>, or the empty string, if <var title="">item</var> has no <a href=#item-type>item type</a>.</li>
<li><p>If <var title="">type</var> is neither the empty string nor
an <a href=#absolute-url>absolute URL</a>, then let <var title="">type</var> be
- the result of concatenating the string "<code title="">http://www.w3.org/1999/xhtml/custom#</code>" with the <var title="">type</var>, with any characters in <var title="">type</var> that are not valid in the &lt;ifragment&gt;
+ the result of concatenating the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" with the <var title="">type</var>, with any characters in <var title="">type</var> that are not valid in the &lt;ifragment&gt;
production of the IRI syntax being %-escaped.</li>
<li>
@@ -45072,43 +45072,61 @@ document.body.appendChild(outer);</pre>
<li>
<p>For each name <var title="">name</var> in <var title="">element</var>'s <a href=#property-names>property names</a>, run the
- following substeps:</p>
+ appropriate substeps from the following list:</p>
- <ol><!--
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code title="md-work-title">title</code>",
- let <var title="">name</var> be the string "<code
- title="">http://purl.org/dc/elements/1.1/title</code>".</p></li>
-
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code
- title="md-work-author">author</code>", let <var
- title="">name</var> be the string "<code
- title="">http://creativecommons.org/ns#attributionName</code>".</p></li>
-
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code
- title="md-work-license">license</code>", let <var
- title="">name</var> be the string "<code
- title="">http://www.w3.org/1999/xhtml/vocab#license</code>".</p></li>
---><li><p><!--Otherwise...--> If <var title="">name</var> is not
- an <a href=#absolute-url>absolute URL</a>, then let <var title="">name</var>
- be the result of concatenating the string "<code title="">http://www.w3.org/1999/xhtml/custom#</code>" with <var title="">name</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. <a href=#refsRFC3987>[RFC3987]</a></li>
+ <dl><dt>If <var title="">name</var> is an <a href=#absolute-url>absolute
+ URL</a></dt>
- <li>
+ <dd>
<p>Generate the following triple:</p>
<dl class=triple><dt>subject <dd> <var title="">subject</var>
<dt>predicate <dd> <var title="">name</var>
<dt>object <dd> <var title="">value</var>
- </dl></li>
+ </dl></dd>
- </ol></li>
+ <dt>If <var title="">name</var> contains neither a U+003A COLON
+ character (:) nor a U+002E FULL STOP character (.)</dt>
+
+ <dd>
+
+ <ol><li><p>If <var title="">type</var> is the empty string, then
+ abort these substeps.</li>
+
+ <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
+ U+0023 NUMBER SIGN character (#), then append a U+0023 NUMBER
+ SIGN character (#) to <var title="">predicate</var>.</li>
+
+ <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>
+
+ <li>
+
+ <p>Generate the following triple:</p>
+
+ <dl class=triple><dt>subject <dd> <var title="">subject</var>
+ <dt>predicate <dd> the concatenation of the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" and <var title="">predicate</var>, with any characters in <var title="">predicate</var> that are not valid in the &lt;ifragment&gt; production of the IRI syntax being %-escaped <a href=#refsRFC3987>[RFC3987]</a>
+ <dt>object <dd> <var title="">value</var>
+ </dl></li>
+
+ </ol></dd>
+
+ <dt>Otherwise</dt>
+
+ <dd>
+
+ <p>Generate the following triple:</p>
+
+ <dl class=triple><dt>subject <dd> <var title="">subject</var>
+ <dt>predicate <dd> the concatenation of the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" and <var title="">name</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 <a href=#refsRFC3987>[RFC3987]</a>
+ <dt>object <dd> <var title="">value</var>
+ </dl></dd>
+
+ </dl></li>
</ol></li>
View
126 source
@@ -49356,7 +49356,7 @@ contradict people?
<p>When designing new vocabularies, identifiers can be created
either using <span title="URL">URLs</span>, <span title="valid
reversed DNS identifier">reversed DNS labels</span>, or, for
- properties, as plain words (with no dots or colons). For URLs
+ properties, as plain words (with no dots or colons). For URLs,
conflicts with other vocabularies can be avoided by only using
identifiers that correspond to pages that the author has control
over. Similarly, for reversed DNS labels conflicts can be avoided by
@@ -49646,7 +49646,7 @@ document.body.appendChild(outer);</pre>
<li>A <span>valid URL</span> that is an <span>absolute URL</span>
for which the string "<code
- title="">http://www.w3.org/1999/xhtml/custom#</code>" is not a
+ title="">http://www.w3.org/1999/xhtml/microdata#</code>" is not a
<span>prefix match</span>, or</li>
<li>A <span>valid reversed DNS identifier</span>.</li>
@@ -49724,7 +49724,7 @@ document.body.appendChild(outer);</pre>
<li>A <span>valid URL</span> that is an <span>absolute URL</span>
for which the string "<code
- title="">http://www.w3.org/1999/xhtml/custom#</code>" is not a
+ title="">http://www.w3.org/1999/xhtml/microdata#</code>" is not a
<span>prefix match</span>, or</li>
<li>A <span>valid reversed DNS identifier</span>, or</li>
@@ -52344,6 +52344,27 @@ END:VCARD</pre>
<h4>Licensing works</h4>
+<!--
+ <li><p>Otherwise, if <var title="">type</var> is <code
+ title="md-work">work</code>, and <var title="">name</var> is
+ equal to the string "<code title="md-work-title">title</code>",
+ let <var title="">name</var> be the string "<code
+ title="">http://purl.org/dc/elements/1.1/title</code>".</p></li>
+
+ <li><p>Otherwise, if <var title="">type</var> is <code
+ title="md-work">work</code>, and <var title="">name</var> is
+ equal to the string "<code
+ title="md-work-author">author</code>", let <var
+ title="">name</var> be the string "<code
+ title="">http://creativecommons.org/ns#attributionName</code>".</p></li>
+
+ <li><p>Otherwise, if <var title="">type</var> is <code
+ title="md-work">work</code>, and <var title="">name</var> is
+ equal to the string "<code
+ title="md-work-license">license</code>", let <var
+ title="">name</var> be the string "<code
+ title="">http://www.w3.org/1999/xhtml/vocab#license</code>".</p></li>
+-->
<p>An item with the <span>predefined type</span> <dfn
title="md-work"><code>work</code></dfn> represents a work (e.g. an
@@ -52725,7 +52746,7 @@ END:VCARD</pre>
<dl class="triple">
<dt>subject <dd> <span>the document's current address</span>
- <dt>predicate <dd> <code title="">http://www.w3.org/1999/xhtml/vocab#item</code>
+ <dt>predicate <dd> <code title="">http://www.w3.org/1999/xhtml/microdata#item</code>
<dt>object <dd> <var title="">item</var>
</dl>
@@ -52769,12 +52790,13 @@ END:VCARD</pre>
title="">subject</var> be a new blank node.</p></li>
<li><p>Let <var title="">type</var> be the <span>item type</span>
- of <var title="">item</var>.</p></li>
+ of <var title="">item</var>, or the empty string, if <var
+ title="">item</var> has no <span>item type</span>.</p></li>
<li><p>If <var title="">type</var> is neither the empty string nor
an <span>absolute URL</span>, then let <var title="">type</var> be
the result of concatenating the string "<code
- title="">http://www.w3.org/1999/xhtml/custom#</code>" with the <var
+ title="">http://www.w3.org/1999/xhtml/microdata#</code>" with the <var
title="">type</var>, with any characters in <var
title="">type</var> that are not valid in the &lt;ifragment>
production of the IRI syntax being %-escaped.</p></li>
@@ -52827,40 +52849,14 @@ END:VCARD</pre>
<p>For each name <var title="">name</var> in <var
title="">element</var>'s <span>property names</span>, run the
- following substeps:</p>
-
- <ol>
-<!--
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code title="md-work-title">title</code>",
- let <var title="">name</var> be the string "<code
- title="">http://purl.org/dc/elements/1.1/title</code>".</p></li>
+ appropriate substeps from the following list:</p>
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code
- title="md-work-author">author</code>", let <var
- title="">name</var> be the string "<code
- title="">http://creativecommons.org/ns#attributionName</code>".</p></li>
+ <dl>
- <li><p>Otherwise, if <var title="">type</var> is <code
- title="md-work">work</code>, and <var title="">name</var> is
- equal to the string "<code
- title="md-work-license">license</code>", let <var
- title="">name</var> be the string "<code
- title="">http://www.w3.org/1999/xhtml/vocab#license</code>".</p></li>
--->
- <li><p><!--Otherwise...--> If <var title="">name</var> is not
- an <span>absolute URL</span>, then let <var title="">name</var>
- be the result of concatenating the string "<code
- title="">http://www.w3.org/1999/xhtml/custom#</code>" with <var
- title="">name</var>, with any characters in <var
- title="">name</var> that are not valid in the &lt;ifragment>
- production of the IRI syntax being %-escaped. <a
- href="#refsRFC3987">[RFC3987]</a></p></li>
+ <dt>If <var title="">name</var> is an <span>absolute
+ URL</span></dt>
- <li>
+ <dd>
<p>Generate the following triple:</p>
@@ -52870,9 +52866,61 @@ END:VCARD</pre>
<dt>object <dd> <var title="">value</var>
</dl>
- </li>
+ </dd>
- </ol>
+ <dt>If <var title="">name</var> contains neither a U+003A COLON
+ character (:) nor a U+002E FULL STOP character (.)</dt>
+
+ <dd>
+
+ <ol>
+
+ <li><p>If <var title="">type</var> is the empty string, then
+ abort these substeps.</p></li>
+
+ <li><p>Let <var title="">predicate</var> have the same value
+ as <var title="">type</var>.</p></li>
+
+ <li><p>If <var title="">predicate</var> does not end in a
+ U+0023 NUMBER SIGN character (#), then append a U+0023 NUMBER
+ SIGN character (#) to <var title="">predicate</var>.</p></li>
+
+ <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>
+ production of the IRI syntax being %-escaped.</p></li>
+
+ <li>
+
+ <p>Generate the following triple:</p>
+
+ <dl class="triple">
+ <dt>subject <dd> <var title="">subject</var>
+ <dt>predicate <dd> the concatenation of the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" and <var title="">predicate</var>, with any characters in <var title="">predicate</var> that are not valid in the &lt;ifragment> production of the IRI syntax being %-escaped <a href="#refsRFC3987">[RFC3987]</a>
+ <dt>object <dd> <var title="">value</var>
+ </dl>
+
+ </li>
+
+ </ol>
+
+ </dd>
+
+ <dt>Otherwise</dt>
+
+ <dd>
+
+ <p>Generate the following triple:</p>
+
+ <dl class="triple">
+ <dt>subject <dd> <var title="">subject</var>
+ <dt>predicate <dd> the concatenation of the string "<code title="">http://www.w3.org/1999/xhtml/microdata#</code>" and <var title="">name</var>, with any characters in <var title="">name</var> that are not valid in the &lt;ifragment> production of the IRI syntax being %-escaped <a href="#refsRFC3987">[RFC3987]</a>
+ <dt>object <dd> <var title="">value</var>
+ </dl>
+
+ </dd>
+
+ </dl>
</li>

0 comments on commit 9d8a7b1

Please sign in to comment.