html5/markup/src html-xhtml.html,NONE,1.1 datatypes.html,1.25,1.26 syntax.html,1.52,1.53 terms.html,1.6,1.7

Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv25965/src

Modified Files:
	datatypes.html syntax.html terms.html 
Added Files:
	html-xhtml.html 
Log Message:
h:tml; did substantial reorganizing and refining to the Syntax section; introduce the terms "replaceable character data" and "non-replaceable character data"


--- NEW FILE: html-xhtml.html ---
<section id="html-and-xhtml"
  xmlns="http://www.w3.org/1999/xhtml">
  <h2>HTML and XHTML documents</h2>
  <div class="toc"/>
  <p>The HTML vocabulary is an abstract language that applications
  can potentially represent in memory in any number of possible
  ways, and that can be transmitted using any number of possible
  concrete syntaxes. This specification makes reference to 
  two particular concrete syntaxes: One syntax which,
  for the sake of simplicity is referred to throughout this
  specification as
  <a href="#html-syntax">the HTML syntax</a>,
  and an alternative syntax, which for the sake of simplicity is
  referred to throughout this specification as
  <a href="#xml-syntax">the XML syntax</a>.</p>
  <p>Web browsers typically implement two separate parsers for
  processing HTML content: an
  <dfn id="html-parser">HTML parser</dfn>
  which is invoked when processing documents transmitted in the
  <a href="#html-syntax">HTML syntax</a>, and an
  <dfn id="xml-parser">XML parser</dfn>
  which is invoked when processing documents transmitted in the
  <a href="#xml-syntax">XML syntax</a>.</p>
  <section id="mime-types">
    <h2>The HTML and XML syntaxes and MIME types</h2>
    <p>For the purposes of this specification, the term
    <dfn id="html-syntax"
      title="syntax-html-syntax">HTML syntax</dfn> refers to the
    syntax which is processed <!--by Web browsers and other user agents-->
    using <span title="syntax-html-parser">HTML parsers</span>.
    <a href="#syntax-document-html">Documents in the HTML
      syntax</a> use the <code>text/html</code> MIME type. In
    particular, <a href="#syntax-document-html">documents in the
      HTML syntax</a> that are served over the wire (for example,
    by HTTP) must be labeled with the <code>text/html</code> MIME
    type.</p>
    <p>For the purposes of this specification, the term
    <dfn id="xml-syntax"
      title="syntax-xml-syntax">XML syntax</dfn> refers to the
    syntax which is processed <!--by Web browsers and other user agents-->
    using <span title="syntax-html-parser">XML parsers</span>.
    <a href="#syntax-document-xml">Documents in the XML
    syntax</a> that use the new features described in this
    specification and that are served over the wire (for example, by
    HTTP) must be labeled with an XML MIME type such as
    <code>application/xml</code> or
    <code>application/xhtml+xml</code> and must not be labeled with
    the <code>text/html</code> MIME type.</p>
  </section>
  <section id="documents">
    <h2>Conformant documents</h2>
    <p>A conformant
    <dfn id="syntax-document-html"
      title="syntax-document-html">document in the HTML
      syntax</dfn> must consist of the following parts, in the
    following order:</p>
    <ol>
      <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM)
      character.</li>
      <li>Any number of
      <a href="#syntax-comments">comments</a> and
      <a href="#space">space characters</a>.</li>
      <li>A <a href="#doctype">DOCTYPE</a>.</li>
      <li>Any number of
      <a href="#syntax-comments">comments</a> and
      <a href="#space">space characters</a>.</li>
      <li>The root element, in the form of an
      <a href="#html">html</a> element.</li>
      <li>Any number of
      <a href="#syntax-comments">comments</a> and
      <a href="#space">space characters</a>.</li>
    </ol>
    <p>A conformant
    <dfn id="syntax-document-xml"
      title="syntax-document-xml">document in the XML syntax</dfn>
    must consist of the following parts, in the following order:</p>
    <ol>
      <li>Optionally, a single U+FEFF BYTE ORDER MARK (BOM)
      character.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="#refsXML">[XML]</a>.</li>
      <li>Optionally, a DOCTYPE, as defined
      in the XML specification <a href="#refsXML">[XML]</a>.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="#refsXML">[XML]</a>.</li>
      <li>The root element, in the form of an
      <a href="#html">html</a> element.</li>
      <li>Any number of comments and space characters, as defined
      in the XML specification <a href="#refsXML">[XML]</a>.</li>
    </ol>
    <p>Documents in the XML syntax must conform to XML constraints
    as defined in the XML specification <a
      href="#refsXML">[XML]</a> — including XML well-formedness
    constraints — and must not make use of any features of the <a
      href="#html-syntax">HTML syntax</a> that do not follow XML
    well-formedness constraints (for example, documents in the XML
    syntax must not use <a href="#syntax-attr-unquoted">unquoted attribute
      value syntax</a> or <a href="#omitted">omit tags</a>).</p>
  </section>
</section>

Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- terms.html	26 Jun 2009 15:52:54 -0000	1.6
+++ terms.html	29 Jun 2009 09:18:50 -0000	1.7
@@ -27,13 +27,6 @@
       names of elements and their attributes) are <a
         href="#case-insensitive">case-insensitive</a>.
     </dd>
-    <dt><dfn id="character-data">character data</dfn></dt>
-    <dd>For <a href="#syntax-document-html">documents in the HTML
-        syntax</a>, <a href="#character-data">character data</a>
-      is defined as any mixture of
-      <a href="#syntax-text" title="syntax-text">text</a>
-      and
-      <a href="#syntax-charref">character references</a>.</dd>
     <dd>For <a href="#syntax-document-xml">documents in the XML
         syntax</a>, <a href="#character-data">character data</a>
       is as defined in the XML specification <a

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- syntax.html	26 Jun 2009 15:52:54 -0000	1.52
+++ syntax.html	29 Jun 2009 09:18:50 -0000	1.53
@@ -1,144 +1,17 @@
 <section id="syntax"
   xmlns="http://www.w3.org/1999/xhtml">
-  <h2>Syntax</h2>
+  <h2>HTML syntax</h2>
   <div class="toc"/>
-  <p>The HTML vocabulary is an abstract language that applications
-  can potentially represent in memory in any number of possible
-  ways, and that can be transmitted using any number of possible
-  concrete syntaxes. This specification provides
-  details about two particular concrete syntaxes: One syntax which,
-  for the sake of simplicity is referred to throughout this
[...1088 lines suppressed...]
+   (<code title="">]]&gt;</code>). Finally, the CDATA section must
+   be ended by the three character sequence U+005D RIGHT SQUARE
+   BRACKET, U+005D RIGHT SQUARE BRACKET, U+003E GREATER-THAN
+   SIGN (<code title="">]]&gt;</code>).</p>
+   <p>CDATA sections are allowed only in the contents of elements
+   from the MathML namespace.</p>
+   <div class="example">
+     <p>The following shows an example of a CDATA section.</p>
+     <pre>
+&lt;annotation encoding="text/latex">
+  &lt;![CDATA[\documentclass{article}
+  \begin{document}
+  \title{E}
+  \maketitle
+  The base of the natural logarithms, approximately 2.71828.
+  \end{document}]]&gt;
+&lt;/annotation></pre>
+   </div>
+ </section>
 </section>

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- datatypes.html	26 Jun 2009 15:52:54 -0000	1.25
+++ datatypes.html	29 Jun 2009 09:18:49 -0000	1.26
@@ -8,9 +8,10 @@
     is defined as <a href="#character-data">character data</a>
     that does not contain any
     <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a>.</p>
-    <p>The <a href="#syntax">Syntax</a> section of this document
-    describes additional restrictions on strings in attribute
-    values — in particular, restrictions for the following cases:</p>
+    <p>The <a href="#syntax-attributes">Attributes</a> section of
+    this document describes additional restrictions on strings in
+    attribute values — in particular, restrictions for the
+    following cases:</p>
     <ul>
       <li><a
         href="#attr-value-unquoted">unquoted attribute values</a></li>

Received on Monday, 29 June 2009 09:19:01 UTC