W3C home > Mailing lists > Public > public-html-commits@w3.org > June 2009

html5/markup/src datatypes.html,1.24,1.25 syntax.html,1.51,1.52 terms.html,1.5,1.6

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 26 Jun 2009 15:52:57 +0000
To: public-html-commits@w3.org
Message-Id: <E1MKDjV-0005fp-36@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/src
In directory hutz:/tmp/cvs-serv21451/src

Modified Files:
	datatypes.html syntax.html terms.html 
Log Message:
h:tml; introduce the term "character data", and link to it from content models


Index: terms.html
===================================================================
RCS file: /sources/public/html5/markup/src/terms.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- terms.html	8 Jun 2009 00:53:37 -0000	1.5
+++ terms.html	26 Jun 2009 15:52:54 -0000	1.6
@@ -27,6 +27,17 @@
       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
+        href="#refsXML">[XML]</a>.</dd>
     <dt><dfn id="fallback">fallback content</dfn></dt>
     <dd>Some embedded content elements can have fallback content:
       content that is to be used when the external resource cannot

Index: syntax.html
===================================================================
RCS file: /sources/public/html5/markup/src/syntax.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- syntax.html	13 Jun 2009 08:36:16 -0000	1.51
+++ syntax.html	26 Jun 2009 15:52:54 -0000	1.52
@@ -539,15 +539,13 @@
 
       <li>
       <dfn id="attribute-value"
-        title="syntax-attribute-value">Attribute values</dfn> are
-      a mixture of
-      <a href="#syntax-text" title="syntax-text">text</a>
-      and
-      <a href="#syntax-charref">character references</a>, except
-      with the additional restriction that the text
-      cannot contain an
-      <a href="#ambiguous"
-        title="syntax-ambiguous-ampersand">ambiguous ampersand</a>.</li>
+        title="syntax-attribute-value">Attribute values</dfn>, in
+      general, are
+      <a href="#character-data">character data</a>,
+      with the additional restriction that they must not
+      contain any
+      <a href="#syntax-ambiguous-ampersand"
+        >ambiguous ampersands</a>.</li>
     </ul>
 
     <p>In the <a href="#html-syntax">the HTML syntax</a>,
@@ -584,7 +582,7 @@
         </dd>
 
         <dt><dfn id="syntax-attr-unquoted"
-          title="syntax-attributes-unquoted"
+          title="syntax-attr-unquoted"
           >Unquoted attribute-value syntax</dfn></dt>
         <dd>
         <p>An attribute and its value may be specified by providing
@@ -600,8 +598,10 @@
             title="syntax-attribute-value">attribute value</a>.</p>
 
           <p>In addition to the general requirements given above for
-          attribute values, an unquoted attribute value must not
-          contain any literal
+          attribute values, an 
+          <dfn id="attr-value-unquoted"
+            title="attr-value-unquoted">unquoted attribute value</dfn>
+          must not contain any literal
           <a href="#space" title="space character">space characters</a>,
           any U+0022 QUOTATION MARK (<code>"</code>) characters,
           U+0027 APOSTROPHE (<code>'</code>) characters, U+003D
@@ -647,7 +647,10 @@
           APOSTROPHE (<code>'</code>) character.</p>
 
           <p>In addition to the general requirements given above
-          for attribute values, single-quoted attribute values
+          for attribute values, a
+          <dfn id="attr-value-single-quoted"
+            title="attr-value-single-quoted"
+            >single-quoted attribute value</dfn>
           must not contain any literal U+0027
           APOSTROPHE (<code>'</code>) characters.</p>
 
@@ -685,7 +688,11 @@
           MARK (<code>"</code>) character.</p>
 
           <p>In addition to the general requirements given above for
-          attribute values, double-quoted attribute values must not
+          attribute values, an
+          <dfn id="attr-value-double-quoted"
+            title="attr-value-double-quoted"
+            >double-quoted attribute value</dfn>
+          must not
           contain any literal U+0022 QUOTATION MARK (<code>"</code>)
           characters.</p>
 

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/src/datatypes.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- datatypes.html	16 Jun 2009 10:19:39 -0000	1.24
+++ datatypes.html	26 Jun 2009 15:52:54 -0000	1.25
@@ -5,12 +5,20 @@
     <p>For any pattern in this document that references the <a
       href="#data-string">string</a> datatype, a
     <dfn id="data-string" title="string">string</dfn>
-    is defined as any mixture of
-    <a href="#syntax-text">text</a>
-    and
-    <a href="#syntax-charref">character references</a>
-    that does not contain an
-    <a href="#ambiguous">ambiguous ampersand</a>.</p>
+    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>
+    <ul>
+      <li><a
+        href="#attr-value-unquoted">unquoted attribute values</a></li>
+      <li><a
+        href="#attr-value-single-quoted">single-quoted attribute values</a></li>
+      <li><a
+        href="#attr-value-double-quoted">double-quoted attribute values</a></li>
+    </ul>
   </section>
   <section id="data-token-def" class="no-toc">
     <h2>Token</h2>
Received on Friday, 26 June 2009 15:53:06 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Friday, 26 June 2009 15:53:08 GMT