Skip to content

Commit 12128b2

Browse files
committed
Fix syntax of 'text-align' when combining values.
1 parent 031d76b commit 12128b2

2 files changed

Lines changed: 27 additions & 26 deletions

File tree

css3-text/Overview.html

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
<h1>CSS Text Level 3</h1>
3131

32-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 17 November
32+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 18 November
3333
2011</h2>
3434

3535
<dl>
3636
<dt>This version:
3737

3838
<dd><a href="http://dev.w3.org/csswg/css3-text/">$Date: 2011/11/17
39-
00:09:12 $ (CVS $Revision$)</a> <!--
40-
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20111117/">http://www.w3.org/TR/2011/WD-css3-text-20111117/</a></dd>
39+
00:29:46 $ (CVS $Revision$)</a> <!--
40+
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20111118/">http://www.w3.org/TR/2011/WD-css3-text-20111118/</a></dd>
4141
-->
4242

4343

@@ -63,9 +63,6 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 17 November
6363

6464
<dd><a href="mailto:kojiishi@gluesoft.co.jp">Koji Ishii</a> (Invited
6565
Expert)
66-
67-
<dd><a href="mailto:murakami@antenna.co.jp">Shinyu Murakami</a> (<a
68-
href="http://www.antenna.co.jp/">Antenna House</a>)
6966
</dl>
7067
<!--begin-copyright-->
7168
<p class=copyright><a
@@ -2296,10 +2293,10 @@ <h3 id=text-align><span class=secno>7.1. </span> Text Alignment: the
22962293
<tr>
22972294
<th>Value:
22982295

2299-
<td>[ start | <a class=noxref
2296+
<td>start end | match-parent | <a class=noxref
23002297
href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span
2301-
class=value-inst-string>&lt;string&gt;</span></a> ]? [ start | end |
2302-
left | right | center | justify | match-parent ]
2298+
class=value-inst-string>&lt;string&gt;</span></a>? [ start | end | left
2299+
| right | center | justify ]
23032300

23042301
<tr>
23052302
<th>Initial:
@@ -2386,7 +2383,7 @@ <h3 id=text-align><span class=secno>7.1. </span> Text Alignment: the
23862383
When applied to a table cell, specifies the <dfn
23872384
id=alignment-character>alignment character</dfn> around which the cell's
23882385
contents will align. See <a href="#character-alignment">below</a> for
2389-
further details.
2386+
further details and how this value combines with keywords.
23902387

23912388
<dt><dfn id=match-parent title="text-align:match-parent">&lsquo;<code
23922389
class=css>match-parent</code>&rsquo;</dfn>
@@ -2399,12 +2396,16 @@ <h3 id=text-align><span class=secno>7.1. </span> Text Alignment: the
23992396
results in a computed value of either &lsquo;<code
24002397
class=property>left</code>&rsquo; or &lsquo;<code
24012398
class=property>right</code>&rsquo;.
2402-
</dl>
24032399

2404-
<p>If two keywords are given in combination, then the first value specifies
2405-
the alignment of the first line and any line immediately after a forced
2406-
line break; and the second value specifies the alignment of any remaining
2407-
lines.
2400+
<dt><dfn id=start-end title="text-align:start end">&lsquo;<code
2401+
class=css>start end</code>&rsquo;</dfn>
2402+
2403+
<dd>Specifies &lsquo;<code class=css>start</code>&rsquo;&lsquo;<code
2404+
class=css> alignment of the first line and any line immediately after a
2405+
forced line break; and </code>&rsquo;&lsquo;<code
2406+
class=property>end</code>&rsquo;&lsquo;<code class=css> alignment of any
2407+
remaining lines not affected by </code>&rsquo;text-align-last'.
2408+
</dl>
24082409

24092410
<p>A block of text is a stack of <a
24102411
href="http://www.w3.org/TR/CSS21/visuren.html#line-box">line boxes</a>. In
@@ -6610,8 +6611,8 @@ <h2 class=no-num id=appendix-h-full-property-index>Appendix H: Full
66106611
<tr>
66116612
<th><a class=property href="#text-align0">text-align</a>
66126613

6613-
<td>[ start | &lt;string&gt; ]? [ start | end | left | right | center |
6614-
justify | match-parent ]
6614+
<td>start end | match-parent | &lt;string&gt;? [ start | end | left |
6615+
right | center | justify ]
66156616

66166617
<td>start
66176618

css3-text/Overview.src.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ <h2 class="no-num no-toc">[LONGSTATUS] [DATE]</h2>
4848
<dt>Editors:</dt>
4949
<dd><a href="http://fantasai.inkedblade.net/contact">Elika J. Etemad</a> (Mozilla)</dd>
5050
<dd><a href="mailto:kojiishi@gluesoft.co.jp">Koji Ishii</a> (Invited Expert)</dd>
51-
<dd><a href="mailto:murakami@antenna.co.jp">Shinyu Murakami</a> (<a href="http://www.antenna.co.jp/">Antenna House</a>)</dd>
5251
</dl>
5352

5453
<!--begin-copyright-->
@@ -1577,8 +1576,9 @@ <h3 id="text-align">
15771576
</tr>
15781577
<tr>
15791578
<th>Value:</th>
1580-
<td>[ start | <a class="noxref" href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span class="value-inst-string">&lt;string&gt;</span></a> ]?
1581-
[ start | end | left | right | center | justify | match-parent ]
1579+
<td>start end | match-parent |
1580+
<a class="noxref" href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span class="value-inst-string">&lt;string&gt;</span></a>?
1581+
[ start | end | left | right | center | justify ]
15821582
</td>
15831583
</tr>
15841584
<tr>
@@ -1637,19 +1637,19 @@ <h3 id="text-align">
16371637
be <a href="http://www.w3.org/TR/CSS21/conform.html#ignore">ignored</a>.
16381638
When applied to a table cell, specifies the <dfn>alignment character</dfn>
16391639
around which the cell's contents will align. See
1640-
<a href="#character-alignment">below</a> for further details.
1640+
<a href="#character-alignment">below</a> for further details and
1641+
how this value combines with keywords.
16411642
</dd>
16421643
<dt><dfn title="text-align:match-parent">''match-parent''</dfn></dt>
16431644
<dd>This value behaves the same as 'inherit' except that an inherited
16441645
'start' or 'end' keyword is calculated against its parent's 'direction'
16451646
value and results in a computed value of either 'left' or 'right'.
1647+
<dt><dfn title="text-align:start end">''start end''</dfn>
1648+
<dd>Specifies ''start''' alignment of the first line and any line
1649+
immediately after a forced line break; and ''end'' alignment of
1650+
any remaining lines not affected by 'text-align-last'.
16461651
</dl>
16471652

1648-
<p>If two keywords are given in combination, then the first value specifies
1649-
the alignment of the first line and any line immediately after a forced
1650-
line break; and the second value specifies the alignment of any remaining
1651-
lines.
1652-
16531653
<p>A block of text is a stack of
16541654
<a href="http://www.w3.org/TR/CSS21/visuren.html#line-box">line boxes</a>.
16551655
In the case of 'start', 'end', 'left', 'right' and 'center', this

0 commit comments

Comments
 (0)