merge
authorTim L <lebot@rpi.edu>
Tue, 10 Jul 2012 10:29:27 -0400
changeset 3883 afadc770c4df
parent 3882 d22e19e6476e (current diff)
parent 3881 16252dbed73f (diff)
child 3884 45b2a2405ca1
merge
--- a/model/prov-constraints.html	Tue Jul 10 10:29:13 2012 -0400
+++ b/model/prov-constraints.html	Tue Jul 10 10:29:27 2012 -0400
@@ -1030,7 +1030,7 @@
         <div class='inference' id="specialization-irreflexive">
 <p>
     For any entity <span class='name'>e</span>, it is not the case that
-    have <span class='name'>specializationOf(e,e)</span>.</p>
+<span class='name'>specializationOf(e,e)</span> holds.</p>
     </div>
 
 <p>
@@ -1926,7 +1926,7 @@
   validity checking</div>
 
   We define a
-notion of <a>normalization</a>, <a>validity</a> and <a>equivalence</a> of PROV instancess.  Equivalence has the following characteristics:
+notion of <a>normalization</a>, <a>validity</a> and <a>equivalence</a> of PROV instances.  Equivalence has the following characteristics:
 
 
 <ul>
@@ -1961,15 +1961,24 @@
 <div id="optional-attributes1">
 <p>PROV-N allows some statement parameters and attributes to
   be optional. Unless otherwise specified, when an
-  optional attribute is not present in a statement, some value
-  SHOULD be inferred for this attribute.</p>
+  optional attribute is not present in a statement, it has a default
+  value.</p>
 
-  The only exception is:
+  The only exceptions are:
   <ul>
 <li><div id="optional-attributes4">In an association of the form
-  <span class="name">wasAssociatedWith(a, ag,-,attr)</span>, the
+  <span class="name">wasAssociatedWith(id;a, ag,-,attr)</span>, the
   absence of a plan means: either no plan exists, or a plan exists but
-  it is not identified.</div></li>
+  it is not identified.  Thus, it is not equivalent to <span
+  class="name">wasAssociatedWith(id;a, ag,p,attr)</span> where a
+  plan <span class="name">p</span> is given.</div></li>
+  <li><div id="optional-attributes4">In an association of the form
+  <span class="name">wasDerivedFrom(id;e1, a,e2,attr)</span>, the
+  absence of the optional activity, generation and use identifiers
+  means that the derivation relationship may encompass multiple activities,
+generations, and uses.  Thus, it is not equivalent to <span
+  class="name">wasDerivedFrom(id;e1,e2,a,g,u,attr)</span> where some
+  activity, generation and use are given explicitly.</div></li>
 </div></li>
    </ul>
 </div>
--- a/model/prov-n.html	Tue Jul 10 10:29:13 2012 -0400
+++ b/model/prov-n.html	Tue Jul 10 10:29:27 2012 -0400
@@ -32,10 +32,6 @@
 	border-color: gray;
 	-moz-border-radius: ;
 }
-.grammarRef {
-    font-family: "Consolas", "Inconsolata", "Liberation", "Monaco", "Monospace", monospace ;
-    text-size: 90% ;
-}
 </style>
 
     <script src="grammar/ll.js" class="remove"></script>
@@ -504,48 +500,69 @@
 
 <p>The grammar is specified using a subset of the Extended Backus-Naur
 Form (EBNF) notation, as defined in Extensible Markup Language (XML) 1.1
-[[XML11]] section <a
+[[!XML11]] section <a
 href="http://www.w3.org/TR/2006/REC-xml11-20060816/#sec-notation">6
 Notation</a>.
 </p>
 
 <p>
-The below provides an introduction to the EBNF notation used in
+The text below provides an introduction to the EBNF notation used in
 this document.</p>
-<div class="grammar">
+
+
+<p>
   EBNF specifies a series of production rules (<dfn>production</dfn>). 
-  Each production rule in the grammar defines a symbol <span
-  class="nonterminal">E</span> (the <dfn>non-terminal symbol</dfn>)
+A production rule in the grammar defines a symbol 
+ <code class="grammarRef">expr</code>  (<dfn>non-terminal symbol</dfn>)
   using the following form:</p>
 
-<span class="nonterminal">E</span>&nbsp;::= <em>term</em>
+
+<div class='grammar'>
+ <code class="grammarRef">expr</code> &nbsp;::= <em>term</em>
+</div>
+<p>Symbols are written with an initial capital letter if they are the start symbol of a regular language, otherwise with an initial lowercase letter. 
+A production rule in the grammar defines a symbol 
+ <code class="grammarRef">&lt;TERMINAL&gt;</code>  (<dfn>terminal symbol</dfn>)
+  using the following form:</p>
+<div class='grammar'>
+ <code class="grammarRef">&lt;TERMINAL&gt;</code> &nbsp;::= <em>term</em>
+</div>
+
+
+
+
 
 <p>Within the term on the right-hand side of a rule, the following
 <em>term</em>s are used to match strings of one or more characters:
 <ul>
 <li> 
-<span class="nonterminal">E</span>: matches production for non-terminal symbol E.
-</li>
-
-<li> 
-<span class="name">abc</span>: matches the literal string inside the single quotes.
+ <code class="grammarRef">expr</code>: matches production for non-terminal symbol <code class="grammarRef">expr</code>
 </li>
 
 
 <li> 
-<span class="optional"><em>term</em></span>: optional, matches <em>term</em> or nothing.
+ <code class="grammarRef">TERMINAL</code>: matches production for terminal symbol <code class="grammarRef">TERMINAL</code>
 </li>
 
 <li> 
-<span class="plus"><em>term</em></span>: matches one or more occurrences of <em>term</em>.
+ <code class="grammarRef">"abc"</code>: matches the literal string inside the single quotes.
+</li>
+
+
+<li> 
+ <code class="grammarRef">(term)?</code>: optional, matches <em>term</em> or nothing.
 </li>
 
 <li> 
-<span class="star"><em>term</em></span>: matches zero or more occurrences of <em>term</em>.
+ <code class="grammarRef">(term)+</code>: matches one or more occurrences of <em>term</em>.
 </li>
 
 <li> 
-<span class="choice"><em>term</em> | <em>term</em></span>: matches one of the two <em>terms</em>.
+ <code class="grammarRef">(term)*</code>: matches zero or more occurrences of <em>term</em>.
+</li>
+
+<li> 
+ <code class="grammarRef">(term | term)</code>: matches one of the two <em>terms</em>.
 </li>
 
 </ul>
@@ -2151,13 +2168,13 @@
 -->
 
 
-<p>A PROV-N qualified name <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> has a more permissive syntax then XML's <code class="content"><a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a></code> [[!XML-NAMES]]
+<p>A PROV-N qualified name (production <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code>) has a more permissive syntax then XML's <code class="content"><a href="http://www.w3.org/TR/2009/REC-xml-names-20091208/#NT-QName">QName</a></code> [[!XML-NAMES]]
 and SPARQL <code class="content"><a href="http://www.w3.org/TR/2008/REC-rdf-sparql-query-20080115/#rPrefixedName">PrefixedName</a></code> [[!RDF-SPARQL-QUERY]]. 
-A PROV-N qualified name <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> consists of a prefix and a local part. Prefixes follow the production <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <code class="content"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></code>, which extends the original SPARQL <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a></code> definition 
+A <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> consists of a prefix and a local part. Prefixes follow the production <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> defined by SPARQL [[!RDF-SPARQL-QUERY]]. Local parts have to be conformant with <code class="content"><a class="grammarRef" href="#prod-PN_LOCAL">PN_LOCAL</a></code>, which extends the original SPARQL <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_LOCAL">PN_LOCAL</a></code> definition 
 by allowing further characters (see <code class="content"><a class="grammarRef" href="#prod-PN_CHARS_OTHERS">PN_CHARS_OTHERS</a></code>):</p>
 <ul>
 <li> an extra set of characters commonly encountered in IRIs;
-<li> %-escaped charaters (see <code class="content"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></code>) to be interpreted as per
+<li> %-escaped characters (see <code class="content"><a class="grammarRef" href="#prod-PERCENT">PERCENT</a></code>) to be interpreted as per
  Section 3.1.  Mapping of IRIs to URIs in [[!RFC3987]];</li>
 <li> and \-escaped characters (see <code class="content"><a class="grammarRef" href="#prod-PN_CHARS_ESC">PN_CHARS_ESC</a></code>).</li>
 </ul>
@@ -2251,7 +2268,11 @@
 </div>
 
 
-<p><b>Note:</b>The productions for  <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and  <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> are conflicting.  In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a parser should give precedence to the production for <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
+<p><b>Note:</b>The productions for the terminals  <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and  <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code> are conflicting.
+Indeed,  for a tokenizer operating independently of the parse tree, <code>abc</code> matches both 
+<code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and
+<code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
+  In the context of a <code class="content"><a class="grammarRef" href="#prod-namespaceDeclaration">namespaceDeclaration</a></code>, a tokenizer should give  preference to the production <code class="content"><a class="grammarRef" href="http://www.w3.org/TR/rdf-sparql-query/#rPN_PREFIX">PN_PREFIX</a></code>.
 </p>
 
 
@@ -2332,11 +2353,10 @@
 <p> In particular, a Literal may be an IRI-typed string (with datatype <span class="name">xsd:anyURI</span>);  such IRI has no specific interpretation in the context of PROV.</p>
 
 
-<p><b>Note:</b>The productions for <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code> and
+<p><b>Note:</b>The productions for terminals <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> and
 <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> are conflicting.  
-Indeed <code>1234</code> can be both a <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> and a <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></code> (without prefix).  To resolve this conflict,
-in the context of the production
-<code class="content"><a class="grammarRef" href="#prod-literal">literal</a></code>, a parser SHOULD give precedence to the production for
+Indeed, for a tokenizer operating independently of the parse tree, <code>1234</code> matches both <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code> and <code class="content"><a class="grammarRef" href="#prod-QUALIFIED_NAME">QUALIFIED_NAME</a></code> (local name without prefix). In the context of
+a <code class="content"><a class="grammarRef" href="#prod-convenienceNotation">convenienceNotation</a></code>, a tokenizer should give preference to the production
 <code class="content"><a class="grammarRef" href="#prod-INT_LITERAL">INT_LITERAL</a></code>. 
 </p>