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

h:tml; pull upstream grammar change that loosens constraints on attribute model for <source>

From: poot <cvsmail@w3.org>
Date: Fri, 26 Jun 2009 18:05:46 +0900 (JST)
To: public-html-diffs@w3.org
Message-Id: <20090626090547.5234A2BBF4@toro.w3.mag.keio.ac.jp>
h:tml; pull upstream grammar change that loosens constraints on
attribute model for <source>

http://dev.w3.org/cvsweb/html5/markup/Overview.html?r1=1.318&r2=1.319&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- Overview.html	24 Jun 2009 17:36:48 -0000	1.318
+++ Overview.html	26 Jun 2009 09:05:25 -0000	1.319
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>25 June 2009</em>
+<h2>Editor&#8217;s Draft <em>26 June 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -42,7 +42,7 @@
     
     
     <p>
-        This document is the 25 June 2009 Editor&#8217;s Draft of 
+        This document is the 26 June 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>

Index: audio.html
===================================================================
RCS file: /sources/public/html5/markup/audio.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- audio.html	15 Jun 2009 20:27:01 -0000	1.5
+++ audio.html	26 Jun 2009 09:05:26 -0000	1.6
@@ -23,8 +23,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.flow"><a class="hash" href="audio.html#audio.elem.flow"><span class="element">audio</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>
@@ -32,8 +31,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.phrasing"><a class="hash" href="audio.html#audio.elem.phrasing"><span class="element">audio</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="audio.html#audio.attrs">audio.attrs</a>

Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- schema.html	16 Jun 2009 06:49:00 -0000	1.105
+++ schema.html	26 Jun 2009 09:05:26 -0000	1.106
@@ -3435,28 +3435,10 @@
     </span>}
   </span>
 </div>
-<div class='define' id='source.elem.last-define'>
-  <div class='patternname' id='the-source.elem.last'><a href='#the-source.elem.last'>source.elem.last</a> =</div>
-  <span class='pattern' id='source.elem.last'><span class='type'>element </span>
-  <span class='name'>source</span>
-   {<span class='model'>
-      empty
-      &amp; <a class='ref' href='#source.last.attrs'>source.last.attrs</a>
-    </span>}
-  </span>
-</div>
 <div class='define' id='source.attrs-define'>
   <div class='patternname' id='the-source.attrs'><a href='#the-source.attrs'>source.attrs</a> =</div>
   <span class='pattern' id='source.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
   &amp; <a class='ref' href='#source.attrs.src'>source.attrs.src</a>
-  &amp; ((<a class='ref' href='#source.attrs.type'>source.attrs.type</a>
-          &amp; <a class='ref' href='#source.attrs.media'>source.attrs.media</a>?)
-         | <a class='ref' href='#source.attrs.media'>source.attrs.media</a>)</span>
-</div>
-<div class='define' id='source.last.attrs-define'>
-  <div class='patternname' id='the-source.last.attrs'><a href='#the-source.last.attrs'>source.last.attrs</a> =</div>
-  <span class='pattern' id='source.last.attrs'><a class='ref' href='#common.attrs'>common.attrs</a>
-  &amp; <a class='ref' href='#source.attrs.src'>source.attrs.src</a>
   &amp; <a class='ref' href='#source.attrs.type'>source.attrs.type</a>?
   &amp; <a class='ref' href='#source.attrs.media'>source.attrs.media</a>?</span>
 </div>
@@ -3559,15 +3541,13 @@
 <div class='define' id='video.inner.flow-define'>
   <div class='patternname' id='the-video.inner.flow'><a href='#the-video.inner.flow'>video.inner.flow</a> =</div>
   <span class='pattern' id='video.inner.flow'>(<a class='ref' href='#video.attrs.src'>video.attrs.src</a>
-   | (<a class='ref' href='#source.elem'>source.elem</a>*,
-      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
+   | <a class='ref' href='#source.elem'>source.elem</a>*),
   <a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
 </div>
 <div class='define' id='video.inner.phrasing-define'>
   <div class='patternname' id='the-video.inner.phrasing'><a href='#the-video.inner.phrasing'>video.inner.phrasing</a> =</div>
   <span class='pattern' id='video.inner.phrasing'>(<a class='ref' href='#video.attrs.src'>video.attrs.src</a>
-   | (<a class='ref' href='#source.elem'>source.elem</a>*,
-      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
+   | <a class='ref' href='#source.elem'>source.elem</a>*),
   <a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 <div class='define' id='audio.elem.flow-define'>
@@ -3612,15 +3592,13 @@
 <div class='define' id='audio.inner.flow-define'>
   <div class='patternname' id='the-audio.inner.flow'><a href='#the-audio.inner.flow'>audio.inner.flow</a> =</div>
   <span class='pattern' id='audio.inner.flow'>(<a class='ref' href='#audio.attrs.src'>audio.attrs.src</a>
-   | (<a class='ref' href='#source.elem'>source.elem</a>*,
-      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
+   | <a class='ref' href='#source.elem'>source.elem</a>*),
   <a class='ref' href='#common.inner.flow'>common.inner.flow</a></span>
 </div>
 <div class='define' id='audio.inner.phrasing-define'>
   <div class='patternname' id='the-audio.inner.phrasing'><a href='#the-audio.inner.phrasing'>audio.inner.phrasing</a> =</div>
   <span class='pattern' id='audio.inner.phrasing'>(<a class='ref' href='#audio.attrs.src'>audio.attrs.src</a>
-   | (<a class='ref' href='#source.elem'>source.elem</a>*,
-      <a class='ref' href='#source.elem.last'>source.elem.last</a>)),
+   | <a class='ref' href='#source.elem'>source.elem</a>*),
   <a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 <div class='define' id='figure.elem-define'>

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- schema.rnc	16 Jun 2009 06:49:00 -0000	1.92
+++ schema.rnc	26 Jun 2009 09:05:27 -0000	1.93
@@ -1205,14 +1205,9 @@
     # #####################################################################
     ## Source: <source>
     source.elem = element source { empty & source.attrs }
-    source.elem.last = element source { empty & source.last.attrs }
     source.attrs =
       common.attrs
       & source.attrs.src
-      & ((source.attrs.type & source.attrs.media?) | source.attrs.media)
-    source.last.attrs =
-      common.attrs
-      & source.attrs.src
       & source.attrs.type?
       & source.attrs.media?
     source.attrs.src = attribute src { common.data.uri }
@@ -1238,11 +1233,9 @@
     video.attrs.width = attribute width { common.data.integer.positive }
     video.attrs.src = attribute src { common.data.uri }
     video.inner.flow =
-      (video.attrs.src | (source.elem*, source.elem.last)),
-      common.inner.flow
+      (video.attrs.src | source.elem*), common.inner.flow
     video.inner.phrasing =
-      (video.attrs.src | (source.elem*, source.elem.last)),
-      common.inner.phrasing
+      (video.attrs.src | source.elem*), common.inner.phrasing
     
     ## Audio: <audio>
     audio.elem.flow = element audio { audio.inner.flow & audio.attrs }
@@ -1256,11 +1249,9 @@
       & audio.attrs.loop?
     audio.attrs.src = attribute src { common.data.uri }
     audio.inner.flow =
-      (audio.attrs.src | (source.elem*, source.elem.last)),
-      common.inner.flow
+      (audio.attrs.src | source.elem*), common.inner.flow
     audio.inner.phrasing =
-      (audio.attrs.src | (source.elem*, source.elem.last)),
-      common.inner.phrasing
+      (audio.attrs.src | source.elem*), common.inner.phrasing
     
     ## Captioned Content: <figure>
     figure.elem = element figure { figure.inner & figure.attrs }

Index: patch-schema
===================================================================
RCS file: /sources/public/html5/markup/patch-schema,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- patch-schema	16 Jun 2009 06:49:00 -0000	1.61
+++ patch-schema	26 Jun 2009 09:05:26 -0000	1.62
@@ -153,7 +153,7 @@
  
 Index: schema/media.rnc
 ===================================================================
---- schema/media.rnc	(revision 437)
+--- schema/media.rnc	(revision 442)
 +++ schema/media.rnc	(working copy)
 @@ -4,32 +4,6 @@
  ##  RELAX NG Schema for HTML 5: Advanced Embedded Content             #
@@ -188,7 +188,7 @@
  ## Source: <source>
  
  	source.elem =
-@@ -67,20 +41,6 @@
+@@ -55,18 +29,6 @@
  	source.inner =
  		( empty )
  
@@ -196,9 +196,7 @@
 -
 -	media.source = 
 -		(	media.attrs.src
--		|	(	source.elem*
--			,	source.elem.last
--			)
+-		|	source.elem*
 -		)
 -
 -	media.attrs.src =
@@ -209,7 +207,7 @@
  ## Video: <video>
  
  	video.elem.flow =
-@@ -89,7 +49,10 @@
+@@ -75,7 +37,10 @@
  		element video { video.inner.phrasing & video.attrs }
  	video.attrs =
  		(	common.attrs
@@ -221,7 +219,7 @@
  		&	video.attrs.poster?
  		&	video.attrs.height?
  		&	video.attrs.width?
-@@ -106,12 +69,24 @@
+@@ -92,12 +57,20 @@
  			attribute width {
  				common.data.integer.positive
  			}
@@ -232,23 +230,19 @@
  	video.inner.flow =
 -		(	media.source
 +		(	(	video.attrs.src
-+			|	(	source.elem*
-+				,	source.elem.last
-+				)
++			|	source.elem*
 +			)
  		,	common.inner.flow
  		)
  	video.inner.phrasing =
 -		(	media.source
 +		(	(	video.attrs.src
-+			|	(	source.elem*
-+				,	source.elem.last
-+				)
++			|	source.elem*
 +			)
  		,	common.inner.phrasing
  		)
  
-@@ -126,14 +101,29 @@
+@@ -112,14 +85,25 @@
  		element audio { audio.inner.phrasing & audio.attrs }
  	audio.attrs =
  		(	common.attrs
@@ -265,18 +259,14 @@
  	audio.inner.flow =
 -		(	media.source
 +		(	(	audio.attrs.src
-+			|	(	source.elem*
-+				,	source.elem.last
-+				)
++			|	source.elem*
 +			)
  		,	common.inner.flow
  		)
  	audio.inner.phrasing =
 -		(	media.source
 +		(	(	audio.attrs.src
-+			|	(	source.elem*
-+				,	source.elem.last
-+				)
++			|	source.elem*
 +			)
  		,	common.inner.phrasing
  		)

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- spec.html	24 Jun 2009 17:36:49 -0000	1.40
+++ spec.html	26 Jun 2009 09:05:27 -0000	1.41
@@ -9,7 +9,7 @@
 <body>
 <div class="head">
 <h1>HTML 5: The Markup Language</h1>
-<h2>Editor&#8217;s Draft <em>25 June 2009</em>
+<h2>Editor&#8217;s Draft <em>26 June 2009</em>
 </h2>
 <dl>
 <dt>Latest Editor&#8217;s Draft:</dt>
@@ -41,7 +41,7 @@
     
     
     <p>
-        This document is the 25 June 2009 Editor&#8217;s Draft of 
+        This document is the 26 June 2009 Editor&#8217;s Draft of 
         <cite>HTML 5: The Markup Language</cite>.
       </p>
     <p>
@@ -2605,8 +2605,7 @@
 <dt class="content-model"><span class="element-pattern-name" id="audio.elem.flow"><a class="hash" href="#audio.elem.flow"><span class="element">audio</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="#audio.attrs">audio.attrs</a>
@@ -2614,8 +2613,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="audio.elem.phrasing"><a class="hash" href="#audio.elem.phrasing"><span class="element">audio</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="#audio.attrs">audio.attrs</a>
@@ -12107,29 +12105,18 @@
       <div class="no-number no-toc" id="source-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#source-content">#</a>
 </h2>
-        <dl class="content-models" id="source-mdls">
-<dt class="content-model"><span class="element-pattern-name" id="source-pattern"><a class="hash" href="#source-pattern"><span class="element">source</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
+        <div class="content-models" id="source-mdls">
+        <p class="elem-mdl"><span class="element-pattern-name"><a id="source-mdl" href="#source-mdl" class="element">source</a> = </span><span>
       empty &amp; <a class="ref" href="#source.attrs">source.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="source.elem.last"><a class="hash" href="#source.elem.last"><span class="element">source</span>.elem.last</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      empty
-      &amp; <a class="ref" href="#source.last.attrs">source.last.attrs</a>
-    </span></dd>
-        </dl>
-</div>
+    </span></p>
+        </div>
+      </div>
 <div class="no-number no-toc" id="source-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#source-attr-mdl">#</a>
 </h2>
         <div class="attr-content-models">
           <p><a href="#source.attrs">source.attrs</a> = <span class="pattern" id="source.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
   &amp; <a class="ref" href="#source.attrs.src" title="source.attrs.src">src</a>
-  &amp; ((<a class="ref" href="#source.attrs.type" title="source.attrs.type">type</a>
-          &amp; <a class="ref" href="#source.attrs.media" title="source.attrs.media">media</a>?)
-         | <a class="ref" href="#source.attrs.media" title="source.attrs.media">media</a>)</span></p>
-          <p><a href="#source.last.attrs">source.last.attrs</a> = <span class="pattern" id="source.last.attrs"><a class="ref" href="#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="#source.attrs.src" title="source.attrs.src">src</a>
   &amp; <a class="ref" href="#source.attrs.type" title="source.attrs.type">type</a>?
   &amp; <a class="ref" href="#source.attrs.media" title="source.attrs.media">media</a>?</span></p>
 </div>
@@ -12182,26 +12169,22 @@
         <ul>
 <li class="context-mdl">
 <a href="#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl">
 <a href="#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)</li>
         <li class="context-mdl">
 <a href="#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl">
 <a href="#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)</li>
 </ul>
@@ -13517,8 +13500,7 @@
 <dt class="content-model"><span class="element-pattern-name" id="video.elem.flow"><a class="hash" href="#video.elem.flow"><span class="element">video</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="#video.attrs">video.attrs</a>
@@ -13526,8 +13508,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.phrasing"><a class="hash" href="#video.elem.phrasing"><span class="element">video</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="#source-pattern">source</a>*,
-      <a class="ref" href="#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href="#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="#video.attrs">video.attrs</a>

Index: video.html
===================================================================
RCS file: /sources/public/html5/markup/video.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- video.html	15 Jun 2009 20:27:02 -0000	1.5
+++ video.html	26 Jun 2009 09:05:27 -0000	1.6
@@ -23,8 +23,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.flow"><a class="hash" href="video.html#video.elem.flow"><span class="element">video</span>.elem.flow</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>
@@ -32,8 +31,7 @@
         <dt class="content-model"><span class="element-pattern-name" id="video.elem.phrasing"><a class="hash" href="video.html#video.elem.phrasing"><span class="element">video</span>.elem.phrasing</a> = </span></dt>
         <dd class="elem-mdl"><span>
       (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="video.html#video.attrs">video.attrs</a>

Index: source.html
===================================================================
RCS file: /sources/public/html5/markup/source.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- source.html	15 Jun 2009 20:27:02 -0000	1.6
+++ source.html	26 Jun 2009 09:05:27 -0000	1.7
@@ -22,27 +22,16 @@
   </div>
       <div class="no-number no-toc" id="source-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#source-content">#</a></h2>
-        <dl class="content-models" id="source-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="source-pattern"><a class="hash" href="source.html#source-pattern"><span class="element">source</span></a> = </span></dt>
-        <dd class="elem-mdl"><span>
+        <div class="content-models" id="source-mdls">
+        <p class="elem-mdl"><span class="element-pattern-name"><a id="source-mdl" href="source.html#source-mdl" class="element">source</a> = </span><span>
       empty &amp; <a class="ref" href="source.html#source.attrs">source.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="source.elem.last"><a class="hash" href="source.html#source.elem.last"><span class="element">source</span>.elem.last</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      empty
-      &amp; <a class="ref" href="source.html#source.last.attrs">source.last.attrs</a>
-    </span></dd>
-        </dl>
+    </span></p>
+        </div>
       </div><div class="no-number no-toc" id="source-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#source-attr-mdl">#</a></h2>
         <div class="attr-content-models">
           <p><a href="source.html#source.attrs">source.attrs</a> = <span class="pattern" id="source.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
   &amp; <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a>
-  &amp; ((<a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a>
-          &amp; <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a>?)
-         | <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a>)</span></p>
-          <p><a href="source.html#source.last.attrs">source.last.attrs</a> = <span class="pattern" id="source.last.attrs"><a class="ref" href="common-attributes.html#common.attrs">common.attrs</a>
-  &amp; <a class="ref" href="source.html#source.attrs.src" title="source.attrs.src">src</a>
   &amp; <a class="ref" href="source.html#source.attrs.type" title="source.attrs.type">type</a>?
   &amp; <a class="ref" href="source.html#source.attrs.media" title="source.attrs.media">media</a>?</span></p></div></div>
       <div class="no-number no-toc" id="source-attributes">
@@ -85,23 +74,19 @@
         <h2 class="element-subhead">Permitted contexts <a class="hash" href="#source-context">#</a></h2>
         <ul>
         <li class="context-mdl"><a href="video.html#video.elem.flow">video.elem.flow</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="video.html#video.elem.phrasing">video.elem.phrasing</a> = (<a class="ref" href="video.html#video.attrs.src">video.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li>
         <li class="context-mdl"><a href="audio.html#audio.elem.flow">audio.elem.flow</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.flow">common.elem.flow</a>*)</li>
         <li class="context-mdl"><a href="audio.html#audio.elem.phrasing">audio.elem.phrasing</a> = (<a class="ref" href="audio.html#audio.attrs.src">audio.attrs.src</a>
-   | (<a class="ref" href="source.html#source-pattern">source</a>*,
-      <a class="ref" href="source.html#source.elem.last">source.elem.last</a>)),
+   | <a class="ref" href=".html#source-pattern">source</a>*),
   (text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)</li></ul>
       </div></div>
Received on Friday, 26 June 2009 09:06:28 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Saturday, 18 December 2010 06:14:06 GMT