- From: Elika Etemad via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 03 Mar 2011 09:12:58 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-text
In directory hutz:/tmp/cvs-serv11609
Modified Files:
Overview.html Overview.src.html
Log Message:
Fold text-align-first into text-align since this gives better cascading (and backwards-compat) behavior.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-text/Overview.html,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- Overview.html 3 Mar 2011 08:57:48 -0000 1.71
+++ Overview.html 3 Mar 2011 09:12:56 -0000 1.72
@@ -89,7 +89,7 @@
<dt>This version:
<dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
- 2011/03/02 02:15:23 $ (CVS $Revision$)</a> <!--
+ 2011/03/03 08:57:48 $ (CVS $Revision$)</a> <!--
<dd><a href="http://www.w3.org/TR/2011/WD-css3-text-20110303/">http://www.w3.org/TR/2011/WD-css3-text-20110303/</a></dd>
-->
@@ -346,15 +346,11 @@
</span>Details on Character-based Alignment in a Table Column</a>
</ul>
- <li><a href="#text-align-first"><span class=secno>8.2. </span> First
- Line Alignment: the ‘<code
- class=property>text-align-first</code>’ property</a>
-
- <li><a href="#text-align-last"><span class=secno>8.3. </span> Last Line
+ <li><a href="#text-align-last"><span class=secno>8.2. </span> Last Line
Alignment: the ‘<code
class=property>text-align-last</code>’ property</a>
- <li><a href="#text-justify"><span class=secno>8.4. </span> Justification
+ <li><a href="#text-justify"><span class=secno>8.3. </span> Justification
Method: the ‘<code class=property>text-justify</code>’
property</a>
</ul>
@@ -2466,10 +2462,10 @@
<tr>
<th>Value:
- <td>[ start | end | left | right | center | justify | match-parent ] ||
- <a class=noxref
+ <td>[ start | <a class=noxref
href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span
- class=value-inst-string><string></span></a>
+ class=value-inst-string><string></span></a> ]? [ start | end |
+ left | right | center | justify | match-parent ]
<tr>
<th>Initial:
@@ -2565,6 +2561,11 @@
class=property>right</code>’.
</dl>
+ <p>If two keywords are given in combination, then the first value specifies
+ the alignment of the first line and any line immediately after a forced
+ line break; and the second value specifies the alignment of any remaining
+ lines.
+
<p>A block of text is a stack of <a
href="http://www.w3.org/TR/CSS21/visuren.html#line-box">line boxes</a>. In
the case of ‘<code class=property>start</code>’, ‘<code
@@ -2623,7 +2624,7 @@
<li>when character-based alignment is applied to boxes that are not table
cells.
- <li>when the text wraps to multiple lines.
+ <li>when the text wraps to multiple lines (at unforced break points).
<li>when the column is wide enough that the character alignment alone does
not determine the positions of its character-aligned contents. In this
@@ -2688,74 +2689,7 @@
right-to-left writing systems, and the primary use case of character-based
alignment is for numerical alignment.
- <h3 id=text-align-first><span class=secno>8.2. </span> First Line
- Alignment: the ‘<a href="#text-align-first0"><code
- class=property>text-align-first</code></a>’ property</h3>
-
- <table class=propdef>
- <tbody>
- <tr>
- <th>Name:
-
- <td><dfn id=text-align-first0>text-align-first</dfn>
-
- <tr>
- <th>Value:
-
- <td>auto | start
-
- <tr>
- <th>Initial:
-
- <td>auto
-
- <tr>
- <th>Applies to:
-
- <td>block containers
-
- <tr>
- <th>Inherited:
-
- <td>yes
-
- <tr>
- <th>Percentages:
-
- <td>N/A
-
- <tr>
- <th>Media:
-
- <td>visual
-
- <tr>
- <th>Computed value:
-
- <td>specified value
- </table>
-
- <p>This property describes how the first line of a block or a line right
- after a forced line break is aligned. Values have the following meanings:
-
- <dl>
- <dt><dfn id=auto0>‘<code class=css>auto</code>’</dfn>
-
- <dd>Use the alignment given by ‘<a href="#text-align0"><code
- class=property>text-align</code></a>’ (or by ‘<a
- href="#text-align-last0"><code
- class=property>text-align-last</code></a>’ if that applies
- instead).
-
- <dt><dfn id=start0>‘<code class=css>start</code>’</dfn>
-
- <dd>The inline contents are aligned to the start edge of the line box.
- (This overrides ‘<a href="#text-align-last0"><code
- class=property>text-align-last</code></a>’ if both apply to this
- line.)
- </dl>
-
- <h3 id=text-align-last><span class=secno>8.3. </span> Last Line Alignment:
+ <h3 id=text-align-last><span class=secno>8.2. </span> Last Line Alignment:
the ‘<a href="#text-align-last0"><code
class=property>text-align-last</code></a>’ property</h3>
@@ -2803,20 +2737,30 @@
</table>
<p>This property describes how the last line of a block or a line right
- before a forced line break is aligned. ‘<code
- class=css>auto</code>’ is equivalent to the value of the ‘<a
+ before a forced line break is aligned. If a line is also the first line of
+ the block or the first line after a forced line break, then ‘<a
+ href="#text-align-last0"><code
+ class=property>text-align-last</code></a>’ takes precedence over
+ ‘<a href="#text-align0"><code
+ class=property>text-align</code></a>’ <em>except</em> when two
+ keywords are given for ‘<a href="#text-align0"><code
+ class=property>text-align</code></a>’ (i.e. when ‘<a
href="#text-align0"><code class=property>text-align</code></a>’
- property except when ‘<a href="#text-align0"><code
- class=property>text-align</code></a>’ is set to ‘<code
- class=css>justify</code>’, in which case it is ‘<code
- class=css>justify</code>’ when ‘<a href="#text-justify0"><code
- class=property>text-justify</code></a>’ is ‘<code
- class=css>distribute</code>’ and ‘<code
+ assigns an explicit first line alignment).
+
+ <p>‘<code class=css>auto</code>’ is equivalent to the value of
+ the ‘<a href="#text-align0"><code
+ class=property>text-align</code></a>’ property except when ‘<a
+ href="#text-align0"><code class=property>text-align</code></a>’ is
+ set to ‘<code class=css>justify</code>’, in which case it is
+ ‘<code class=css>justify</code>’ when ‘<a
+ href="#text-justify0"><code class=property>text-justify</code></a>’
+ is ‘<code class=css>distribute</code>’ and ‘<code
class=css>start</code>’ otherwise. All other values have the same
meanings as in ‘<a href="#text-align0"><code
class=property>text-align</code></a>’.
- <h3 id=text-justify><span class=secno>8.4. </span> Justification Method:
+ <h3 id=text-justify><span class=secno>8.3. </span> Justification Method:
the ‘<a href="#text-justify0"><code
class=property>text-justify</code></a>’ property</h3>
@@ -2872,7 +2816,7 @@
on inline elements. It takes the following values:
<dl>
- <dt><dfn id=auto1 title="text-justify:auto"><code>auto</code></dfn>
+ <dt><dfn id=auto0 title="text-justify:auto"><code>auto</code></dfn>
<dd>The UA determines the justification algorithm to follow, based on a
balance between performance and adequate presentation quality.
@@ -4826,7 +4770,7 @@
Values have the following meanings:
<dl>
- <dt><dfn id=auto2>‘<code class=css>auto</code>’</dfn>
+ <dt><dfn id=auto1>‘<code class=css>auto</code>’</dfn>
<dd>The user agent may use any algorithm to determine the underline's
position; however in vertical typographic mode, if the language of the
@@ -5532,8 +5476,7 @@
<li>Added more details to behavior of ‘<a href="#text-align0"><code
class=property>text-align</code></a>’ with <string> values.
- <li>Added ‘<a href="#text-align-first0"><code
- class=property>text-align-first</code></a>’.
+ <li>Added ‘<code class=property>text-align-first</code>’.
<li>Added ‘<code class=css>auto</code>’ value to ‘<a
href="#text-align-last0"><code
@@ -5965,8 +5908,8 @@
<tr valign=baseline>
<td><a class=property href="#text-align0">text-align</a>
- <td>[ start | end | left | right | center | justify | match-parent ] ||
- <string>
+ <td>[ start | <string> ]? [ start | end | left | right | center |
+ justify | match-parent ]
<td>start
@@ -5979,21 +5922,6 @@
<td>visual
<tr valign=baseline>
- <td><a class=property href="#text-align-first0">text-align-first</a>
-
- <td>auto | start
-
- <td>auto
-
- <td>block containers
-
- <td>yes
-
- <td>N/A
-
- <td>visual
-
- <tr valign=baseline>
<td><a class=property href="#text-align-last0">text-align-last</a>
<td>auto | start | end | left | right | center | justify
@@ -6413,8 +6341,7 @@
<li>authoring tool, <a href="#authoring-tool" title="authoring
tool"><strong>2.</strong></a>
- <li>‘<code class=css>auto</code>’, <a href="#auto0"
- title="''auto''"><strong>8.2.</strong></a>, <a href="#auto2"
+ <li>‘<code class=css>auto</code>’, <a href="#auto1"
title="''auto''"><strong>11.1.6.</strong></a>
<li>‘<code class=css>below left</code>’, <a href="#below-left"
@@ -6448,7 +6375,7 @@
title=each-line><strong>10.1.</strong></a>
<li>expansion opportunities, <a href="#expansion-opportunities"
- title="expansion opportunities"><strong>8.4.</strong></a>
+ title="expansion opportunities"><strong>8.3.</strong></a>
<li>fullwidth closing punctuation, <a
href="#fullwidth-closing-punctuation0" title="fullwidth closing
@@ -6581,9 +6508,6 @@
<li>‘<code class=css>spread</code>’, <a href="#spread"
title="''spread''"><strong>6.5.</strong></a>
- <li>‘<code class=css>start</code>’, <a href="#start0"
- title="''start''"><strong>8.2.</strong></a>
-
<li>style sheet
<ul>
<li>as conformance class, <a href="#style-sheet" title="style sheet, as
@@ -6602,14 +6526,11 @@
<li>text-align:end, <a href="#end"
title="text-align:end"><strong>8.1.</strong></a>
- <li>text-align-first, <a href="#text-align-first0"
- title=text-align-first><strong>8.2.</strong></a>
-
<li>text-align:justify, <a href="#justify"
title="text-align:justify"><strong>8.1.</strong></a>
<li>text-align-last, <a href="#text-align-last0"
- title=text-align-last><strong>8.3.</strong></a>
+ title=text-align-last><strong>8.2.</strong></a>
<li>text-align:left, <a href="#left"
title="text-align:left"><strong>8.1.</strong></a>
@@ -6727,28 +6648,28 @@
title=text-indent><strong>10.1.</strong></a>
<li>text-justify, <a href="#text-justify0"
- title=text-justify><strong>8.4.</strong></a>
+ title=text-justify><strong>8.3.</strong></a>
- <li>text-justify:auto, <a href="#auto1"
- title="text-justify:auto"><strong>8.4.</strong></a>
+ <li>text-justify:auto, <a href="#auto0"
+ title="text-justify:auto"><strong>8.3.</strong></a>
<li>text-justify:distribute, <a href="#distribute"
- title="text-justify:distribute"><strong>8.4.</strong></a>
+ title="text-justify:distribute"><strong>8.3.</strong></a>
<li>text-justify:inter-cluster, <a href="#inter-cluster"
- title="text-justify:inter-cluster"><strong>8.4.</strong></a>
+ title="text-justify:inter-cluster"><strong>8.3.</strong></a>
<li>text-justify:inter-ideographic, <a href="#inter-ideograph"
- title="text-justify:inter-ideographic"><strong>8.4.</strong></a>
+ title="text-justify:inter-ideographic"><strong>8.3.</strong></a>
<li>text-justify:inter-word, <a href="#inter-word"
- title="text-justify:inter-word"><strong>8.4.</strong></a>
+ title="text-justify:inter-word"><strong>8.3.</strong></a>
<li>text-justify:kashida, <a href="#kashida"
- title="text-justify:kashida"><strong>8.4.</strong></a>
+ title="text-justify:kashida"><strong>8.3.</strong></a>
<li>text-justify:none, <a href="#none2"
- title="text-justify:none"><strong>8.4.</strong></a>
+ title="text-justify:none"><strong>8.3.</strong></a>
<li>text-outline, <a href="#text-outline0"
title=text-outline><strong>11.4.</strong></a>
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-text/Overview.src.html,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- Overview.src.html 3 Mar 2011 08:57:48 -0000 1.168
+++ Overview.src.html 3 Mar 2011 09:12:56 -0000 1.169
@@ -1719,8 +1719,8 @@
</tr>
<tr>
<th>Value:</th>
- <td>[ start | end | left | right | center | justify | match-parent ] ||
- <a class="noxref" href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span class="value-inst-string"><string></span></a>
+ <td>[ start | <a class="noxref" href="http://www.w3.org/TR/CSS21/syndata.html#value-def-string"><span class="value-inst-string"><string></span></a> ]?
+ [ start | end | left | right | center | justify | match-parent ]
</td>
</tr>
<tr>
@@ -1787,6 +1787,11 @@
value and results in a computed value of either 'left' or 'right'.
</dl>
+ <p>If two keywords are given in combination, then the first value specifies
+ the alignment of the first line and any line immediately after a forced
+ line break; and the second value specifies the alignment of any remaining
+ lines.
+
<p>A block of text is a stack of
<a href="http://www.w3.org/TR/CSS21/visuren.html#line-box">line boxes</a>.
In the case of 'start', 'end', 'left', 'right' and 'center', this
@@ -1833,7 +1838,7 @@
<ul>
<li>when character-based alignment is applied to boxes that are not table
cells.
- <li>when the text wraps to multiple lines.
+ <li>when the text wraps to multiple lines (at unforced break points).
<li>when the column is wide enough that the character alignment alone does
not determine the positions of its character-aligned contents. In this
case the keyword alignment of the first cell in the column with a
@@ -1893,58 +1898,6 @@
in right-to-left writing systems, and the primary use case of
character-based alignment is for numerical alignment.</p>
- <h3 id="text-align-first">
- First Line Alignment: the 'text-align-first' property</h3>
-
- <table class="propdef">
- <tbody>
- <tr>
- <th>Name:</th>
- <td><dfn>text-align-first</dfn></td>
- </tr>
- <tr>
- <th>Value:</th>
- <td>auto | start
- </td>
- </tr>
- <tr>
- <th>Initial:</th>
- <td>auto</td>
- </tr>
- <tr>
- <th>Applies to:</th>
- <td>block containers</td>
- </tr>
- <tr>
- <th>Inherited:</th>
- <td>yes</td>
- </tr>
- <tr>
- <th>Percentages:</th>
- <td>N/A</td>
- </tr>
- <tr>
- <th>Media:</th>
- <td>visual</td>
- </tr>
- <tr>
- <th>Computed value:</th>
- <td>specified value</td>
- </tr>
- </tbody>
- </table>
-
- <p>This property describes how the first line of a block or a line right after
- a forced line break is aligned. Values have the following meanings:
- <dl>
- <dt><dfn>''auto''</dfn></dt>
- <dd>Use the alignment given by 'text-align' (or by 'text-align-last'
- if that applies instead).</dd>
- <dt><dfn>''start''</dfn></dt>
- <dd>The inline contents are aligned to the start edge of the line box.
- (This overrides 'text-align-last' if both apply to this line.)</dd>
- </dl>
-
<h3 id="text-align-last">
Last Line Alignment: the 'text-align-last' property</h3>
@@ -1987,7 +1940,13 @@
</table>
<p>This property describes how the last line of a block or a line
- right before a forced line break is aligned. ''auto'' is
+ right before a forced line break is aligned. If a line is also
+ the first line of the block or the first line after a forced line
+ break, then 'text-align-last' takes precedence over 'text-align'
+ <em>except</em> when two keywords are given for 'text-align'
+ (i.e. when 'text-align' assigns an explicit first line alignment).
+
+ <p>''auto'' is
equivalent to the value of the 'text-align' property except when
'text-align' is set to ''justify'', in which case it is ''justify''
when 'text-justify' is ''distribute'' and ''start'' otherwise.
Received on Thursday, 3 March 2011 09:13:03 UTC