--- a/model/ProvenanceModel.html Fri Dec 02 19:45:49 2011 -0500
+++ b/model/ProvenanceModel.html Mon Dec 05 11:17:32 2011 +0000
@@ -2376,34 +2376,31 @@
<p>In PROV-ASN, a Literal's text matches the <span class="nonterminal">Literal</span> production of the grammar defined in this specification document.</p>
<div class='grammar'>
-<span class="nonterminal">Literal</span> ::= <span class="nonterminal">typedLiteral</span> | <span class="nonterminal">stringConvenienceNotation</span> </br>
+<span class="nonterminal">Literal</span> ::= <span class="nonterminal">typedLiteral</span> | <span class="nonterminal">convenienceNotation</span> </br>
<span class="nonterminal">typedLiteral</span> ::= <span class="nonterminal">quotedString</span> <span class="name">%%</span> <span class="nonterminal">datatype</span></br>
-<span class="nonterminal">datatype</span> ::= <span class="nonterminal">IRI</span></br>
-<span class="nonterminal">IRI</span> ::= <em>an IRI compatible with production IRI in [[!IRI]] </em>
-</br>
-<span class="nonterminal">stringConvenienceNotation</span> ::= <span class="nonterminal">stringLiteralNoLanguage</span> | <span class="nonterminal">stringLiteralWithLanguage</span></br>
-<span class="nonterminal">stringLiteralNoLanguage</span> ::= <span class="nonterminal">quotedString</span></br>
-<span class="nonterminal">stringLiteralWithLanguage</span> ::= <span class="nonterminal">quotedString</span> <span class="nonterminal">languageTag</span></br>
-
-<span class="nonterminal">languageTag</span> ::= <em>@ (U+40) by followed a nonempty sequence of characters matching the langtag production from [[!BCP47]]</em>
+<span class="nonterminal">datatype</span> ::= <span class="nonterminal">qualifiedName</span></br>
+<span class="nonterminal">convenienceNotation</span> ::= <span class="nonterminal">stringLiteral</span> | <span class="nonterminal">intLiteral</span></br>
+<span class="nonterminal">stringLiteral</span> ::= <span class="nonterminal">quotedString</span></br>
+<span class="nonterminal">quotedString</span> ::= <em>a finite sequence of characters in which " (U+22) and \ (U+5C) occur only in pairs of the form \" (U+5C, U+22) and \\ (U+5C, U+5C), enclosed in a pair of " (U+22) characters</em></br>
+<span class="nonterminal">intLiteral</span> ::= <em>a finite-length sequence of decimal digits (#x30-#x39) with an optional leading negative sign (-)</em>
</div>
-<p>The non terminals <span class="nonterminal">stringLiteralNoLanguage</span> and
-<span class="nonterminal">stringLiteralWithLanguage</span>
-are syntactic sugar for quoted strings with datatype <span class="name">xsd:string</span>.
+<p>The non terminals <span class="nonterminal">stringLiteral</span> and
+<span class="nonterminal">intLiteral</span>
+are syntactic sugar for quoted strings with datatype <span class="name">xsd:string</span> and <span class="name">xsd:int</span>, respectively.
</p>
-<p> In particular, a PROV-DM Literal may be a IRI-typed string (with datatype <span class="name">xsd:anyURI</span>); such IRI has no specific interpretation in the context of PROV-DM.</p>
+<p> In particular, a PROV-DM 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-DM.</p>
<div class="anexample">
<p>
-The following examples respectively are the string "abc", the string "abc" with language english, the string "abc", the integer number "1", and the IRI "http://example.org/foo".
+The following examples respectively are the string "abc" (expressed using the convenience notation), the string "abc", the integer number '1', the integer number '1' (expressed using the convenience notation) and the IRI "http://example.org/foo".
<pre class="codeexample">
"abc"
- "abc"@en
"abc" %% xsd:string
"1" %% xsd:int
+ 1
"http://example.org/foo" %% xsd:anyURI
</pre>
The following example shows a literal of type <span class="name">xsd:QName</span> (see
@@ -2447,6 +2444,8 @@
<div class='grammar'>
<span class="nonterminal">asserter</span> ::= <span class="nonterminal">IRI</span>
+<span class="nonterminal">IRI</span> ::= <em>an IRI compatible with production IRI in [[!IRI]], enclosed in a pair of < (U+3C) and > (U+3E) characters </em>
+</br>
</div>
<div class='note'>
@@ -3245,6 +3244,7 @@
<section class="appendix">
<h2>Changes Since First Public Working Draft</h2>
<ul>
+<li>12/05/11: Simplified Typed literals, now allows for intLiteral, and datatype adjusted to be qualified name. </li>
<li>11/29/11: Introduced typed identifiers to make grammar clearer. </li>
<li>11/29/11: Added section 2.4 on grammar notation. </li>
<li>11/28/11: Changed grammar notation. </li>