Skip to content

Commit

Permalink
use 'current foo' to mean elements, and x-foo/y-foo to mean coordinat…
Browse files Browse the repository at this point in the history 
…es; use 'current column' instead of 'current col'; define row processing (still some missing bits); placeholders for some more table stuff

git-svn-id: http://svn.whatwg.org/webapps@308 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Nov 21, 2006
1 parent de3c206 commit b9e697c
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 32 deletions.
84 changes: 68 additions & 16 deletions index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15063,12 +15063,12 @@ disallow: http://microformats.org/wiki/rel-enclosure
value <span><var title="">x<sub title="">max</sub></var>+1</span>.</p>

<li>
<p>Let the <var title="">current col</var> be the first <code><a
<p>Let the <var title="">current column</var> be the first <code><a
href="#col0">col</a></code> element child of the <code><a
href="#colgroup0">colgroup</a></code> element.</p>

<li>
<p><em>Columns.</em> If the <var title="">current col</var>
<p><em>Columns.</em> If the <var title="">current column</var>
<code><a href="#col0">col</a></code> element has a <code
title=attr-col-span><a href="#span3">span</a></code> attribute,
then parse its value using the <a href="#rules">rules for parsing
Expand All @@ -15089,14 +15089,14 @@ disallow: http://microformats.org/wiki/rel-enclosure
<li>
<p>Let the last <var title="">span</var> <a href="#column"
title=concept-column>columns</a> in <var title="">the table</var>
correspond to the <var title="">current col</var> <code><a
correspond to the <var title="">current column</var> <code><a
href="#col0">col</a></code> element.</p>

<li>
<p>If <var title="">current col</var> is not the last <code><a
<p>If <var title="">current column</var> is not the last <code><a
href="#col0">col</a></code> element child of the <code><a
href="#colgroup0">colgroup</a></code> element, then let the <var
title="">current col</var> be the next <code><a
title="">current column</var> be the next <code><a
href="#col0">col</a></code> element child of the <code><a
href="#colgroup0">colgroup</a></code> element, and return to the
third step of this innermost group of steps (columns).</p>
Expand Down Expand Up @@ -15173,10 +15173,11 @@ disallow: http://microformats.org/wiki/rel-enclosure
</ol>

<li>
<p>Let <var title="">current row</var> be zero. When the algorithm is
aborted, if <var title="">current row</var> does not equal <var
title="">y<sub title="">max</sub></var>, then that is a <a
href="#table3">table model error</a>.</p>
<p>Let <var title="">y<sub title="">current</sub></var> be zero. When the
algorithm is aborted, if <var title="">y<sub
title="">current</sub></var> does not equal <var title="">y<sub
title="">max</sub></var>, then that is a <a href="#table3">table model
error</a>.</p>

<li>
<p><em>Rows.</em> While the <var title="">current element</var> is not
Expand All @@ -15201,12 +15202,12 @@ disallow: http://microformats.org/wiki/rel-enclosure
step (rows).</p>

<li>
<p>Otherwise, if <var title="">current row</var> is less than <var
title="">y<sub title="">max</sub></var>, then this is a <a
href="#table3">table model error</a>; let <var title="">current
row</var> equal <var title="">y<sub title="">max</sub></var>. (This
prevents cells that would otherwise flow out of their row group from
doing so.)</p>
<p>Otherwise, if <var title="">y<sub title="">current</sub></var> is less
than <var title="">y<sub title="">max</sub></var>, then this is a <a
href="#table3">table model error</a>; let <var title="">y<sub
title="">current</sub></var> equal <var title="">y<sub
title="">max</sub></var>. (This prevents cells that would otherwise flow
out of their row group from doing so.)</p>

<li>
<p>Let <var title="">y<sub title="">start</sub></var> have the value
Expand Down Expand Up @@ -15237,9 +15238,60 @@ disallow: http://microformats.org/wiki/rel-enclosure

<ol>
<li>
<p class=big-issue>...
<p>Increase <var title="">y<sub title="">current</sub></var> by one.</p>

<li>
<p>Let <var title="">x<sub title="">current</sub></var> be 1.</p>

<li>
<p>If the <code><a href="#tr0">tr</a></code> element being processed
contains no <code><a href="#td0">td</a></code> or <code><a
href="#th0">th</a></code> elements, then abort this set of steps and
return to the algorithm above.</p>

<li>
<p>Let <var title="">current cell</var> be the first <code><a
href="#td0">td</a></code> or <code><a href="#th0">th</a></code> element
in the <code><a href="#tr0">tr</a></code> element being processed.</p>

<li>
<p><em>Cells.</em> While <var title="">x<sub title="">current</sub></var>
is less than or equal to <var title="">x<sub title="">max</sub></var>
and the slot with coordinate (<var title="">x<sub
title="">current</sub></var>, <var title="">y<sub
title="">current</sub></var>) already has a cell assigned to it,
increase <var title="">x<sub title="">current</sub></var> by 1.</p>

<li>
<p>If <var title="">x<sub title="">current</sub></var> is greater than
<var title="">x<sub title="">max</sub></var>, increase <var
title="">x<sub title="">max</sub></var> by 1 (which will make them
equal).</p>

<li>
<p class=big-issue> parse colspan/rowspan, assign slots (including anchor
slot), increase x-max/y-max as appropriate</p>

<p class=big-issue> rowspan=0</p>

<li>
<p>If <var title="">current cell</var> is the last <code><a
href="#td0">td</a></code> or <code><a href="#th0">th</a></code> element
in the <code><a href="#tr0">tr</a></code> element being processed, then
abort this set of steps and return to the algorithm above.</p>

<li>
<p>Let <var title="">current cell</var> be the next <code><a
href="#td0">td</a></code> or <code><a href="#th0">th</a></code> element
in the <code><a href="#tr0">tr</a></code> element being processed.</p>

<li>
<p>Return to step 5 (cells).</p>
</ol>

<p class=big-issue> if there's a column containing no anchor slots, then
it's a table model error

<p class=big-issue>...

<h3 id=forms0><span class=secno>4.7. </span>Forms <a href="#tbw"
Expand Down
116 changes: 100 additions & 16 deletions source
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13438,16 +13438,16 @@ disallow: http://microformats.org/wiki/rel-enclosure

<li>

<p>Let the <var title="">current col</var> be the first
<p>Let the <var title="">current column</var> be the first
<code>col</code> element child of the <code>colgroup</code>
element.</p>

</li>

<li>

<p><em>Columns.</em> If the <var title="">current col</var>
<code>col</code> element has a <code
<p><em>Columns.</em> If the <var title="">current
column</var> <code>col</code> element has a <code
title="attr-col-span">span</code> attribute, then parse its
value using the <span>rules for parsing non-negative
integers</span>.</p>
Expand All @@ -13474,16 +13474,16 @@ disallow: http://microformats.org/wiki/rel-enclosure
<p>Let the last <var title="">span</var> <span
title="concept-column">columns</span> in <var title="">the
table</var> correspond to the <var title="">current
col</var> <code>col</code> element.</p>
column</var> <code>col</code> element.</p>

</li>

<li>

<p>If <var title="">current col</var> is not the last
<p>If <var title="">current column</var> is not the last
<code>col</code> element child of the <code>colgroup</code>
element, then let the <var title="">current col</var> be the
next <code>col</code> element child of the
element, then let the <var title="">current column</var> be
the next <code>col</code> element child of the
<code>colgroup</code> element, and return to the third step
of this innermost group of steps (columns).</p>

Expand Down Expand Up @@ -13592,10 +13592,11 @@ disallow: http://microformats.org/wiki/rel-enclosure

<li>

<p>Let <var title="">current row</var> be zero. When the algorithm
is aborted, if <var title="">current row</var> does not equal <var
title="">y<sub title="">max</sub></var>, then that is a
<span>table model error</span>.</p>
<p>Let <var title="">y<sub title="">current</sub></var> be
zero. When the algorithm is aborted, if <var title="">y<sub
title="">current</sub></var> does not equal <var title="">y<sub
title="">max</sub></var>, then that is a <span>table model
error</span>.</p>

</li>

Expand Down Expand Up @@ -13626,10 +13627,10 @@ disallow: http://microformats.org/wiki/rel-enclosure

<li>

<p>Otherwise, if <var title="">current row</var> is less than <var
title="">y<sub title="">max</sub></var>, then this is a
<span>table model error</span>; let <var title="">current
row</var> equal <var title="">y<sub
<p>Otherwise, if <var title="">y<sub title="">current</sub></var>
is less than <var title="">y<sub title="">max</sub></var>, then
this is a <span>table model error</span>; let <var title="">y<sub
title="">current</sub></var> equal <var title="">y<sub
title="">max</sub></var>. (This prevents cells that would
otherwise flow out of their row group from doing so.)</p>

Expand Down Expand Up @@ -13678,10 +13679,93 @@ disallow: http://microformats.org/wiki/rel-enclosure

<ol>

<li><p class="big-issue">...</p></li>
<li>

<p>Increase <var title="">y<sub title="">current</sub></var> by
one.</p>

</li>

<li>

<p>Let <var title="">x<sub title="">current</sub></var> be 1.</p>

</li>

<li>

<p>If the <code>tr</code> element being processed contains no
<code>td</code> or <code>th</code> elements, then abort this set
of steps and return to the algorithm above.</p>

</li>

<li>

<p>Let <var title="">current cell</var> be the first
<code>td</code> or <code>th</code> element in the <code>tr</code>
element being processed.</p>

</li>

<li>

<p><em>Cells.</em> While <var title="">x<sub
title="">current</sub></var> is less than or equal to <var
title="">x<sub title="">max</sub></var> and the slot with
coordinate (<var title="">x<sub title="">current</sub></var>, <var
title="">y<sub title="">current</sub></var>) already has a cell
assigned to it, increase <var title="">x<sub
title="">current</sub></var> by 1.</p>

</li>

<li>

<p>If <var title="">x<sub title="">current</sub></var> is greater
than <var title="">x<sub title="">max</sub></var>, increase <var
title="">x<sub title="">max</sub></var> by 1 (which will make them
equal).</p>

</li>

<li>

<p class="big-issue"> parse colspan/rowspan, assign slots
(including anchor slot), increase x-max/y-max as appropriate </p>

<p class="big-issue"> rowspan=0 </p>

</li>

<li>

<p>If <var title="">current cell</var> is the last <code>td</code>
or <code>th</code> element in the <code>tr</code> element being
processed, then abort this set of steps and return to the
algorithm above.</p>

</li>

<li>

<p>Let <var title="">current cell</var> be the next
<code>td</code> or <code>th</code> element in the <code>tr</code>
element being processed.</p>

</li>

<li>

<p>Return to step 5 (cells).</p>

</li>

</ol>

<p class="big-issue"> if there's a column containing no anchor
slots, then it's a table model error </p>

<p class="big-issue">...</p>


Expand Down

0 comments on commit b9e697c

Please sign in to comment.