html5/markup rp.html,1.4,1.5 rt.html,1.4,1.5 ruby.html,1.4,1.5 schema.html,1.99,1.100 schema.rnc,1.86,1.87 spec.html,1.27,1.28 from Michael Smith via cvs-syncmail on 2009-06-10 (public-html-commits@w3.org from June 2009)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 10 Jun 2009 11:05:49 +0000
To: public-html-commits@w3.org
Message-Id: <E1MELcr-0006Mo-F6@lionel-hutz.w3.org>
Update of /sources/public/html5/markup
In directory hutz:/tmp/cvs-serv24366

Modified Files:
	rp.html rt.html ruby.html schema.html schema.rnc spec.html 
Log Message:
h:tml; loosen the content model for <rp> so that it's no longer constrained to just parenthesis characters


Index: schema.html
===================================================================
RCS file: /sources/public/html5/markup/schema.html,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- schema.html	3 Jun 2009 10:12:58 -0000	1.99
+++ schema.html	10 Jun 2009 11:05:46 -0000	1.100
@@ -3350,9 +3350,9 @@
   <div class='patternname' id='the-ruby.inner'><a href='#the-ruby.inner'>ruby.inner</a> =</div>
   <span class='pattern' id='ruby.inner'>(<a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a>,
    (<a class='ref' href='#rt.elem'>rt.elem</a>
-    | (<a class='ref' href='#rp.elem.start'>rp.elem.start</a>,
+    | (<a class='ref' href='#rp.elem'>rp.elem</a>,
        <a class='ref' href='#rt.elem'>rt.elem</a>,
-       <a class='ref' href='#rp.elem.end'>rp.elem.end</a>)))+</span>
+       <a class='ref' href='#rp.elem'>rp.elem</a>)))+</span>
 </div>
 <div class='define' id='rt.elem-define'>
 
@@ -3374,24 +3374,14 @@
   <div class='patternname' id='the-rt.inner'><a href='#the-rt.inner'>rt.inner</a> =</div>
   <span class='pattern' id='rt.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
-<div class='define' id='rp.elem.start-define'>
+<div class='define' id='rp.elem-define'>
 
 <span class='comment'>## Ruby Parenthesis: &lt;rp></span>
-  <div class='patternname' id='the-rp.elem.start'><a href='#the-rp.elem.start'>rp.elem.start</a> =</div>
-  <span class='pattern' id='rp.elem.start'><span class='type'>element </span>
-  <span class='name'>rp</span>
-   {<span class='model'>
-      <a class='ref' href='#rp.inner.start'>rp.inner.start</a>
-      &amp; <a class='ref' href='#rp.attrs'>rp.attrs</a>
-    </span>}
-  </span>
-</div>
-<div class='define' id='rp.elem.end-define'>
-  <div class='patternname' id='the-rp.elem.end'><a href='#the-rp.elem.end'>rp.elem.end</a> =</div>
-  <span class='pattern' id='rp.elem.end'><span class='type'>element </span>
+  <div class='patternname' id='the-rp.elem'><a href='#the-rp.elem'>rp.elem</a> =</div>
+  <span class='pattern' id='rp.elem'><span class='type'>element </span>
   <span class='name'>rp</span>
    {<span class='model'>
-      <a class='ref' href='#rp.inner.end'>rp.inner.end</a>
+      <a class='ref' href='#rp.inner'>rp.inner</a>
       &amp; <a class='ref' href='#rp.attrs'>rp.attrs</a>
     </span>}
   </span>
@@ -3400,13 +3390,9 @@
   <div class='patternname' id='the-rp.attrs'><a href='#the-rp.attrs'>rp.attrs</a> =</div>
   <span class='pattern' id='rp.attrs'><a class='ref' href='#common.attrs'>common.attrs</a></span>
 </div>
-<div class='define' id='rp.inner.start-define'>
-  <div class='patternname' id='the-rp.inner.start'><a href='#the-rp.inner.start'>rp.inner.start</a> =</div>
-  <span class='pattern' id='rp.inner.start'>d:paren-start</span>
-</div>
-<div class='define' id='rp.inner.end-define'>
-  <div class='patternname' id='the-rp.inner.end'><a href='#the-rp.inner.end'>rp.inner.end</a> =</div>
-  <span class='pattern' id='rp.inner.end'>d:paren-end</span>
+<div class='define' id='rp.inner-define'>
+  <div class='patternname' id='the-rp.inner'><a href='#the-rp.inner'>rp.inner</a> =</div>
+  <span class='pattern' id='rp.inner'><a class='ref' href='#common.inner.phrasing'>common.inner.phrasing</a></span>
 </div>
 </div>
 </div>

Index: schema.rnc
===================================================================
RCS file: /sources/public/html5/markup/schema.rnc,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- schema.rnc	3 Jun 2009 10:12:58 -0000	1.86
+++ schema.rnc	10 Jun 2009 11:05:46 -0000	1.87
@@ -1186,7 +1186,7 @@
     ruby.attrs = common.attrs
     ruby.inner =
       (common.inner.phrasing,
-       (rt.elem | (rp.elem.start, rt.elem, rp.elem.end)))+
+       (rt.elem | (rp.elem, rt.elem, rp.elem)))+
     
     ## Ruby Text: <rt>
     rt.elem = element rt { rt.inner & rt.attrs }
@@ -1194,11 +1194,9 @@
     rt.inner = common.inner.phrasing
     
     ## Ruby Parenthesis: <rp>
-    rp.elem.start = element rp { rp.inner.start & rp.attrs }
-    rp.elem.end = element rp { rp.inner.end & rp.attrs }
+    rp.elem = element rp { rp.inner & rp.attrs }
     rp.attrs = common.attrs
-    rp.inner.start = d:paren-start
-    rp.inner.end = d:paren-end
+    rp.inner = common.inner.phrasing
   }
 }
 div {

Index: rt.html
===================================================================
RCS file: /sources/public/html5/markup/rt.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rt.html	3 May 2009 15:59:42 -0000	1.4
+++ rt.html	10 Jun 2009 11:05:46 -0000	1.5
@@ -51,9 +51,9 @@
         <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="rp.html#rp">rp</a>,
        <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp.elem.end">rp.elem.end</a>)))+</li></ul>
+       <a class="ref" href="rp.html#rp">rp</a>)))+</li></ul>
       </div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- spec.html	10 Jun 2009 10:42:28 -0000	1.27
+++ spec.html	10 Jun 2009 11:05:46 -0000	1.28
@@ -11497,19 +11497,14 @@
       <div class="no-number no-toc" id="rp-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#rp-content">#</a>
 </h2>
-        <dl class="content-models" id="rp-mdls">
-<dt class="content-model"><span class="element-pattern-name" id="rp.elem.start"><a class="hash" href="#rp.elem.start"><span class="element">rp</span>.elem.start</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      d:paren-start
-      &amp; <a class="ref" href="#rp.attrs">rp.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="rp.elem.end"><a class="hash" href="#rp.elem.end"><span class="element">rp</span>.elem.end</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      d:paren-end
+        <div class="content-models" id="rp-mdls">
+        <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="#rp-mdl" class="element">rp</a> = </span><span>
+      (text
+  &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="#rp.attrs">rp.attrs</a>
-    </span></dd>
-        </dl>
-</div>
+    </span></p>
+        </div>
+      </div>
 <div class="no-number no-toc" id="rp-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#rp-attr-mdl">#</a>
 </h2>
@@ -11540,9 +11535,9 @@
 <a href="#ruby-mdl">ruby</a> = ((text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="#rt">rt</a>
-    | (<a class="ref" href="#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="#rp">rp</a>,
        <a class="ref" href="#rt">rt</a>,
-       <a class="ref" href="#rp.elem.end">rp.elem.end</a>)))+</li></ul>
+       <a class="ref" href="#rp">rp</a>)))+</li></ul>
 </div>
 </div>
 <div id="rt" class="section">
@@ -11594,9 +11589,9 @@
 <a href="#ruby-mdl">ruby</a> = ((text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="#rt">rt</a>
-    | (<a class="ref" href="#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="#rp">rp</a>,
        <a class="ref" href="#rt">rt</a>,
-       <a class="ref" href="#rp.elem.end">rp.elem.end</a>)))+</li></ul>
+       <a class="ref" href="#rp">rp</a>)))+</li></ul>
 </div>
 </div>
 <div id="ruby" class="section">
@@ -11616,9 +11611,9 @@
       ((text
   &amp; <a class="ref" href="#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="#rt">rt</a>
-    | (<a class="ref" href="#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="#rp">rp</a>,
        <a class="ref" href="#rt">rt</a>,
-       <a class="ref" href="#rp.elem.end">rp.elem.end</a>)))+
+       <a class="ref" href="#rp">rp</a>)))+
       &amp; <a class="ref" href="#ruby.attrs">ruby.attrs</a>
     </span></p>
         </div>

Index: ruby.html
===================================================================
RCS file: /sources/public/html5/markup/ruby.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ruby.html	3 May 2009 15:59:42 -0000	1.4
+++ ruby.html	10 Jun 2009 11:05:46 -0000	1.5
@@ -25,9 +25,9 @@
       ((text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="rp.html#rp">rp</a>,
        <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp.elem.end">rp.elem.end</a>)))+
+       <a class="ref" href="rp.html#rp">rp</a>)))+
       &amp; <a class="ref" href="ruby.html#ruby.attrs">ruby.attrs</a>
     </span></p>
         </div>

Index: rp.html
===================================================================
RCS file: /sources/public/html5/markup/rp.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rp.html	3 May 2009 15:59:42 -0000	1.4
+++ rp.html	10 Jun 2009 11:05:46 -0000	1.5
@@ -21,18 +21,13 @@
   </div>
       <div class="no-number no-toc" id="rp-content">
         <h2 class="element-subhead">Content model <a class="hash" href="#rp-content">#</a></h2>
-        <dl class="content-models" id="rp-mdls">
-        <dt class="content-model"><span class="element-pattern-name" id="rp.elem.start"><a class="hash" href="rp.html#rp.elem.start"><span class="element">rp</span>.elem.start</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      d:paren-start
-      &amp; <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
-    </span></dd>
-        <dt class="content-model"><span class="element-pattern-name" id="rp.elem.end"><a class="hash" href="rp.html#rp.elem.end"><span class="element">rp</span>.elem.end</a> = </span></dt>
-        <dd class="elem-mdl"><span>
-      d:paren-end
+        <div class="content-models" id="rp-mdls">
+        <p class="elem-mdl"><span class="element-pattern-name"><a id="rp-mdl" href="rp.html#rp-mdl" class="element">rp</a> = </span><span>
+      (text
+  &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*)
       &amp; <a class="ref" href="rp.html#rp.attrs">rp.attrs</a>
-    </span></dd>
-        </dl>
+    </span></p>
+        </div>
       </div><div class="no-number no-toc" id="rp-attr-mdl">
         <h2 class="element-subhead">Attribute model <a class="hash" href="#rp-attr-mdl">#</a></h2>
         <div class="attr-content-models">
@@ -58,9 +53,9 @@
         <li class="context-mdl"><a href="ruby.html#ruby-mdl">ruby</a> = ((text
   &amp; <a class="ref" href="common-models.html#common.elem.phrasing">common.elem.phrasing</a>*),
    (<a class="ref" href="rt.html#rt">rt</a>
-    | (<a class="ref" href="rp.html#rp.elem.start">rp.elem.start</a>,
+    | (<a class="ref" href="rp.html#rp">rp</a>,
        <a class="ref" href="rt.html#rt">rt</a>,
-       <a class="ref" href="rp.html#rp.elem.end">rp.elem.end</a>)))+</li></ul>
+       <a class="ref" href="rp.html#rp">rp</a>)))+</li></ul>
       </div></div>
 <hr class="footerbreak"></hr>
 <div class="nav">
Received on Wednesday, 10 June 2009 11:05:55 UTC