--- a/model/working-copy/wd5-prov-dm-components.html Mon Mar 12 10:19:06 2012 +0000
+++ b/model/working-copy/wd5-prov-dm-components.html Mon Mar 12 11:17:46 2012 +0000
@@ -1934,17 +1934,43 @@
<section id="term-literal">
<h4>Value</h4>
-<div class='note'>
-Usually, in programming languages, Literal are a notation for values. So, Literals should probably be moved to the serialization. Here, instead, we should define the types of values. Thoughts?
-</div>
-
<p>
-A PROV-DM Literal represents a data value such as a particular string
-or number. A PROV-DM Literal represents a value whose interpretation is outside the scope of PROV-DM.
+By means of attribute-value pairs, the PROV data model can refer to values such as strings, numbers, time and IRIs.
+The interpretation of such values is outside the scope of PROV-DM.</p>
+Each kind of such values is called a <em>datatype</em>. Each datatype is identified by an IRI.</p>
+
+<p>The data types are taken from
+the set of XML Schema Datatypes, version 1.1 [[!XMLSCHEMA-2]] and the RDF specification [[!RDF-CONCEPTS]]. The normative definitions of these datatypes are provided by the respective specifications.
</p>
-
-<div class="anexample">
+<p>We note that PROV-DM <dfn title="dfn-time">time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA-2]].</p>
+
+
+
+<table border="1" style="margin-left: auto; margin-right: auto;">
+<caption>PROV-DM Data Types</caption>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#long">xsd:long</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#Name">xsd:Name</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#int">xsd:int</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NCName">xsd:NCName</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#short">xsd:short</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#NMTOKEN">xsd:NMTOKEN</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#byte">xsd:byte</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">xsd:unsignedLong</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">xsd:hexBinary</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedInt">xsd:unsignedInt</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">xsd:base64Binary</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedShort">xsd:unsignedShort</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">xsd:unsignedByte</a></td> </tr>
+</table>
+
+
+
+
+
+
+<div class="anexample" id="anexample-value">
<p>
The following examples respectively are the string "abc", the string "abc", the integer number 1, and the IRI "http://example.org/foo".
<pre class="codeexample">
@@ -1952,39 +1978,23 @@
1
"http://example.org/foo" %% xsd:anyURI
</pre>
-<p>The following example shows a literal of type <span class="name">xsd:QName</span> (see
+<p>The following example shows a value of type <span class="name">xsd:QName</span> (see
<a href="http://www.w3.org/TR/2004/REC-xmlschema-2-20041028/#QName">QName</a> [[!XMLSCHEMA-2]]).
The prefix <span class="name">ex</span> MUST be bound to a <a>namespace</a> declared in a <a>namespace declaration</a>.</p>
-<pre class="codeexample">
+<pre class="codeexample">
"ex:value" %% xsd:QName
</pre>
</div>
-
-
-
-
-
-<section id="term-Time">
-<h4>Time (to be folded in Value section)</h4>
-
-<div class='note'>
-It's a legacy of the charter that time is a top level section. Time is a specific kind of value, and should be folded into the "value" section.
-</div>
-
-
-<p><dfn title="dfn-time">Time instants</dfn> are defined according to xsd:dateTime [[!XMLSCHEMA-2]].</p>
-
-
-
-<p>Time is OPTIONAL in usage, generation, and activity</p>
-
-
-
-</section>
-
+<div class="anexample" id="anexample-time">
+<p>
+In the following example, the generation time of entity <span class="name">e1</span> is expressed according to
+<a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a> [[!XMLSCHEMA-2]].</p>
+<pre class="codeexample">
+ wasGeneratedBy(e1,a1, 2001-10-26T21:32:52)
+</pre>
</section>