merge
authorGavin Carothers <gavin@carothers.name>
Wed, 21 Mar 2012 15:19:22 -0700
changeset 233 c89072ddaf29
parent 232 16f4212e6aa6 (current diff)
parent 229 e04c5aa64336 (diff)
child 234 1d6261d221b7
merge
rdf-turtle/index.html
--- a/rdf-turtle/index.html	Wed Mar 21 15:15:17 2012 -0700
+++ b/rdf-turtle/index.html	Wed Mar 21 15:19:22 2012 -0700
@@ -110,9 +110,9 @@
     pre.example script {
         display:block;
     }
-    #term2escape thead tr th { border:1px solid black; padding: .2em; }
-    #term2escape tbody tr td { border:1px solid black; text-align: center; }
-    #term2escape tbody tr td.r { text-align: right; padding: .5em; }
+    .separated thead tr th { border:1px solid black; padding: .2em; }
+    .separated tbody tr td { border:1px solid black; text-align: center; }
+    .separated tbody tr td.r { text-align: right; padding: .5em; }
     </style> 
 	
     </head>
@@ -358,8 +358,8 @@
 <http://example.org/path> a doc:Document .
                 </script></pre>
 				</section>
-				<section id="abbrev">
-				<h3 >Abbreviating common datatypes</h3>
+				<section id="abbrev" class="issue">
+				<h3 >Abbreviating common datatypes <span style="color: red;">old</span></h3>
 				<p>A few of the RECOMENDED <a href="../rdf-concepts/index.html#xsd-datatypes">built-in datatypes</a> can be written in Turtle without using the datatype syntax.</p>
 
 				<p>Decimal integers may be written without quotation marks or a 
@@ -431,6 +431,72 @@
 "false"^^<http://www.w3.org/2001/XMLSchema#boolean>
 				</script></pre>
 			</section>
+				<section id="abbrevB" class="issue">
+				<h3 >Abbreviating common datatypes <span style="color: green;">new</span></h3>
+				<p>Integer values, arbitrary precision decimal values, double precision floating point values and boolean values may be written without quotes or datatypes as follows:</p>
+				<ul>
+				  <li>
+				    Integer values may be written as an option sign and a series of digits matching the regular expression "[0-9]+". The terms <code>-5</code>, <code>0</code>, <code>1</code>, <code>10</code>, <code>010</code> and <code>+10</code> represent RDF literals with the datatype <a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a>..
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Arbitrary-precision decimals may be written as an option sign, zero or more digits, a decimal point and one or more digits. Decimals match the regular expression "[0-9]*\.[0-9]+". The terms <code>-5.0</code>, <code>.0</code>, <code>1.234567890</code>, <code>010.0</code> and <code>+10.0</code> represent RDF literals with the datatype <a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a>..
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Double-precision floating point values may be written as an option sign, a mantissa with an optional decimal point, the letter "e" or "E", and an integer exponent with an optional sign.
+				    The exponent matches the regular expression "[eE][+-]?[0-9]+" and the mantissa one of these regular expressions: "[0-9]+\.[0-9]+", "\.[0-9]+" or "[0-9]". The terms <code>-.5e1</code>, <code>0E0</code>, <code>1.234567890E0</code>, <code>01e1</code> and <code>+10e0</code> represent RDF literals with the datatype <a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a>.
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Boolean values may be written as either <code>true</code> or <code>false</code> (case-sensitive) and represent RDF literals with the datatype <a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a>.
+				  </li>
+				</ul>
+			</section>
+				<section id="abbrevC" class="issue">
+				<h3 >Abbreviating common datatypes <span style="color: orange;">table</span></h3>
+				<p>Integer values, arbitrary precision decimal values, double precision floating point values and boolean values may be written without quotes or datatypes as follows:</p>
+				<ul>
+				  <li>
+				    Integer values may be written as an option sign and a series of digits matching the regular expression "[0-9]+".
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Arbitrary-precision decimals may be written as an option sign, zero or more digits, a decimal point and one or more digits. Decimals match the regular expression "[0-9]*\.[0-9]+".
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Double-precision floating point values may be written as an option sign, a mantissa with an optional decimal point, the letter "e" or "E", and an integer exponent with an optional sign.
+				    The exponent matches the regular expression "[eE][+-]?[0-9]+" and the mantissa one of these regular expressions: "[0-9]+\.[0-9]+", "\.[0-9]+" or "[0-9]".
+				  </li>
+
+				  <li style="padding-top: 1ex;">
+				    Boolean values may be written as either <code>true</code> or <code>false</code> (case-sensitive) and represent RDF literals with the datatype <a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a>.
+				  </li>
+				</ul>
+
+				<table class="separated">
+				  <caption>Example numeric representations:</caption>
+				  <tbody>
+				    <tr><th><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></th>
+				    <td><code>-5</code></td> <td><code>0</code></td> <td><code>1</code></td> <td><code>010</code></td> <td><code>+10</code></td></tr>
+				    <tr><th><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></th>
+				    <td><code>-5.0</code></td> <td><code>.0</code></td> <td><code>1.234567890</code></td> <td><code>010.0</code></td> <td><code>+10.0</code></td></tr>
+				    <tr><th><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></th>
+				    <td><code>-.5e1</code></td> <td><code>0E0</code></td> <td><code>1.234567890E0</code></td> <td><code>01e1</code></td> <td><code>+10e0</code></td></tr>
+				  </tbody>
+				</table>
+
+				<pre class="example"><script type="text/turtle">
+# this is a complete turtle document
[email protected] : <http://example.org/stats> .
+<http://somecountry.example/census2007>
+    :censusYear 2007 ;      # xsd:integer
+    :birthRate 13.5 ;       # xsd:decimal
+    :gdpDollars 14074.2E9 ; # xsd:double
+    :isLandlocked false .   # xsd:boolean
+				</script></pre>
+			</section>
 
 			<section  id="groups">
 				<h3>Abbreviating groups of triples</h3>
@@ -662,7 +728,7 @@
 
 	    </ul>
 
-	    <table id="term2escape" style="border-collapse:collapse;">
+	    <table id="term2escape" class="separated" style="border-collapse:collapse;">
 	      <thead>
 		<tr>
 		  <th></th>