- From: poot <cvsmail@w3.org>
- Date: Fri, 5 Feb 2010 03:11:16 +0900 (JST)
- To: public-html-diffs@w3.org
mike: checkpointing
http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.150&r2=1.151&f=h
===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -d -r1.378 -r1.379
--- Overview.html 4 Feb 2010 15:09:17 -0000 1.378
+++ Overview.html 4 Feb 2010 18:10:52 -0000 1.379
@@ -10,7 +10,7 @@
<div class="head">
<div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></a></div>
<h1>HTML: The Markup Language</h1>
-<h2>W3C Editor’s Draft <em>4 February 2010</em>
+<h2>W3C Editor’s Draft <em>5 February 2010</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -50,7 +50,7 @@
reports index</a> at http://www.w3.org/TR/.
</em></p>
<p>
- This document is the 4 February 2010 Editor’s Draft of
+ This document is the 5 February 2010 Editor’s Draft of
<cite>HTML: The Markup Language</cite>.
If you’d like to comment on this document, the preferred
Index: li.html
===================================================================
RCS file: /sources/public/html5/markup/li.html,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- li.html 4 Feb 2010 15:09:20 -0000 1.35
+++ li.html 4 Feb 2010 18:10:52 -0000 1.36
@@ -21,17 +21,6 @@
<h2 class="element-subhead">Permitted content <a class="hash" href="#li-content-model">#</a></h2><div class="content-models">
<div id="li-mdls">
-
- <p class="elem-mdl">
- <a href="terminology.html#flow-content">flow content</a>
-
- </p><div class="postfix or">or</div>
-
- <p class="elem-mdl">
- <a href="terminology.html#flow-content">flow content</a>
-
- </p><div class="postfix or">or</div>
-
<p class="elem-mdl">
<a href="terminology.html#flow-content">flow content</a>
@@ -39,7 +28,7 @@
</div>
</div></div><div class="no-number no-toc" id="li-attr-mdl">
<h2 class="element-subhead">Permitted attributes <a class="hash" href="#li-attr-mdl">#</a></h2>
- <div class="attr-content-models"><p><a href="common-attributes.html">common attributes</a></p><span class="postfix or">or</span><p><a href="common-attributes.html">common attributes</a> <span class="postfix &">&</span> <a href="li.html#oli.attrs.value">value</a></p></div></div>
+ <div class="attr-content-models"><p><a href="common-attributes.html">common attributes</a> <span class="postfix &">&</span> <a href="li.html#oli.attrs.value">value</a></p></div></div>
<div class="no-number no-toc" id="li-attributes">
<h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#li-attributes">#</a></h2>
<dl class="attr-defs">
Index: menu.html
===================================================================
RCS file: /sources/public/html5/markup/menu.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- menu.html 4 Feb 2010 15:09:20 -0000 1.39
+++ menu.html 4 Feb 2010 18:10:52 -0000 1.40
@@ -22,8 +22,8 @@
<div id="menu-mdls">
<p class="elem-mdl">
- (<span>zero or more </span><a class="ref" href=".html#mli">li</a><span> elements</span>,
- <span class="postfix or">or</span> <a href="terminology.html#flow-content">flow content</a>)
+ <span>zero or more </span><a href="li.html#li">li</a><span> elements</span>,
+ <span class="postfix or">or</span> <a href="terminology.html#flow-content">flow content</a>
</p>
</div>
Index: style.css
===================================================================
RCS file: /sources/public/html5/markup/style.css,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- style.css 4 Feb 2010 15:09:21 -0000 1.91
+++ style.css 4 Feb 2010 18:10:52 -0000 1.92
@@ -611,6 +611,10 @@
background-color: #eee;
-webkit-border-radius: 8px;
-webkit-box-shadow: 4px 4px 4px #888;
+ -moz-border-radius: 8px;
+ -moz-box-shadow: 4px 4px 4px #888;
+ border-radius: 8px;
+ box-shadow: 4px 4px 4px #888;
}
.content-models .agroupof .agroupof{
padding-top: 6px;
@@ -629,6 +633,10 @@
border: 2px solid #ccc;
-webkit-border-radius: 8px;
-webkit-box-shadow: 4px 4px 4px #888;
+ -moz-border-radius: 8px;
+ -moz-box-shadow: 4px 4px 4px #888;
+ border-radius: 8px;
+ box-shadow: 4px 4px 4px #888;
}
.agroupof + * {
@@ -654,7 +662,8 @@
#table .elem-mdl > *:last-child:after,
#dl .elem-mdl > *:last-child:after,
#figure .elem-mdl > *:last-child:after,
-#hgroup .elem-mdl > *:last-child:after
+#hgroup .elem-mdl > *:last-child:after,
+#ruby .elem-mdl > *:last-child:after
{
content: "";
}
@@ -663,20 +672,30 @@
#dl-content-model,
#figure-content-model,
#table-content-model,
-#hgroup-content-model
+#hgroup-content-model,
+#ruby-content-model
{
line-height: 200%;
}
-#hgroup-mdls .agroupof {
+#hgroup-mdls .agroupof
+{
display: block;
margin-right: 20%;
}
-#table-mdls .agroupof {
+#ruby-mdls .agroupof
+{
+ display: block;
+ margin-right: 40%;
+}
+#table-mdls .agroupof,
+{
display: block;
margin-right: 50%;
}
-#table-mdls .agroupof .agroupof {
+#table-mdls .agroupof .agroupof,
+#ruby-mdls .agroupof .agroupof
+{
display: block;
margin-right: 0;
}
@@ -688,5 +707,9 @@
border: none;
-webkit-border-radius: none;
-webkit-box-shadow: none;
+ -moz-border-radius: none;
+ -moz-box-shadow: none;
+ border-radius: none;
+ box-shadow: none;
}
Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- spec.html 4 Feb 2010 15:09:21 -0000 1.150
+++ spec.html 4 Feb 2010 18:10:52 -0000 1.151
@@ -10,7 +10,7 @@
<div class="head">
<div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></a></div>
<h1>HTML: The Markup Language</h1>
-<h2>W3C Editor’s Draft <em>4 February 2010</em>
+<h2>W3C Editor’s Draft <em>5 February 2010</em>
</h2>
<dl>
<dt>Latest Editor’s Draft:</dt>
@@ -49,7 +49,7 @@
reports index</a> at http://www.w3.org/TR/.
</em></p>
<p>
- This document is the 4 February 2010 Editor’s Draft of
+ This document is the 5 February 2010 Editor’s Draft of
<cite>HTML: The Markup Language</cite>.
If you’d like to comment on this document, the preferred
@@ -10355,33 +10355,17 @@
<div class="content-models">
<div id="li-mdls">
-
<p class="elem-mdl">
<a href="#flow-content">flow content</a>
<a class="ref" href="#li.attrs">li.attrs</a>
</p>
-<div class="postfix or">or</div>
-
- <p class="elem-mdl">
- <a href="#flow-content">flow content</a>
- <a class="ref" href="#oli.attrs">oli.attrs</a>
- </p>
-<div class="postfix or">or</div>
-
- <p class="elem-mdl">
- <a href="#flow-content">flow content</a>
- <a class="ref" href="#mli.attrs">mli.attrs</a>
- </p>
</div>
</div>
</div>
<div class="no-number no-toc" id="li-attr-mdl">
<h2 class="element-subhead">Permitted attributes <a class="hash" href="#li-attr-mdl">#</a>
</h2>
- <div class="attr-content-models">
-<p><a href="#common-attributes">common attributes</a></p>
-<span class="postfix or">or</span><p><a href="#common-attributes">common attributes</a> <span class="postfix &">&</span> <a href="#oli.attrs.value">value</a></p>
-</div>
+ <div class="attr-content-models"><p><a href="#common-attributes">common attributes</a> <span class="postfix &">&</span> <a href="#oli.attrs.value">value</a></p></div>
</div>
<div class="no-number no-toc" id="li-attributes">
<h2 class="element-subhead">Descriptions for attributes specific to this element <a class="hash" href="#li-attributes">#</a>
@@ -10751,8 +10735,8 @@
<div id="menu-mdls">
<p class="elem-mdl">
- (<span>zero or more </span><a class="ref" href="#mli">li</a><span> elements</span>,
- <span class="postfix or">or</span> <a href="#flow-content">flow content</a>)
+ <span>zero or more </span><a href="#li">li</a><span> elements</span>,
+ <span class="postfix or">or</span> <a href="#flow-content">flow content</a>
<a class="ref" href="#menu.attrs">menu.attrs</a>
</p>
</div>
@@ -11909,7 +11893,7 @@
<div id="ol-mdls">
<p class="elem-mdl">
- <span>zero or more </span><a class="ref" href="#oli">li</a><span> elements</span>
+ <span>zero or more </span><a href="#li">li</a><span> elements</span>
<a class="ref" href="#ol.attrs">ol.attrs</a>
</p>
</div>
Index: ol.html
===================================================================
RCS file: /sources/public/html5/markup/ol.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ol.html 4 Feb 2010 15:09:20 -0000 1.32
+++ ol.html 4 Feb 2010 18:10:52 -0000 1.33
@@ -24,7 +24,7 @@
<div id="ol-mdls">
<p class="elem-mdl">
- <span>zero or more </span><a class="ref" href=".html#oli">li</a><span> elements</span>
+ <span>zero or more </span><a href="li.html#li">li</a><span> elements</span>
</p>
</div>
Received on Thursday, 4 February 2010 18:11:44 UTC