--- a/model/diff.html Fri Nov 16 16:23:34 2012 +0000
+++ b/model/diff.html Fri Nov 16 16:24:31 2012 +0000
@@ -1033,457 +1033,7 @@
pre.sh_sourceCode .sh_paren { color: red; }
pre.sh_sourceCode .sh_attribute { color: #006400; }
-</style><style type="text/css"><span class="insert">
-/* --- EDITORIAL NOTES --- */
-.component1-color {
- background-color: rgba(255,42,42,0.2);
-}
-
-.component3-color {
- background-color: rgba(0,68,170,0.2);
-}
-
-.component2-color {
- background-color: rgba(0,170,0,0.2);
-}
-.component4-color {
- background-color: rgba(244,105,14,0.2);
-}
-
-.component6-color {
- background-color: rgba(11,40,40,0.2);
-}
-
-.component5-color {
- background-color: rgba(204,255,0,0.2);
-}
-
-.pending {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #f00;
- background: #BFEFFF;
-}
-
-.pending::before {
- content: "Pending Review";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-
-.resolved {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #f00;
- background: #9BCD9B;
-}
-
-.resolved::before {
- content: "Resolved";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-
-.inference {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #f00;
- background: #fff;
-}
-
-.inference[id]::before {
- content: "Inference: " attr(id);
- width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
-}
-
-
-.inference::before {
- content: "Inference";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-.syntax {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #f00;
- background: #fff;
-}
-
-.syntax[id]::before {
- content: "Syntax: " attr(id);
- width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
-}
-
-
-.syntax::before {
- content: "Syntax";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-.unamedconstraint {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #00f;
- background: #fff;
-}
-
-
-.unamedconstraint::before {
- content: "Constraint";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #00f;
- background: #fff;
- padding: 3px 1em;
-}
-
-
-
-.constraint {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #00f;
- background: #fff;
-}
-
-.constraint[id]::before {
- content: "Constraint: " attr(id);
- width: 380px; /* How can we compute the length of "Constraint: " attr(id) */
-}
-
-
-.constraint::before {
- content: "Constraint";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #00f;
- background: #fff;
- padding: 3px 1em;
-}
-
-
-
-.interpretation {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #00f;
- background: #fff;
-}
-
-.interpretation[id]::before {
- content: "Interpretation: " attr(id);
- width: 380px; /* How can we compute the length of "Interpretation: " attr(id) */
-}
-
-
-.interpretation::before {
- content: "Interpretation";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #00f;
- background: #fff;
- padding: 3px 1em;
-}
-
-.definition {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #777;
- background: #fff;
-}
-
-.definition[id]::before {
- content: "Definition: " attr(id);
- width: 380px;
-}
-
-
-.definition::before {
- content: "Definition";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #000;
- background: #fff;
- padding: 3px 1em;
-}
-
-
-.deprecatedconstraint {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #00f;
- background: #fff;
-}
-
-.deprecatedconstraint[id]::before {
- content: "Deprecated: " attr(id);
- width: 380px; /* How can we compute the length of "Deprecatedconstraint: " attr(id) */
-}
-
-
-.deprecatedconstraint::before {
- content: "Deprecated";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #00f;
- background: #fff;
- padding: 3px 1em;
-}
-
-.glossary-ref {
- font-style: italic;
-}
-
-.dfn {
- font-weight: bold;
-}
-
-
-.attribute {
- font-style: italic;
-}
-
-
-.conditional {
- color: blue;
-}
-
-.grammar {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding-left: 1ex;
- padding-right: 1ex;
- padding-top: 1ex;
- padding-bottom: 0.6ex;
- border: 1px dashed #2f6fab;
- font-size: 80%;
-}
-.nonterminal {
- font-weight: bold;
- font-family: sans-serif;
- font-size: 95%;
-}
-
-.name {
- font-family: monospace;
-}
-
-
-.xmpl {
- padding: 1em;
- margin: 1em 0em 0em;
- border: 1px solid #f00;
- background: #fff;
-}
-
-.xmpl::before {
- content: "Example";
- display: block;
- width: 150px;
- margin: -1.5em 0 0.5em 0;
- font-weight: bold;
- border: 1px solid #f00;
- background: #fff;
- padding: 3px 1em;
-}
-
-/*
-generating this through java script now.
-
-.anexample[data-count]::before {
- content: "Example " attr(data-count) ;
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-
-.anexample:before {
- content: "Example:";
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-*/
-
-.anexample {
- margin-top: 1ex;
- margin-bottom: 1ex;
- padding-left: 1ex;
- padding-right: 1ex;
- padding-top: 1ex;
- padding-bottom: 0.6ex;
- border: 1px dashed #2f6fab;
- background-color: #f9f9f9;
-}
-.anexample table {
- background-color: #f9f9f9;
-}
-
-.anexampleTitle {
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-.anexampleTitle {
- font-family: sans-serif;
- font-size: 1.6ex;
- font-weight: bold;
-}
-
-
-.diamond {
- font-weight: normal;
- font-size:100%;
- font-family: sans-serif;
-}
-
-
-div[class="grammar"] span[class="name"]:before {
- content: "'";
-}
-
-div[class="grammar"] span[class="name"]:after {
- content: "'";
-}
-
-
-div[class="grammar"] span[class="optional"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="optional"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")?";
-}
-
-
-div[class="grammar"] span[class="plus"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="plus"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")+";
-}
-
-
-div[class="grammar"] span[class="star"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="star"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")*";
-}
-
-div[class="grammar"] span[class="choice"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="choice"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")";
-}
-
-div[class="grammar"] span[class="group"]:before {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: "(";
-}
-
-div[class="grammar"] span[class="group"]:after {
- font-weight: normal;
- font-size:130%;
- font-family: monospace;
- content: ")";
-}
-
-table {
- background-color: #f9f9f9;
-}
-
-
-.interpretation-forward::before {
- content: "Interpretation: ";
- font-weight: bold;
-}
-
-.structural-forward::before {
- content: "Structural constraint: ";
- font-weight: bold;
-}
-
-.essential {
- font-weight: bold;
-}
-
-.provType::before {
-}
-
-.pnExpression {
- font-weight: normal;
- font-size:120%;
- font-family: monospace;
-}
-</span></style><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
+</style><link href="./extra-dm.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
<body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle"><a href="diff.html"><span class="insert">Changes</span></a><span class="insert"> since LC release</span></h2><h2 id="w3c-editor-s-draft-16-november-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">16 November</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><span class="delete"> (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
<dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
<dt><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
@@ -2599,11 +2149,13 @@
<area title="agents/responsibility" href="#component3" coords="134,0,201,67" alt="agents/responsibility" shape="rect">
<area title="derivations" href="#component2" coords="201,0,268,201" alt="derivations" shape="rect">
<area title="derivations" href="#component2" coords="134,67,201,201" alt="derivations" shape="rect">
-<area title="alternate" href="#component5" coords="268,0,335,67" alt="alternate" shape="rect">
+
+
+
<area title="alternate" href="#component5" coords="335,0,402,201" alt="alternate" shape="rect">
<area title="collections" href="#component6" coords="402,0,469,201" alt="collections" shape="rect">
<area title="activities/entities" href="#component1" coords="67,201,469,268" alt="activities/entities" shape="rect">
-<area title="bundles" href="#component4" coords="268,67,402,201" alt="bundles" shape="rect">
+<area title="bundles" href="#component4" coords="268,0,402,201" alt="bundles" shape="rect">
</map>
<br>
<span class="figcaption" id="prov-dm-components">Figure 4<sup><a class="internalDFN" href="#prov-dm-components"><span class="diamond"> ◊:</span></a></sup> PROV-DM Components<span class="insert"> (Informative)</span></span>
@@ -4976,7 +4528,7 @@
-<div id="GOOGLE_INPUT_CHEXT_FLAG" style="display: none; "></div><div id="references" class="appendix section"><h2><span class="secno"><span class="delete">C.</span><span class="insert">D.</span> </span>References</h2><div id="normative-references" class="section"><h3><span class="secno"><span class="delete">C.1</span><span class="insert">D.1</span> </span>Normative references</h3><dl class="bibliography"><dt id="bib-IRI">[IRI]</dt><dd>M. Duerst, M. Suignard. <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers (IRI).</cite></a> January 2005. Internet RFC 3987. URL: <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3987.txt</a>
+<div id="references" class="appendix section"><h2><span class="secno"><span class="delete">C.</span><span class="insert">D.</span> </span>References</h2><div id="normative-references" class="section"><h3><span class="secno"><span class="delete">C.1</span><span class="insert">D.1</span> </span>Normative references</h3><dl class="bibliography"><dt id="bib-IRI">[IRI]</dt><dd>M. Duerst, M. Suignard. <a href="http://www.ietf.org/rfc/rfc3987.txt"><cite>Internationalized Resource Identifiers (IRI).</cite></a> January 2005. Internet RFC 3987. URL: <a href="http://www.ietf.org/rfc/rfc3986.txt">http://www.ietf.org/rfc/rfc3987.txt</a>
</dd><dt id="bib-PROV-CONSTRAINTS"><span class="insert">[PROV-CONSTRAINTS]</span></dt><dd><span class="insert">James Cheney, Paolo Missier, and Luc Moreau (eds.), Tom De Nies. </span><a href="http://www.w3.org/TR/2012/CR-prov-constraints-20121211/"><cite><span class="insert">Constraints of the PROV Data Model</span></cite></a><span class="insert">. 2012, Candidate Recommendation. URL: </span><a href="http://www.w3.org/TR/2012/CR-prov-constraints-20121211/"><span class="insert">http://www.w3.org/TR/2012/CR-prov-constraints-20121211/</span></a><span class="insert">.
</span></dd><dt id="bib-PROV-N"><span class="insert">[PROV-N]</span></dt><dd><span class="insert">Luc Moreau and Paolo Missier (eds.) James Cheney, Stian Soiland-Reyes. </span><a href="http://www.w3.org/TR/2012/CR-prov-n-20121211/"><cite><span class="insert">PROV-N: The Provenance Notation</span></cite></a><span class="insert">. 2012, Candidate Recommendation. URL: </span><a href="http://www.w3.org/TR/2012/CR-prov-n-20121211/"><span class="insert">http://www.w3.org/TR/2012/CR-prov-n-20121211/</span></a><span class="insert">.
</span></dd><dt id="bib-PROV-O"><span class="insert">[PROV-O]</span></dt><dd><span class="insert">Timothy Lebo, Satya Sahoo and Deborah McGuinness (eds.) Khalid Belhajjame, James Cheney, David Corsar, Daniel Garijo, Stian Soiland-Reyes, Stephan Zednik, and Jun Zhao. </span><a href="http://www.w3.org/TR/2012/CR-prov-o-20121211/"><cite><span class="insert">Provenance Formal Model</span></cite></a><span class="insert">. 2012, Candidate Recommendation. URL: </span><a href="http://www.w3.org/TR/2012/CR-prov-o-20121211/"><span class="insert">http://www.w3.org/TR/2012/CR-prov-o-20121211/</span></a><span class="insert">.