~ switch to abbrevC choice, incorporating feedback from gavin <http://www.w3.org/mid/CAPqY83xb9gjQcFPnJyhExskX715A7eqeRBO=9JSUrUWXdc8QsQ@mail.gmail.com> and sandro <irc:irc.w3.org/sandro#2012-03-22T16:34:00Z>
--- a/rdf-turtle/index.html Thu Mar 22 14:57:57 2012 -0400
+++ b/rdf-turtle/index.html Thu Mar 22 15:12:32 2012 -0400
@@ -348,116 +348,21 @@
<http://example.org/path> a doc:Document .
</script></pre>
</section>
- <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
-datatype indicator and correspond to
- the XML Schema Datatype
- <a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a>
- in both syntax and datatype IRI.</p>
-
- <pre class="example"><script type="text/plain">
-# this is not a complete turtle document
--5
-0
-1
-10
-+1
-# some long form examples
-"-5"^^xsd:integer
-"10"^^<http://www.w3.org/2001/XMLSchema#integer>
- </script></pre>
-
- <p>Decimal floating point double/fixed precision numbers may be written
- directly and correspond to the XML Schema Datatype
- <a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:double</a>
- in both syntax and datatype IRI.
- </p>
-
- <pre class="example"><script type="text/plain">
-# this is not a complete turtle document
-1.3e2
-10e0
--12.5e10
-# some long form examples
-"1.3e2"^^xsd:double
-"-12.5e10"^^<http://www.w3.org/2001/XMLSchema#double>
- </script></pre>
-
- <p>Arbitrary precision decimal numbers may be written
- directly and correspond to the XML Schema Datatype
- <a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:decimal</a>.
- in both syntax and datatype IRI.
- </p>
-
- <pre class="example"><script type="text/plain">
-# this is not a complete turtle document
-0.0
-1.0
-1.234567890123456789
--5.0
-# some long form examples
-"0.0"^^xsd:decimal
-"-5.0"^^<http://www.w3.org/2001/XMLSchema#decimal>
-
- </script></pre>
-
- <p>Boolean may be written without quotation marks or a
-datatype indicator as <code>true</code> or
- <code>false</code> and correspond to the
- the XML Schema Datatype
- <a href="http://www.w3.org/TR/xmlschema-2/#boolean">xsd:boolean</a>
- in both syntax and datatype IRI.
- </p>
-
- <pre class="example"><script type="text/plain">
-# this is not a complete turtle document
-true
-false
-# same in long form
-"true"^^xsd:boolean
-"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>
+ <section id="abbrev">
+ <h3 >Abbreviating common datatypes</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>.
+ Integer values may be written as an optional sign and a series of digits. Integers match the regular expression "<code>[+-]?[0-9]+</code>".
</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]+".
+ Arbitrary-precision decimals may be written as an optional sign, zero or more digits, a decimal point and one or more digits. Decimals match the regular expression "<code>[+-]?[0-9]*\.[0-9]+</code>".
</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]".
+ Double-precision floating point values may be written as an optionally signed mantissa with an optional decimal point, the letter "e" or "E", and an optionally signed integer exponent.
+ The exponent matches the regular expression "<code>[+-]?[0-9]+</code>" and the mantissa one of these regular expressions: "<code>[+-]?[0-9]+\.[0-9]+</code>", "<code>[+-]?\.[0-9]+</code>" or "<code>[+-]?[0-9]</code>".
</li>
<li style="padding-top: 1ex;">
@@ -466,7 +371,7 @@
</ul>
<table class="separated">
- <caption>Example numeric representations:</caption>
+ <caption style="font-weight: bold;">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>