Skip to content

Commit ec5dcd9

Browse files
committed
[css-writing-modes] Renamed text-combine-horizontal to text-combine-upright as per <http://lists.w3.org/Archives/Public/www-style/2014Feb/0617.html>
1 parent e272921 commit ec5dcd9

File tree

2 files changed

+147
-130
lines changed

2 files changed

+147
-130
lines changed

css-writing-modes/Overview.bs

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Former Editor: Paul Nelson, <a href="http://www.microsoft.com/">Microsoft</a>, p
2424
Former Editor: Michel Suignard, <a href="http://www.microsoft.com/">Microsoft</a>, michelsu@microsoft.com
2525
Abstract: CSS Writing Modes Level 3 defines CSS support for various international writing modes, such as left-to-right (e.g. Latin or Indic), right-to-left (e.g. Hebrew or Arabic), bidirectional (e.g. mixed Latin and Arabic) and vertical (e.g. Asian scripts).
2626
At Risk: The ''use-glyph-orientation'' of 'text-orientation'
27-
At Risk: The ''digits'' value of 'text-combine-horizontal'.
28-
At Risk: The look-ahead/look-behind sequencing rules for 'text-combine-horizontal'.
27+
At Risk: The ''digits'' value of 'text-combine-upright'.
28+
At Risk: The look-ahead/look-behind sequencing rules for 'text-combine-upright'.
2929
Ignored Terms: glyph orientation, *-left, *-right, *-top, *-bottom, block containers, text-combine-mode
3030
Link Defaults: css21 (property) display/min-height/max-height/min-width/max-width/clip, css-text-3 (property) letter-spacing, css-text-decor-3 (property) text-decoration, svg2 (property) glyph-orientation-vertical/glyph-orientation-horizontal
3131
</pre>
@@ -2245,11 +2245,12 @@ Page Flow: the page progression direction</h2>
22452245
<h2 id="text-combine">
22462246
Glyph Composition</h2>
22472247

2248-
<h3 id="text-combine-horizontal">
2249-
Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
2248+
<h3 id="text-combine-upright">
2249+
<span id="text-combine-horizontal"></span>
2250+
Horizontal-in-Vertical Composition: the 'text-combine-upright' property</h3>
22502251

22512252
<pre class='propdef'>
2252-
Name: text-combine-horizontal
2253+
Name: text-combine-upright
22532254
Value: none | all | [ digits &lt;integer&gt;? ]
22542255
Initial: none
22552256
Applies to: non-replaced inline elements
@@ -2269,15 +2270,15 @@ Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
22692270
This property only has an effect in vertical writing modes. Values have the following meanings:
22702271

22712272
<dl>
2272-
<dt><dfn value for=text-combine-horizontal>none</dfn>
2273+
<dt><dfn value for=text-combine-upright>none</dfn>
22732274
<dd>No special processing.</dd>
22742275

2275-
<dt><dfn value for=text-combine-horizontal>all</dfn>
2276+
<dt><dfn value for=text-combine-upright>all</dfn>
22762277
<dd>Attempt to typeset horizontally
22772278
all consecutive <i>characters</i> within the box
22782279
such that they take up the space of a single character
22792280
within the vertical line box.
2280-
<dt><dfn value for=text-combine-horizontal>digits <var>&lt;integer></var>?</dfn>
2281+
<dt><dfn value for=text-combine-upright>digits <var>&lt;integer></var>?</dfn>
22812282
<dd>Attempt to typeset horizontally
22822283
each maximal sequence of consecutive ASCII digits (U+0030&ndash;U+0039)
22832284
that has as many or fewer characters than the specified integer
@@ -2288,7 +2289,7 @@ Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
22882289
</dl>
22892290

22902291
<div class="example">
2291-
<p>In East Asian documents, the ''text-combine-horizontal'' effect is often
2292+
<p>In East Asian documents, the ''text-combine-upright'' effect is often
22922293
used to display Latin-based strings such as components of a date or
22932294
letters of an initialism, always in a horizontal writing mode
22942295
regardless of the writing mode of the line:</p>
@@ -2302,7 +2303,7 @@ Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
23022303

23032304
<p>The figure is the result of the rules</p>
23042305
<pre>
2305-
<!-- -->date { text-combine-horizontal: digits 2; }
2306+
<!-- -->date { text-combine-upright: digits 2; }
23062307
</pre>
23072308
<p>and the following markup:</p>
23082309
<pre>
@@ -2313,12 +2314,12 @@ Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
23132314
</div>
23142315

23152316
<div class="example">
2316-
<p>The following example shows that applying ''text-combine-horizontal: digits 2''
2317+
<p>The following example shows that applying ''text-combine-upright: digits 2''
23172318
to an entire document, rather than to a segment with a known type of
23182319
numeric content, can have unintended consequences:
23192320
<pre>&lt;p>あれは10,000円ですよ!&lt;/p></pre>
23202321
<div class="figure">
2321-
<p><img alt="Rendering of the above markup with 'text-combine-horizontal: digits':
2322+
<p><img alt="Rendering of the above markup with 'text-combine-upright: digits':
23222323
the first two digits of the number are rendered as tate-chu-yoko
23232324
while the rest of the number is rendered sideways."
23242325
class="example" src="bad-tate-chu-yoko.png">
@@ -2330,14 +2331,14 @@ Horizontal-in-Vertical Composition: the 'text-combine-horizontal' property</h3>
23302331
Text Run Rules</h4>
23312332

23322333
<p>To avoid complexity in the rendering and layout,
2333-
'text-combine-horizontal' can only combine plain text:
2334+
'text-combine-upright' can only combine plain text:
23342335
consecutive <i>characters</i> that are not interrupted by a box boundary.
23352336

23362337
<p>However, because the property inherits,
23372338
the UA must ensure that the contents of the box effecting the combination
23382339
are not part of an otherwise-combinable sequence
23392340
that happens to begin or end outside the box;
2340-
if so, then the text is laid out normally, as if 'text-combine-horizontal' were ''none''.
2341+
if so, then the text is laid out normally, as if 'text-combine-upright' were ''none''.
23412342
To avoid combining only part of a sequence:
23422343
if the boundary of a potentially-combinable run
23432344
is due only to one or more inline box boundaries,
@@ -2351,34 +2352,34 @@ Text Run Rules</h4>
23512352

23522353
<div class="example">
23532354
<p>For example, given the rule
2354-
<pre>tcy { text-combine-horizontal: digits 4; }</pre>
2355+
<pre>tcy { text-combine-upright: digits 4; }</pre>
23552356
<p>if the following markup were given:
23562357
<pre>&lt;tcy&gt;12&lt;span>34&lt;/span>&lt;/tcy></pre>
2357-
<p>no text would combine: the 12 and 34 both share an ancestor with the same 'text-combine-horizontal' value,
2358+
<p>no text would combine: the 12 and 34 both share an ancestor with the same 'text-combine-upright' value,
23582359
and therefore are considered part of a sequence of four combinable digits interrupted by a box boundary.
23592360
However in these cases:
23602361
<pre>12&lt;tcy&gt;&lt;span>34&gt;&lt;/span>&lt;/tcy>
23612362
12&lt;tcy&gt;&lt;span>&lt;/span>34&lt;/tcy>
23622363
12&lt;tcy&gt;34&lt;span>&lt;/span>&lt;/tcy></pre>
2363-
<p>The 34 would combine, because the 12 immediately previous does not share with the 34 an ancestor with a common 'text-combine-horizontal',
2364+
<p>The 34 would combine, because the 12 immediately previous does not share with the 34 an ancestor with a common 'text-combine-upright',
23642365
and therefore the 34 is considered to be the entirety of a sequence of two combinable digits.
23652366
<p>If we used the rule
2366-
<pre>tcy { text-combine-horizontal: all; }</pre>
2367+
<pre>tcy { text-combine-upright: all; }</pre>
23672368
the same results would occur:
23682369
the first case not combining because 1234 forms a sequence of four combinable characters interrupted by a box boundary,
23692370
and the second combining 34 because it forms the entirety of a sequence of two combinable characters.
23702371
</div>
23712372

23722373
<p class="note">
2373-
Note that the value of 'text-combine-horizontal' (''all'' or ''digits'')
2374+
Note that the value of 'text-combine-upright' (''all'' or ''digits'')
23742375
only affects which types of <i>characters</i> can be combined
23752376
and what is the maximum length of a combinable sequence.
23762377
It does not otherwise change behavior.
23772378

23782379
<h4 id="text-combine-layout">
23792380
Layout Rules</h4>
23802381

2381-
<p>When combining text as for ''text-combine-horizontal: all'',
2382+
<p>When combining text as for ''text-combine-upright: all'',
23822383
the glyphs of the combined text are composed horizontally
23832384
(ignoring 'letter-spacing' and any forced line breaks, but using the specified font settings),
23842385
similar to the contents of an inline-box with a horizontal writing mode and a line-height of 1em.
@@ -2448,9 +2449,9 @@ Full-width Characters</h5>
24482449
before applying other compression techniques.
24492450

24502451
<div class="example">
2451-
<p>For example, an author might apply both 'text-transform' and 'text-combine-horizontal'
2452+
<p>For example, an author might apply both 'text-transform' and 'text-combine-upright'
24522453
to a date set in vertical text.
2453-
<pre>date { text-combine-horizontal: digits 2; text-transform: full-width; }</pre>
2454+
<pre>date { text-combine-upright: digits 2; text-transform: full-width; }</pre>
24542455
<p>Suppose this style rule is applied to a date such as.
24552456
<pre>&lt;date>2010年2月23日&lt;/date></pre>
24562457
<p>The "2010" is too long to be combined (4 digits), but the "2" and "23" will be affected.
@@ -2480,14 +2481,14 @@ Full-width Characters</h5>
24802481
Properties that affect glyph selection,
24812482
such as the <a property>font-variant</a> and <a property>font-feature-settings</a> properties defined in [CSS3-FONTS],
24822483
can potentially affect the selection of variants for characters included in combined text runs.
2483-
Authors are advised to use these properties with care when 'text-combine-horizontal' is also used.
2484+
Authors are advised to use these properties with care when 'text-combine-upright' is also used.
24842485

24852486
<h2 class="no-num" id="changes">Changes</h2>
24862487
<h3 class="no-num" id="changes-201211">
24872488
Changes since the <a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/">November
24882489
2012 CSS Writing Modes Module Level 3 <abbr title="Working Draft">WD</abbr></a></h3>
24892490
<ul>
2490-
<li>Added back ''digits'' value of 'text-combine-horizontal' and tightened up rules for compressing text.
2491+
<li>Added back ''digits'' value of 'text-combine-upright' and tightened up rules for compressing text.
24912492
<li>Defined better analysis of text to be combined.
24922493
<li>Various fixes/clarifications to orthogonal flows.
24932494
<li>Updated references to UTR50 and how this specification use its values.
@@ -2508,8 +2509,8 @@ Full-width Characters</h5>
25082509
<li>Fixed errors and clarified auto-sizing rules for orthogonal flows.
25092510
<li>Replaced Appendix D with references to the new [[!CSS3-SIZING]] module.
25102511
<li>Removed 'text-combine-mode' property.
2511-
<li>Removed all 'text-combine-horizontal' values except ''none'' and ''all''.
2512-
<li>Defined effect of 'text-combine-horizontal' on line-breaking.
2512+
<li>Removed all 'text-combine-upright' values except ''none'' and ''all''.
2513+
<li>Defined effect of 'text-combine-upright' on line-breaking.
25132514
</ul>
25142515

25152516
<h3 class="no-num" id="changes-201109">
@@ -2523,8 +2524,8 @@ Full-width Characters</h5>
25232524
<li>Altered <a href="#orthogonal-auto">orthogonal sizing</a>
25242525
to take into account the fill-available size; now the minimum of the
25252526
fill-available and ICB size is used to resolve ''auto'' sizes.
2526-
<li>Renamed ''digits'' to ''numeric'' and ''ascii-digits'' to ''digits'' for 'text-combine-horizontal'.
2527-
<li>Defined interaction of 'text-combine-horizontal' and 'text-transform'.
2527+
<li>Renamed ''digits'' to ''numeric'' and ''ascii-digits'' to ''digits'' for 'text-combine-upright'.
2528+
<li>Defined interaction of 'text-combine-upright' and 'text-transform'.
25282529
</ul>
25292530

25302531

0 commit comments

Comments
 (0)