Skip to content

Commit

Permalink
[e] (0) Change the way we define col-span, colgroup-span, colspan, an…
Browse files Browse the repository at this point in the history
…d rowspan to make use of some predefined 'macros'.

git-svn-id: http://svn.whatwg.org/webapps@1389 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Mar 23, 2008
1 parent 4fad236 commit aedb6a2
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 62 deletions.
55 changes: 24 additions & 31 deletions index
Expand Up @@ -19545,19 +19545,16 @@ notes on what would need to be defined for dashed lines:
<code><a href="#col">col</a></code> elements, then the element may have a
<dfn id=span0 title=attr-colgroup-span><code>span</code></dfn> content
attribute specified, whose value must be a <a href="#valid">valid
non-negative integer</a> greater than zero. Its default value, which must
be used if <a href="#rules" title="rules for parsing non-negative
integers">parsing the attribute as a non-negative integer</a> returns
either an error or zero, is 1.
non-negative integer</a> greater than zero.

<p>The <code><a href="#colgroup">colgroup</a></code> element and its <code
title=attr-colgroup-span><a href="#span0">span</a></code> attribute take
part in the <a href="#table0">table model</a>.

<p>The <dfn id=span1 title=dom-colgroup-span><code>span</code></dfn> DOM
attribute must <a href="#reflect">reflect</a> the content attribute of the
same name, with the exception that on setting, if the new value is 0, then
an <code>INDEX_SIZE_ERR</code> exception must be raised.
same name. The value must be <a href="#limited1">limited to only positive
non-zero numbers</a>.

<h4 id=the-col><span class=secno>3.13.5 </span>The <dfn
id=col><code>col</code></dfn> element</h4>
Expand Down Expand Up @@ -19602,19 +19599,16 @@ notes on what would need to be defined for dashed lines:
<p>The element may have a <dfn id=span2
title=attr-col-span><code>span</code></dfn> content attribute specified,
whose value must be a <a href="#valid">valid non-negative integer</a>
greater than zero. Its default value, which must be used if <a
href="#rules" title="rules for parsing non-negative integers">parsing the
attribute as a non-negative integer</a> returns either an error or zero,
is 1.
greater than zero.

<p>The <code><a href="#col">col</a></code> element and its <code
title=attr-col-span><a href="#span2">span</a></code> attribute take part
in the <a href="#table0">table model</a>.

<p>The <dfn id=span3 title=dom-col-span><code>span</code></dfn> DOM
attribute must <a href="#reflect">reflect</a> the content attribute of the
same name, with the exception that on setting, if the new value is 0, then
an <code>INDEX_SIZE_ERR</code> exception must be raised.
same name. The value must be <a href="#limited1">limited to only positive
non-zero numbers</a>.

<h4 id=the-tbody><span class=secno>3.13.6 </span>The <dfn
id=tbody><code>tbody</code></dfn> element</h4>
Expand Down Expand Up @@ -20078,18 +20072,13 @@ notes on what would need to be defined for dashed lines:
href="#th">th</a></code> elements may have a <dfn id=colspan
title=attr-tdth-colspan><code>colspan</code></dfn> content attribute
specified, whose value must be a <a href="#valid">valid non-negative
integer</a> greater than zero. Its default value, which must be used if <a
href="#rules" title="rules for parsing non-negative integers">parsing the
attribute as a non-negative integer</a> returns either an error or zero,
is 1.
integer</a> greater than zero.

<p>The <code><a href="#td">td</a></code> and <code><a
href="#th">th</a></code> elements may also have a <dfn id=rowspan
title=attr-tdth-rowspan><code>rowspan</code></dfn> content attribute
specified, whose value must be a <a href="#valid">valid non-negative
integer</a>. Its default value, which must be used if <a href="#rules"
title="rules for parsing non-negative integers">parsing the attribute as a
non-negative integer</a> returns an error, is also 1.
integer</a>.

<p>The <code><a href="#td">td</a></code> and <code><a
href="#th">th</a></code> elements implement interfaces that inherit from
Expand All @@ -20098,19 +20087,21 @@ notes on what would need to be defined for dashed lines:

<pre
class=idl>interface <dfn id=htmltablecellelement>HTMLTableCellElement</dfn> : <a href="#htmlelement">HTMLElement</a> {
attribute long <span title=dom-td-colSpan>colSpan</span>;
attribute long <span title=dom-td-rowSpan>rowSpan</span>;
readonly attribute long <span title=dom-td-cellIndex>cellIndex</span>;
attribute long <a href="#colspan0" title=dom-tdth-colSpan>colSpan</a>;
attribute long <a href="#rowspan0" title=dom-tdth-rowSpan>rowSpan</a>;
readonly attribute long <a href="#cellindex" title=dom-tdth-cellIndex>cellIndex</a>;
};</pre>

<p>The <dfn id=colspan0 title=dom-tdth-colspan><code>colspan</code></dfn>
DOM attribute must <a href="#reflect">reflect</a> the content attribute of
the same name, with the exception that on setting, if the new value is 0,
then an <code>INDEX_SIZE_ERR</code> exception must be raised.
the same name. The value must be <a href="#limited1">limited to only
positive non-zero numbers</a>.

<p>The <dfn id=rowspan0 title=dom-tdth-rowspan><code>rowspan</code></dfn>
DOM attribute must <a href="#reflect">reflect</a> the content attribute of
the same name.
the same name. Its default value, which must be used if <a href="#rules"
title="rules for parsing non-negative integers">parsing the attribute as a
non-negative integer</a> returns an error, is also 1.

<p>The <dfn id=cellindex
title=dom-tdth-cellIndex><code>cellIndex</code></dfn> DOM attribute must,
Expand Down Expand Up @@ -20639,18 +20630,20 @@ notes on what would need to be defined for dashed lines:

<li>
<p>If the <var title="">current cell</var> has a <code
title="">colspan</code> attribute, then <a href="#rules" title="rules
for parsing non-negative integers">parse that attribute's value</a>, and
let <var title="">colspan</var> be the result.</p>
title=attr-tdth-colspan><a href="#colspan">colspan</a></code> attribute,
then <a href="#rules" title="rules for parsing non-negative
integers">parse that attribute's value</a>, and let <var
title="">colspan</var> be the result.</p>

<p>If parsing that value failed, or returned zero, or if the attribute is
absent, then let <var title="">colspan</var> be 1, instead.</p>

<li>
<p>If the <var title="">current cell</var> has a <code
title="">rowspan</code> attribute, then <a href="#rules" title="rules
for parsing non-negative integers">parse that attribute's value</a>, and
let <var title="">rowspan</var> be the result.</p>
title=attr-tdth-rowspan><a href="#rowspan">rowspan</a></code> attribute,
then <a href="#rules" title="rules for parsing non-negative
integers">parse that attribute's value</a>, and let <var
title="">rowspan</var> be the result.</p>

<p>If parsing that value failed or if the attribute is absent, then let
<var title="">rowspan</var> be 1, instead.</p>
Expand Down
53 changes: 22 additions & 31 deletions source
Expand Up @@ -17129,19 +17129,16 @@ notes on what would need to be defined for dashed lines:
elements, then the element may have a <dfn
title="attr-colgroup-span"><code>span</code></dfn> content attribute
specified, whose value must be a <span>valid non-negative
integer</span> greater than zero. Its default value, which must be
used if <span title="rules for parsing non-negative
integers">parsing the attribute as a non-negative integer</span>
returns either an error or zero, is 1.</p>
integer</span> greater than zero.</p>

<p>The <code>colgroup</code> element and its <code
title="attr-colgroup-span">span</code> attribute take part in the
<span>table model</span>.</p>

<p>The <dfn title="dom-colgroup-span"><code>span</code></dfn> DOM
attribute must <span>reflect</span> the content attribute of the
same name, with the exception that on setting, if the new value is
0, then an <code>INDEX_SIZE_ERR</code> exception must be raised.</p>
same name. The value must be <span>limited to only positive non-zero
numbers</span>.</p>


<h4>The <dfn><code>col</code></dfn> element</h4>
Expand Down Expand Up @@ -17175,19 +17172,16 @@ notes on what would need to be defined for dashed lines:
<p>The element may have a <dfn
title="attr-col-span"><code>span</code></dfn> content attribute
specified, whose value must be a <span>valid non-negative
integer</span> greater than zero. Its default value, which must be
used if <span title="rules for parsing non-negative
integers">parsing the attribute as a non-negative integer</span>
returns either an error or zero, is 1.</p>
integer</span> greater than zero.</p>

<p>The <code>col</code> element and its <code
title="attr-col-span">span</code> attribute take part in the
<span>table model</span>.</p>

<p>The <dfn title="dom-col-span"><code>span</code></dfn> DOM
attribute must <span>reflect</span> the content attribute of the
same name, with the exception that on setting, if the new value is
0, then an <code>INDEX_SIZE_ERR</code> exception must be raised.</p>
same name. The value must be <span>limited to only positive non-zero
numbers</span>.</p>


<h4>The <dfn><code>tbody</code></dfn> element</h4>
Expand Down Expand Up @@ -17564,37 +17558,34 @@ notes on what would need to be defined for dashed lines:
<p>The <code>td</code> and <code>th</code> elements may have a <dfn
title="attr-tdth-colspan"><code>colspan</code></dfn> content
attribute specified, whose value must be a <span>valid non-negative
integer</span> greater than zero. Its default value, which must be
used if <span title="rules for parsing non-negative
integers">parsing the attribute as a non-negative integer</span>
returns either an error or zero, is 1.</p>
integer</span> greater than zero.</p>

<p>The <code>td</code> and <code>th</code> elements may also have a
<dfn title="attr-tdth-rowspan"><code>rowspan</code></dfn> content
attribute specified, whose value must be a <span>valid non-negative
integer</span>. Its default value, which must be used if <span
title="rules for parsing non-negative integers">parsing the
attribute as a non-negative integer</span> returns an error, is also
1.</p>
integer</span>.</p>

<p>The <code>td</code> and <code>th</code> elements implement
interfaces that inherit from the <code>HTMLTableCellElement</code>
interface:</p>

<pre class="idl">interface <dfn>HTMLTableCellElement</dfn> : <span>HTMLElement</span> {
attribute long <span title="dom-td-colSpan">colSpan</span>;
attribute long <span title="dom-td-rowSpan">rowSpan</span>;
readonly attribute long <span title="dom-td-cellIndex">cellIndex</span>;
attribute long <span title="dom-tdth-colSpan">colSpan</span>;
attribute long <span title="dom-tdth-rowSpan">rowSpan</span>;
readonly attribute long <span title="dom-tdth-cellIndex">cellIndex</span>;
};</pre>

<p>The <dfn title="dom-tdth-colspan"><code>colspan</code></dfn> DOM
attribute must <span>reflect</span> the content attribute of the
same name, with the exception that on setting, if the new value is
0, then an <code>INDEX_SIZE_ERR</code> exception must be raised.</p>
same name. The value must be <span>limited to only positive non-zero
numbers</span>.</p>

<p>The <dfn title="dom-tdth-rowspan"><code>rowspan</code></dfn> DOM
attribute must <span>reflect</span> the content attribute of the
same name.</p>
same name. Its default value, which must be used if <span
title="rules for parsing non-negative integers">parsing the
attribute as a non-negative integer</span> returns an error, is also
1.</p>

<p>The <dfn title="dom-tdth-cellIndex"><code>cellIndex</code></dfn>
DOM attribute must, if the element has a parent <code>tr</code>
Expand Down Expand Up @@ -18287,10 +18278,10 @@ notes on what would need to be defined for dashed lines:
<li>

<p>If the <var title="">current cell</var> has a <code
title="">colspan</code> attribute, then <span title="rules for
parsing non-negative integers">parse that attribute's
value</span>, and let <var title="">colspan</var> be the
result.</p>
title="attr-tdth-colspan">colspan</code> attribute, then <span
title="rules for parsing non-negative integers">parse that
attribute's value</span>, and let <var title="">colspan</var> be
the result.</p>

<p>If parsing that value failed, or returned zero, or if the
attribute is absent, then let <var title="">colspan</var> be 1,
Expand All @@ -18301,7 +18292,7 @@ notes on what would need to be defined for dashed lines:
<li>

<p>If the <var title="">current cell</var> has a <code
title="">rowspan</code> attribute, then <span title="rules for
title="attr-tdth-rowspan">rowspan</code> attribute, then <span title="rules for
parsing non-negative integers">parse that attribute's
value</span>, and let <var title="">rowspan</var> be the
result.</p>
Expand Down

0 comments on commit aedb6a2

Please sign in to comment.