merge
authorTim L <lebot@rpi.edu>
Fri, 06 Jul 2012 12:43:58 -0400
changeset 3755 e632f456c211
parent 3754 a3189e6e2b0f (current diff)
parent 3753 4437c4928ad9 (diff)
child 3758 1c1e52d3b554
child 3759 fca7eecf90af
merge
--- a/model/grammar/ll.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/grammar/ll.html	Fri Jul 06 12:43:58 2012 -0400
@@ -487,7 +487,7 @@
 <td><a id="prod-prov_n_LL-extensibilityExpression" name="prod-prov_n_LL-extensibilityExpression"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">extensibilityExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> (( ( "," | ";" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/ll.js	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/grammar/ll.js	Fri Jul 06 12:43:58 2012 -0400
@@ -488,7 +488,7 @@
 '<td><a id="prod-extensibilityExpression" name="prod-extensibilityExpression"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">extensibilityExpression</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-extensibilityArgument">extensibilityArgument</a></span> ( ( "," | ";" ) <span class="prod"><a class="grammarRef" href="#prod-extensibilityArgument">extensibilityArgument</a></span> )* <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-extensibilityArgument">extensibilityArgument</a></span> ( "," <span class="prod"><a class="grammarRef" href="#prod-extensibilityArgument">extensibilityArgument</a></span> )* <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf	Fri Jul 06 12:43:58 2012 -0400
@@ -164,7 +164,7 @@
 [53] namespace ::= IRI_REF
 
 
-extensibilityExpression ::= QUALIFIED_NAME "(" extensibilityArgument ( ("," | ";") extensibilityArgument)* optionalAttributeValuePairs ")"
+extensibilityExpression ::= QUALIFIED_NAME "(" optionalIdentifier extensibilityArgument ( ","  extensibilityArgument)* optionalAttributeValuePairs ")"
 
 extensibilityArgument ::=
   ( identifierOrMarker | literal | timeZZ  | extensibilityExpression | extensibilityTuple ) 
--- a/model/grammar/yack/prov-n-LL.bnf.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Fri Jul 06 12:43:58 2012 -0400
@@ -486,7 +486,7 @@
 <td><a id="prod-prov_n_LL-extensibilityExpression" name="prod-prov_n_LL-extensibilityExpression"></a>[<span class="prodNo">54</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">extensibilityExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> (( ( "," | ";" ) <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-QUALIFIED_NAME">QUALIFIED_NAME</a></span> "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-extensibilityArgument">extensibilityArgument</a></span> ))* <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/prov-constraints.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/prov-constraints.html	Fri Jul 06 12:43:58 2012 -0400
@@ -1246,42 +1246,6 @@
 
 
 
-<hr />
-<p id='DELETE-unique-wasStartedBy_text'>
-The <span class="name">id</span> uniquely determines all of the other parameters to <span class="name">wasStartedBy</span>.
-</p>
-<div class='constraint' id='DELETE-unique-wasStartedBy'>
-<p>
-<span class='conditional'>IF</span> <span
-  class="name">wasStartedBy(id;a1,e1,a2,t,attrs)</span> and <span
-  class="name">wasStartedBy(id;a1',e',a2',t',attrs')</span>,  <span
-  class='conditional'>THEN</span> <span class="name">a1</span>=<span
-  class="name">a1'</span> and <span class="name">e</span>=<span
-  class="name">e'</span> and <span class="name">a2</span>=<span
-  class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>
- and <span class="name">attrs</span>=<span class="name">attrs'</span>.</p>
-</div> 
-
-
-
-
-
-<hr />
-<p id='DELETE-unique-wasEndedBy_text'>
-The <span class="name">id</span> uniquely determines all of the other parameters to <span class="name">wasEndedBy</span>.
-</p>
-<div class='constraint' id='DELETE-unique-wasEndedBy'>
-<p>
-<span class='conditional'>IF</span> <span
-  class="name">wasEndedBy(id;a1,e1,a2,t,attrs)</span> and <span
-  class="name">wasEndedBy(id;a1',e',a2',t',attrs')</span>,  <span
-  class='conditional'>THEN</span> <span class="name">a1</span>=<span
-  class="name">a1'</span> and <span class="name">e</span>=<span
-  class="name">e'</span> and <span class="name">a2</span>=<span
-  class="name">a2'</span> and <span class="name">t</span>=<span class="name">t'</span>
- and <span class="name">attrs</span>=<span class="name">attrs'</span>.</p>
-</div> 
-
 <div class="note">James: The unique-startTime and unique-endTime constraints
   are now redundant, by activity-start-end-inference and unique-wasStartedBy/unique-wasEndedBy.<br>
 Luc: Agreed. However, I feel it's easier to check these constraints than to infer new expressions, and then check constraints.</div>
--- a/model/prov-dm.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/prov-dm.html	Fri Jul 06 12:43:58 2012 -0400
@@ -3258,6 +3258,11 @@
 <pre class="codeexample">
  entity(ex:e1, [ prov:label="This is a human-readable label" ])
 </pre>
+
+<p>The following entity has two label attributes, in French and English.</p>
+<pre class="codeexample">
+ entity(ex:car01, [ prov:label="Voiture 01"@fr, prov:label="Car 01"@en ])
+</pre>
 </div>
 </section>
 
--- a/model/prov-n.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/model/prov-n.html	Fri Jul 06 12:43:58 2012 -0400
@@ -2495,7 +2495,21 @@
 
 <div class="anexample">
 <p>
-TODO: an example of extended syntax.</p>
+<a href="#component6">Collections</a> are sets of entities, whose membership can be expressed using the <span class="name">memberOf</span> relation.  The following example shows how one can express membership for an extension of Collections, namely sets of key-value pairs. The notation is a variation of that used for Collections membership, in which the elements of the set are pairs. The name of the relation is qualified with the extension-specific namespace <span class="name">http://example.org/dictionaries</span>.
+</p>
+<pre class="codeexample">
+  prefix dictExt &lt;http://example.org/dictionaries&gt;
+  dictExt:memberOf(mId; d, {(k1,e1), (k2,e2), (k3,e3)}, []) 
+</pre>
+
+Note that the generic <code class="content"><a class="grammarRef"
+ href="#prod-extensibilityExpression">extensibilityExpression</a></code> production  above allows for alternative notations to be used for expressing membership, if the designers of the extensions so desire. Here is an alternate syntax that is consistent with the productions:
+<pre class="codeexample">
+  prefix dictExt &lt;http://example.org/dictionaries&gt;
+  dictExt:memberOf(mid; d, dictExt:set(dictExt:pair(k1,e1), dictExt:pair(k2,e2), dictExt:pair(k3,e3), [dictExt:uniqueKeys="true"]) 
+</pre>
+
+  
 </div>
 
 
@@ -2598,7 +2612,7 @@
 <h3>Media Type</h3>
 
 <p>
-The media type of PROV-N is <span class="name">text/prov-n</span>. The content encoding of PROV-N content is UTF-8.
+The media type of PROV-N is <span class="name">text/provenance-notation</span>. The content encoding of PROV-N content is UTF-8.
 </p>
 
 <div class="note">
@@ -2615,15 +2629,15 @@
       <dd><a href="http://www.w3.org/2002/06/registering-mediatype">How to Register a Media Type for a W3C Specification</a></dd> 
       <dd><a href="http://www.w3.org/2001/tag/2002/0129-mime">Internet Media Type registration, consistency of use</a><br />TAG Finding 3 June 2002 (Revised 4 September 2002)</dd> 
     </dl> 
-    <p>The Internet Media Type / MIME Type for PROV-N is &quot;text/prov-n&quot;.</p> 
-    <p>It is recommended that PROV-N files have the extension &quot;.pn&quot; (all lowercase) on all platforms.</p> 
+    <p>The Internet Media Type / MIME Type for PROV-N is &quot;text/provenance-notation&quot;.</p> 
+    <p>It is recommended that PROV-N files have the extension &quot;.provn&quot; (all lowercase) on all platforms.</p> 
     <p>It is recommended that PROV-N files stored on Macintosh HFS file systems be given a file type of &quot;TEXT&quot;.</p> 
     <p>This information that follows has been <a href="TBD">submitted to the IESG</a> for review, approval, and registration with IANA.</p> 
     <dl> 
       <dt>Type name:</dt> 
       <dd>text</dd> 
       <dt>Subtype name:</dt> 
-      <dd>prov-n</dd> 
+      <dd>provenance-notation</dd> 
       <dt>Required parameters:</dt> 
       <dd>None</dd> 
       <dt>Optional parameters:</dt> 
@@ -2664,7 +2678,7 @@
       <dt>Magic number(s):</dt> 
       <dd>PROV-N documents may have the strings 'bundle' near the beginning of the document.</dd> 
       <dt>File extension(s):</dt> 
-      <dd>".pn"</dd> 
+      <dd>".provn"</dd> 
       <dt>Base URI:</dt> 
       <dd>There are no constructs in the PROV-N Syntax to change the Base IRI.</dd> 
       <dt>Macintosh file type code(s):</dt> 
--- a/primer/Primer.html	Fri Jul 06 12:43:36 2012 -0400
+++ b/primer/Primer.html	Fri Jul 06 12:43:58 2012 -0400
@@ -25,21 +25,27 @@
     "PROV-DM":
      "Luc Moreau, Paolo Missier"+
      "<a href=\"http://www.w3.org/TR/prov-dm/\"><cite>The PROV Data Model and Abstract Syntax Notation</cite></a>. "+
-     "Working Draft"+
+     "Working Draft, "+
      "URL: <a href=\"http://www.w3.org/TR/prov-dm/\">http://www.w3.org/TR/prov-dm/</a>",
 
     "PROV-O":
      "Satya Sahoo, Deborah McGuinness"+
      "<a href=\"http://www.w3.org/TR/prov-o/\"><cite>The PROV Ontology: Model and Formal Semantics</cite></a>. "+
-     "Working Draft"+
+     "Working Draft, "+
      "URL: <a href=\"http://www.w3.org/TR/prov-o/\">http://www.w3.org/TR/prov-o/</a>",
     
     "PROV-N":
      "Luc Moreau, Paolo Missier"+
      "<a href=\"http://www.w3.org/TR/prov-n/\"><cite>PROV-N: The PROV Notation</cite></a>. "+
-     "Working Draft"+
+     "Working Draft, "+
      "URL: <a href=\"http://www.w3.org/TR/prov-n/\">http://www.w3.org/TR/prov-n/</a>",
 
+    "PROV-AQ":
+     "Graham Klyne, Paul Groth"+
+     "<a href=\"http://www.w3.org/TR/prov-aq/\"><cite>PROV-AQ: Provenance Access and Query</cite></a>. "+
+     "Working Draft, "+
+     "URL: <a href=\"http://www.w3.org/TR/prov-aq/\">http://www.w3.org/TR/prov-aq/</a>",
+
     "TURTLE":
      "Eric Prud'hommeaux, Gavin Carothers"+
      "<a href=\"http://www.w3.org/TR/2011/WD-turtle-20110809/\"><cite>Turtle: Terse RDF Triple Language</cite></a>. "+
@@ -258,7 +264,7 @@
   </ul>
 
   <p>There are additional reference documents for PROV that are not covered in this 
-   primer, including the PROV Access and Query aspects of the specification (PROV-AQ), 
+   primer, including the PROV Access and Query aspects of the specification [[PROV-AQ]], 
    the constraints on the PROV data model (PROV-DM-CONSTRAINTS), 
    a formal semantics of the PROV data model (PROV-SEM), and the PROV XML notation 
    (PROV-XML). </p>
@@ -601,6 +607,11 @@
     which are first composing the data by region (<code>ex:compose</code>) and then generating the
     chart graphic (<code>ex:illustrate</code>).
    </p>
+   <!--p>
+    Further, the provenance describes the activities involved in generating chart from the data,
+    first composing the data by region (<code>ex:compose</code>) and then generating the
+    chart graphic (<code>ex:illustrate</code>).
+   </p -->
    <div class="turtle example">
     <div class="exampleheader">
      <span class="exampleheader"><b>Turtle Example</b></span></div>
@@ -1057,24 +1068,15 @@
     The government agency that produced GovData is concerned to know how long
     the incorrect chart was in circulation before the corrected chart was created.
     That is, they wish to compare the times at which the original and the corrected
-    charts were generated. Time of generation is expressed in PROV-O using a qualified
-    description of the generation. The snippet below shows that the second chart
+    charts were generated. The snippet below shows that the second chart
     was generated roughly a month after the first.
    </p>
    <div class="turtle example">
     <div class="exampleheader">
      <span class="exampleheader"><b>Turtle Example</b></span></div>
     <pre>
-     ex:chart1 prov:qualifiedGeneration [
-                    a prov:Generation ;
-                    prov:activity ex:compile ;
-                    prov:atTime   "2012-03-02T10:30:00"^^xsd:dateTime
-     ] .
-     ex:chart2 prov:qualifiedGeneration [
-                    a prov:Generation ;
-                    prov:activity ex:compile2 ;
-                    prov:atTime   "2012-04-01T15:21:00"^^xsd:dateTime
-     ] .
+     ex:chart1 prov:generatedAtTime "2012-03-02T10:30:00"^^xsd:dateTime .
+     ex:chart2 prov:generatedAtTime "2012-04-01T15:21:00"^^xsd:dateTime .
     </pre>
    </div>
    <div class="provn example" style="display:none">
@@ -1187,6 +1189,10 @@
     </pre>
    </div>
    <p>
+    Note that above we could have also
+    stated that <code>ex:articleV2</code> was a revision of <code>ex:articleV1</code>,
+    as we did between <code>ex:chart2</code> and <code>ex:chart1</code>,
+    which would describe more concretely how the alternate entities are related.
     Specialization and alternate relations connect entities, and so are visualized
     as links between them.
    </p>
Binary file primer/images/everything.png has changed
--- a/primer/images/everything.svg	Fri Jul 06 12:43:36 2012 -0400
+++ b/primer/images/everything.svg	Fri Jul 06 12:43:58 2012 -0400
@@ -22,7 +22,7 @@
    inkscape:export-ydpi="90"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs6"><linearGradient
        id="linearGradient3148"><stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -464,7 +464,7 @@
      showgrid="false"
      inkscape:zoom="0.87538929"
      inkscape:cx="677.59184"
-     inkscape:cy="527.95841"
+     inkscape:cy="436.5705"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -522,6 +522,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -556,6 +557,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.2454971,0,0,-1,65.32126,1035.0947)"
    id="g262-0"><path
@@ -584,6 +586,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,294.12,802.15)"
    id="g334"
@@ -609,6 +612,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.9368205,0,0,-1,-142.39394,1034.7)"
    id="g340"
@@ -650,6 +654,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,-175.5,1034.7)"
    id="g498"
@@ -725,6 +730,7 @@
 
 
 
+
 </g>
 
 
@@ -756,6 +762,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.71351425,0,0,-1,254.12833,1034.83)"
    id="g498-2"
@@ -792,6 +799,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,629.04784,802.28001)"
    id="g334-3"
@@ -812,6 +820,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.5826615,0,0,-1,38.212014,965.3546)"
    id="g936-0"
@@ -846,6 +855,7 @@
 
 
 
+
 </g><g
    id="g3270"
    transform="translate(0,-36.8)"><g
@@ -898,6 +908,7 @@
 
 
 
+
 </g><g
    transform="matrix(1,0,0,-1,-169.56841,991.0782)"
    id="g318"
@@ -948,6 +959,7 @@
 
 
 
+
 </g><text
    style="font-size:12px"
    y="-421.20554"
@@ -964,6 +976,7 @@
 
 
 
+
 <text
    style="font-size:11.99999905px"
    y="-654.78522"
@@ -980,6 +993,7 @@
 
 
 
+
 <path
    style="fill:none;stroke:#000000;stroke-width:0.92126256px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    d="M 506.9356,780.19235 79.473094,677.8999"
@@ -1018,6 +1032,7 @@
 
 
 
+
 <g
    transform="matrix(1,0,0,-1,-170.83865,906.41306)"
    id="g318-4"
@@ -1051,6 +1066,7 @@
 
 
 
+
 </g><path
    id="path344-6-9-2-6-1"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -1099,6 +1115,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.6167515,0,0,-1,-69.14114,1403.714)"
    id="g558"
@@ -1131,6 +1148,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.43309751,-0.00230963,0.02385816,-1.4614635,51.707733,1511.0808)"
    id="g572"
@@ -1182,6 +1200,7 @@
 
 
 
+
 <g
    transform="matrix(1.6167515,0,0,0.92048921,-60.257445,-125.07222)"
    id="g558-1-3"
@@ -1210,6 +1229,7 @@
 
 
 
+
 <g
    transform="matrix(0.43309751,0.00230963,0.02385816,1.4614635,60.59143,-253.39309)"
    id="g572-5-1"
@@ -1245,6 +1265,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.4146437,0,0,-0.84786888,92.069991,1075.8453)"
    id="g558-3"
@@ -1277,6 +1298,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.29192986,0.32279258,1.7382768,-0.60122387,-303.94221,938.06345)"
    id="g572-2"
@@ -1318,6 +1340,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.6837653,0.41048076,1.4796713,1.9262836,-179.39281,286.98448)"
    id="g572-2-5"
@@ -1359,6 +1382,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.62188296,0.39975874,1.3457576,1.8759678,-168.43478,203.36898)"
    id="g572-2-5-9"
@@ -1400,6 +1424,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.00870226,0.28186705,1.6936272,-0.18063826,-164.96914,810.84161)"
    id="g572-2-8"
@@ -1437,6 +1462,7 @@
 
 
 
+
 <g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1454,6 +1480,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1495,6 +1522,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1524,6 +1552,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1541,6 +1570,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -1580,6 +1610,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.0394571,0,0,-1,502.75321,1070.2623)"
    id="g936-0-2-1"
@@ -1611,6 +1642,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1653,6 +1685,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.9376888,0.34747621,0.34747621,-0.9376888,651.76262,989.27394)"
    id="g334-3-1-0"
@@ -1673,6 +1706,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1709,6 +1743,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.0611643,0,0,-1,-123.33092,1236.364)"
    id="g262-7-3"><path
@@ -1734,6 +1769,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1767,6 +1803,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1785,6 +1822,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -1825,6 +1863,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1858,6 +1897,7 @@
 
 
 
+
 </g><path
    sodipodi:type="arc"
    style="fill:#151b23;fill-opacity:0.97916667;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@@ -1902,6 +1942,7 @@
 
 
 
+
 </g><path
    id="path342-6-0-2"
    style="fill:none;stroke:#000000;stroke-width:1.27020955;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none"
@@ -1930,6 +1971,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.4146052,0,0,-0.84786888,359.52897,1054.7903)"
    id="g558-3-4-2"
@@ -1962,6 +2004,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.79741846,0.01415798,0.60418273,1.6898123,522.91277,437.9406)"
    id="g572-2-8-3"
@@ -1972,7 +2015,7 @@
      id="path574-8-4-9"
      style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:4, 4;stroke-dashoffset:0"
      d="M 108.5,240.6891 193.588,240" /></g><g
-   transform="matrix(1.4146052,0,0,-0.84786888,592.77844,1170.8109)"
+   transform="matrix(1.5156667,0,0,-0.84786888,590.04978,1170.8109)"
    id="g558-3-4-2-1"
    inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
    inkscape:export-xdpi="79.550438"
@@ -1993,7 +2036,7 @@
      y="-2"
      x="-22.0404"
      style="font-size:11px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:ArialMT;-inkscape-font-specification:ArialMT"
-     id="tspan3495-1-0-5">prov:atTime=</tspan><tspan
+     id="tspan3495-1-0-5">prov:generatedAtTime=</tspan><tspan
      sodipodi:role="line"
      y="11.75"
      x="-22.0404"
@@ -2003,6 +2046,7 @@
 
 
 
+
 </g><g
    transform="matrix(-0.4860202,-0.23750576,-0.18759351,1.1471291,727.3055,719.20578)"
    id="g572-2-8-3-2"
@@ -2054,6 +2098,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.0340166,0.0659249,2.399107,-0.03142758,-305.93401,1016.1301)"
    id="g572-2-5-1"
@@ -2099,6 +2144,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2146,6 +2192,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2179,6 +2226,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2211,6 +2259,7 @@
 
 
 
+
 <g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2227,6 +2276,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2260,6 +2310,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.2806619,0,0,-1,201.63694,1272.02)"
    id="g936-4-8-8"
@@ -2291,6 +2342,7 @@
 
 
 
+
 </g><path
    id="path344-6-9-0"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
@@ -2329,6 +2381,7 @@
      id="tspan338-76-2-3-2">specializationOf</tspan></text>
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -2351,6 +2404,7 @@
      id="tspan338-5-3-1">wasDerivedFrom</tspan></text>
 
 
+
 <path
    id="path344-6-9-0-5"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
Binary file primer/images/time.png has changed
--- a/primer/images/time.svg	Fri Jul 06 12:43:36 2012 -0400
+++ b/primer/images/time.svg	Fri Jul 06 12:43:58 2012 -0400
@@ -22,7 +22,7 @@
    inkscape:export-ydpi="90"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs6"><linearGradient
        id="linearGradient3148"><stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -482,6 +482,7 @@
 
 
 
+
 </g>
 
 
@@ -520,6 +521,7 @@
 
 
 
+
 <g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -538,6 +540,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -578,6 +581,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.0394571,0,0,-1,502.75321,1070.2623)"
    id="g936-0-2-1"
@@ -610,6 +614,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -653,6 +658,7 @@
 
 
 
+
 </g><g
    transform="matrix(0.9376888,0.34747621,0.34747621,-0.9376888,651.76262,989.27394)"
    id="g334-3-1-0"
@@ -674,6 +680,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -711,6 +718,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.0611643,0,0,-1,-123.33092,1236.364)"
    id="g262-7-3"><path
@@ -737,6 +745,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -771,6 +780,7 @@
 
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -790,6 +800,7 @@
 
 
 
+
 </g><path
    inkscape:connector-curvature="0"
    inkscape:export-ydpi="79.550438"
@@ -798,7 +809,7 @@
    d="m 300.35167,997.5632 8.21358,-5.9631 0.49111,6.951 -8.70469,-0.9879 z"
    style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
    id="path344-1-5-1" /><g
-   transform="matrix(1.4146052,0,0,-0.84786888,594.37844,1170.8109)"
+   transform="matrix(1.5156667,0,0,-0.84786888,591.64978,1170.8109)"
    id="g558-3-4-2-1"
    inkscape:export-filename="/home/lavm/papers/papers/prov-wg/hg/model/images/w3-publication1.png"
    inkscape:export-xdpi="79.550438"
@@ -819,7 +830,7 @@
      y="-2"
      x="-22.0404"
      style="font-size:11px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:ArialMT;-inkscape-font-specification:ArialMT"
-     id="tspan3495-1-0-5">prov:atTime=</tspan><tspan
+     id="tspan3495-1-0-5">prov:generatedAtTime=</tspan><tspan
      sodipodi:role="line"
      y="11.75"
      x="-22.0404"
@@ -830,6 +841,7 @@
 
 
 
+
 </g><g
    transform="matrix(1.694849,0,0,-1.5821629,158.89211,1431.5985)"
    id="g558-3-4-2-1-2"
@@ -873,6 +885,7 @@
 
 
 
+
 </g><path
    style="fill:none;stroke:#000000;stroke-width:0.65616947px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    d="m 304.6916,995.61216 71.60192,-29.59491"
@@ -913,6 +926,7 @@
      id="tspan4969">2012-03-02T10:30:00</tspan></text>
 
 
+
 </g><g
    transform="matrix(-0.79741846,0.01415798,0.60418273,1.6898123,518.66471,439.49058)"
    id="g572-2-8-3"
@@ -982,6 +996,7 @@
      style="font-size:11.19999981px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:ArialMT;-inkscape-font-specification:ArialMT">compile</tspan></text>
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1009,6 +1024,7 @@
      style="font-size:12px;font-variant:normal;font-weight:normal;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:ArialMT;-inkscape-font-specification:ArialMT">wasGeneratedBy</tspan></text>
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1024,6 +1040,7 @@
      id="tspan338-76">used</tspan></text>
 
 
+
 </g><g
    inkscape:export-ydpi="79.550438"
    inkscape:export-xdpi="79.550438"
@@ -1060,4 +1077,5 @@
      id="tspan4448-9-9-8-1">chart1</tspan></text>
 
 
+
 </g></g></svg>
\ No newline at end of file