W3C home > Mailing lists > Public > public-html-commits@w3.org > January 2010

html5/markup/src syntax.html,1.70,1.71

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 29 Jan 2010 00:09:14 +0000
To: public-html-commits@w3.org
Message-Id: <E1NaeQE-0007ze-5T@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv30584/src

Modified Files:
	syntax.html 
Log Message:
update syntax

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- syntax.html	3 Sep 2009 02:39:07 -0000	1.70
+++ syntax.html	29 Jan 2010 00:09:11 -0000	1.71
@@ -651,13 +651,13 @@
       <li>must not contain control characters other than
         <a href="#space">space characters</a></li>
     </ul>
-    <p class="note">There are two special types of
-    <a href="#syntax-text">text</a>,
-    known as
-    <a href="#syntax-escape-start">escaping text span starts</a>
-    and
-    <a href="#syntax-escape-end">escaping text span ends</a>,
-    that can occur within certain elements.</p>
+    <!-- * <p class="note">There are two special types of -->
+    <!-- * <a href="#syntax-text">text</a>, -->
+    <!-- * known as -->
+    <!-- * <a href="#syntax-escape-start">escaping text span starts</a> -->
+    <!-- * and -->
+    <!-- * <a href="#syntax-escape-end">escaping text span ends</a>, -->
+    <!-- * that can occur within certain elements.</p> -->
     <p><dfn
       id="character-data"
       title="character-data"
@@ -688,10 +688,10 @@
           <li>must not contain any
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
           characters</li>
-          <li>must not contain any
-          <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
-          <li>must not contain any
-          <a href="#syntax-escape">escaping text spans</a></li>
+          <!-- * <li>must not contain any -->
+          <!-- * <a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li> -->
+          <!-- * <li>must not contain any -->
+          <!-- * <a href="#syntax-escape">escaping text spans</a></li> -->
         </ul>
       </dd>
       <dt><dfn
@@ -711,8 +711,10 @@
           <li><a href="#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="#syntax-escape">escaping text spans</a></li>
+          characters
+          <!-- * and -->
+          <!-- * <a href="#syntax-escape">escaping text spans</a> -->
+          </li>
           <li><a href="#syntax-charref">character references</a></li>
         </ul>
         <p>Replaceable character data has the following restrictions:</p>
@@ -727,16 +729,11 @@
           replaceable character data (for example,
           "<code>&lt;/title</code>" or
           "<code>&lt;/textarea</code>"),
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Replaceable character data,
         as defined in this specification, is a feature of
@@ -767,8 +764,10 @@
           <li><a href="#syntax-text">text</a>,
           optionally including
           "<code title="U+003C LESS-THAN SIGN">&lt;</code>"
-          characters and
-          <a href="#syntax-escape">escaping text spans</a></li>
+          characters
+          <!-- * and -->
+          <!-- * <a href="#syntax-escape">escaping text spans</a> -->
+          </li>
           <li><a href="#syntax-ambiguous-ampersand">ambiguous ampersands</a></li>
         </ul>
         <p>Non-replaceable character data has the following restrictions:</p>
@@ -783,16 +782,11 @@
           "<code>&lt;/script</code>"
           or
           "<code>&lt;/style</code>",
-          followed by one of
-          U+0009 CHARACTER TABULATION,
-          U+000A LINE FEED (LF),
-          U+000C FORM FEED (FF),
-          U+0020 SPACE,
+          followed by a
+          <a href="#space">space character</a>,
           "<code title="U+003E GREATER-THAN SIGN">&gt;</code>",
           or
-          "<code title="U+002F SOLIDUS">/</code>",
-          unless that string is part of an
-          <a href="#syntax-escape">escaping text span</a>.</li>
+          "<code title="U+002F SOLIDUS">/</code>".</li>
         </ul>
         <p class="note">Non-replaceable character data,
         as defined in this specification, is a feature of
@@ -981,91 +975,6 @@
     <pre>&lt;!-- main content starts here --></pre>
     </div>
   </section>
-  <section id="escaping-text-span">
-    <h2>Escaping text spans</h2>
-    <p>An
-      <dfn id="syntax-escape">escaping text span</dfn>
-      is a span of
-      <a href="#syntax-text" title="syntax-text">text</a>
-      that starts with an
-      <a href="#syntax-escape-start">escaping text span start</a>
-      that is not itself in an
-      <a href="#syntax-escape">escaping text span</a>,
-      and ends at the next
-      <a href="#syntax-escape-end">escaping text span end</a>.
-      Escaping text spans have the following restriction:</p>
-    <ul>
-      <li>must not contain any <a
-        href="#syntax-charref">character references</a></li>
-    </ul>
-    <p>An
-      <dfn id="syntax-escape-start">escaping text span start</dfn>
-      is the
-      <a href="#syntax-text" title="syntax-text">text</a>
-      string
-      "<code title="U+003C LESS-THAN SIGN, U+0021 EXCLAMATION MARK, U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS">&lt;!--</code>".</p>
-     <p>An
-     <dfn id="syntax-escape-end">escaping text span end</dfn>
-     is the
-     <a href="#syntax-text" title="syntax-text">text</a>
-     string
-     "<code title="U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN">--&gt;</code>".</p>
-     <div class="note">
-       <ul>
-         <li>An
-         <a href="#syntax-escape">escaping text span</a>
-         is not a
-         <a href="#syntax-comments">comment</a>.</li>
-         <li>An
-         <a href="#syntax-escape-start">escaping text span start</a>
-         is
-         <a href="#syntax-text">text</a>;
-         it is not a
-         <a href="#comment-start-delimiter">comment start delimiter</a>.</li>
-         <li>An
-         <a href="#syntax-escape-end">escaping text span end</a>
-         is
-         <a href="#syntax-text">text</a>;
-         it is not a
-         <a href="#comment-end-delimiter">comment end delimiter</a>.</li>
-         <li>Any sequences of characters within an
-         <a href="#syntax-escape">escaping text span</a>
-         that look like
-         <a href="#syntax-charref">character references</a>
-         are
-         <a href="#syntax-text">text</a>,
-         not 
-         <a href="#syntax-charref">character references</a>.</li>
-       </ul>
-     </div>
-     <p>An
-     <a href="#syntax-escape-start">escaping text span start</a>
-     may share its
-     "<code title="U+002D HYPHEN-MINUS">-</code>"
-     characters with its corresponding
-     <a href="#syntax-escape-end">escaping text span end</a>.</p>
-    <p>The text in
-    <a href="#style">style</a>,
-    <a href="#script">script</a>,
-    <a href="#title">title</a>,
-    and
-    <a href="#textarea">textarea</a>
-    elements must not have an
-     <a href="#syntax-escape-start">escaping text span start</a>
-     that is not followed by an
-     <a href="#syntax-escape-end">escaping text span end</a>.</p>
-    <div class="example">
-    <p>The following is an example of an
-    <a href="#syntax-escape">escaping text span</a>
-    within a
-    <a href="#style" class="element">style</a> element.</p>
-    <pre>&lt;style>
-&lt;!--
-dfn { font-weight: bold; color: brown; }
--->
-&lt;/style></pre>
-    </div>
- </section>
  <section id="svg-mathml">
    <h2>SVG and MathML elements in HTML documents</h2>
    <p id="elements-svg-mathml">
Received on Friday, 29 January 2010 00:09:17 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 29 January 2010 00:09:25 GMT