Skip to content

Commit 7f5723b

Browse files
committed
merge
2 parents bee7f61 + 9bfe4d3 commit 7f5723b

13 files changed

Lines changed: 475 additions & 332 deletions

File tree

css-font-loading/Overview.bs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ The <code>load()</code> method</h3>
308308

309309
<li>
310310
Using the value of <var>font face's</var> {{[[Urls]]}} slot,
311-
attempt to load a font as defined in [[!CSS3-FONTS]],
311+
attempt to load a font as defined in [[!CSS-FONTS-3]],
312312
as if it was the value of a ''@font-face'' rule's 'src' descriptor.
313313

314314
<li>
@@ -821,7 +821,7 @@ The <code>ready</code> attribute</h3>
821821
<h3 id='font-face-set-css'>
822822
Interaction with CSS Font Loading and Matching</h3>
823823

824-
When the font matching algorithm in [[CSS3-FONTS]] is run automatically by the user-agent,
824+
When the font matching algorithm in [[CSS-FONTS-3]] is run automatically by the user-agent,
825825
the set of font faces it matches over must be precisely the set of fonts in the <a>font source</a> for the document,
826826
plus any local font faces.
827827

css-font-loading/Overview.html

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

css-inline/CJK-Initial.001.png

46.4 KB
Loading

css-inline/Overview.bs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2321,7 +2321,12 @@ A three-line drop initial in Adobe Minion Pro would have a font size of 61.2pt,
23212321

23222322
The alignment constraints depend on the script used. In Japanese vertical writing mode, it appears that the initial letter extends from the start edge of the first line to the end edge of the Nth line.
23232323

2324-
<p class="issue">Input from Japanese typographers would be very helpful.</p>
2324+
<figure>
2325+
<img src="CJK-Initial.001.png" width="480" alt="Diagram of Japanese initial letter in vertical writing mode"/>
2326+
<p class="caption">Diagram of Japanese initial letter in vertical writing mode</p>
2327+
</figure>
2328+
2329+
23252330

23262331
<figure>
23272332
<img src="Initial-2line-JapaneseVertical六.png" width="480" alt="Japanese Vertical Initial"/>

css-inline/Overview.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</p>
6161
<h1 class="p-name no-ref" id=title>CSS Inline Layout Module Level 3</h1>
6262
<h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
63-
<span class=dt-updated><span class=value-title title=20141029>29 October 2014</span></span></span></h2>
63+
<span class=dt-updated><span class=value-title title=20141107>7 November 2014</span></span></span></h2>
6464
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-inline/>http://dev.w3.org/csswg/css-inline/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-inline/>http://www.w3.org/TR/css-inline/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2002/WD-css3-linebox-20020515/ rel=previous>http://www.w3.org/TR/2002/WD-css3-linebox-20020515/</a><dt>Feedback:<dd><span><a href="mailto:www-style@w3.org?subject=[css-inline] feedback">www-style@w3.org</a> with subject line “<kbd>[css-inline] <var>… message topic …</var></kbd>” (<a href=http://lists.w3.org/Archives/Public/www-style/ rel=discussion>archives</a>)</span><dt>Editors:<dd><div class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:dauwhe@gmail.com>Dave Cramer</a> (<span class="p-org org">Hachette Livre</span>)</div><dd><div class="p-author h-card vcard"><a class="p-name fn u-url url" href=http://fantasai.inkedblade.net/contact>Elika J. Etemad</a> (<span class="p-org org">Invited Expert</span>)</div><dd><div class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:szilles@adobe.com>Steve Zilles</a> (<span class="p-org org">Adobe</span>)</div><dt>Issues list:<dd><span><a href="https://www.w3.org/Bugs/Public/buglist.cgi?query_format=advanced&amp;product=CSS&amp;component=Linebox&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED">CSS3 Line Layout issues in Bugzilla</a></span></dl></div>
6565
<div data-fill-with=warning></div>
6666
<p class=copyright data-fill-with=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a> © 2014 <a href=http://www.w3.org/><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href=http://www.csail.mit.edu/><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href=http://www.ercim.eu/><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href=http://www.keio.ac.jp/>Keio</a>, <a href=http://ev.buaa.edu.cn/>Beihang</a>), All Rights Reserved. W3C <a href=http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer>liability</a>, <a href=http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks>trademark</a> and <a href=http://www.w3.org/Consortium/Legal/copyright-documents>document use</a> rules apply.
@@ -2399,7 +2399,12 @@ <h3 class="heading settled" data-level=3.2 id=DropInitial><span class=secno>3.2.
23992399

24002400
<p>The alignment constraints depend on the script used. In Japanese vertical writing mode, it appears that the initial letter extends from the start edge of the first line to the end edge of the Nth line.</p>
24012401

2402-
<p class=issue id=issue-91340f65><a class=self-link href=#issue-91340f65></a>Input from Japanese typographers would be very helpful.</p>
2402+
<figure>
2403+
<img alt="Diagram of Japanese initial letter in vertical writing mode" src=CJK-Initial.001.png width=480>
2404+
<p class=caption>Diagram of Japanese initial letter in vertical writing mode</p>
2405+
</figure>
2406+
2407+
24032408

24042409
<figure>
24052410
<img alt="Japanese Vertical Initial" src=Initial-2line-JapaneseVertical六.png width=480>
@@ -3174,4 +3179,4 @@ <h2 class="no-num heading settled" id=references><span class=content>References<
31743179

31753180
<a href=#issue-588d4c54></a></div><div class=issue>[The value <span class=css>replaced</span> is not strictly needed. <span class=css>Inline-box</span> also
31763181
does the job, except that it is not automatically restricted to replaced
3177-
elements.]<a href=#issue-90160bb9></a></div><div class=issue>Input from Japanese typographers would be very helpful.<a href=#issue-91340f65></a></div><div class=issue>This figure is probably incorrect.<a href=#issue-ddff256b></a></div><div class=issue>Add content describing constraint that the block container have a baseline grid (or fixed line-height?).<a href=#issue-f229a1d3></a></div><div class=issue>Input from those knowledgeable about non-Western typographic traditions would be very helpful in describing the appropriate alignments. More values may be required for this property.<a href=#issue-209367a3></a></div><div class=issue>Define appropriate behavior for non-western scripts. The editors would appreciate any examples of drop initials in such scripts.<a href=#issue-79d884e2></a></div></div>
3182+
elements.]<a href=#issue-90160bb9></a></div><div class=issue>This figure is probably incorrect.<a href=#issue-ddff256b></a></div><div class=issue>Add content describing constraint that the block container have a baseline grid (or fixed line-height?).<a href=#issue-f229a1d3></a></div><div class=issue>Input from those knowledgeable about non-Western typographic traditions would be very helpful in describing the appropriate alignments. More values may be required for this property.<a href=#issue-209367a3></a></div><div class=issue>Define appropriate behavior for non-western scripts. The editors would appreciate any examples of drop initials in such scripts.<a href=#issue-79d884e2></a></div></div>

css-pseudo/Overview.bs

Lines changed: 83 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -480,21 +480,30 @@ Styling Highlighted Ranges</h3>
480480
<li>'cursor' (optional)
481481
<li>'outline' and its longhands (optional)
482482
<li>'text-decoration' and its associated properties (optional)
483+
<li>'text-emphasis-color' (optional)
484+
<li>'text-shadow' (optional)
483485
</ul>
484486

485-
Issue: What properties should be included here?
486-
Only color and bgcolor seem supported; but text-decoration is needed for spellcheck.
487+
Issue: Are there any other properties that should be included here?
488+
[Caret-color should be added once we have it.]
487489

488-
If 'color' is not specified, the text's actual color must be used for the highlight.
489-
<span class="issue">Can we reuse ''currentColor'' for this, now that it computes to itself?</span>
490+
Issue: Only 'color' and 'background-color' are cross-browser.
491+
Should any others be required?
492+
493+
If 'color' is not specified, the text (and text decoration)'s
494+
unselected color must be used for the highlight.
490495
(As usual, the initial 'background-color' is ''transparent''.)
491496

497+
Issue: Can we reuse ''currentColor'' for this, now that it computes to itself?
498+
492499
The UA should use the OS-default selection color
493500
when neither 'color' nor 'background-color' has been specified by the author.
494501

495-
Issue: This behavior does not let us use the normal cascade for representing the OS colors
496-
and thus violates <a href="http://lists.w3.org/Archives/Public/www-style/2008Oct/0268.html">dbaron's #2 requirement</a>. :(
497-
Can we do anything about that?
502+
Note: This paired-cascading behavior
503+
does not allow <a href="http://lists.w3.org/Archives/Public/www-style/2008Oct/0268.html">using the normal cascade</a>
504+
to represent the OS default selection colors.
505+
However it has been interoperably implemented in browsers
506+
and is thus probably a Web-compatibility requirement.
498507

499508
The ''::selection'' pseudo element draws its background
500509
over the selected portion of the element,
@@ -503,7 +512,8 @@ Styling Highlighted Ranges</h3>
503512
It also suppresses the drawing of any selected text
504513
and instead redraws that text
505514
(and any text decorations)
506-
over that background.
515+
over that background
516+
using the specified 'color'.
507517

508518
Issue: Implementations seem to redraw text decorations and text shadows over the selection background.
509519
This seems particularly weird if the text decoration color doesn't match the text.
@@ -520,8 +530,6 @@ Styling Highlighted Ranges</h3>
520530
else the specified 'color';
521531
however the UA may adjust the alpha channel if it is opaque.
522532

523-
Issue: The wash requirement is a minor update on WebKit's behavior. Gecko & Opera just use the default selection color for the wash.
524-
525533
Issue: This whole section needs vocabulary cleanup.
526534

527535
<h2 id="generated-content">
@@ -569,6 +577,56 @@ Generated Content Pseudo-elements: ''::before'' and ''::after''</h2>
569577
(<code>:before</code> and <code>:after</code>)
570578
for these pseudo-elements.
571579

580+
<h3 id="alt-property">
581+
Alternative text for Generated Content: The 'alt' property</h3>
582+
583+
The generated content of a ::before or ::after element is not always appropriate for assistive technology. In these cases, alternative text can be provided using the 'alt' property. The 'alt' property applies only to the same elements the 'content' property applies to.
584+
585+
<pre class=propdef>
586+
Name: alt
587+
Value: none | <<string>>
588+
Initial: none
589+
Applies to: ::before and ::after pseudo-elements
590+
Inherited: no
591+
Computed Value: as specified
592+
</pre>
593+
594+
<dl>
595+
<dt>none</dt>
596+
<dd>No alternative text</dd>
597+
598+
<dt><<string>></dt>
599+
<dd>The alternative text is the <<string>>. This can be the empty string.</dd>
600+
</dl>
601+
602+
When the alt property computes to anything other than none, the alternative <<string>> should be used instead of the value of the contents property by assistive technology.
603+
604+
<div class="example">
605+
606+
Here the content property is an image, so the alt property is required to provide alternative text.
607+
608+
<pre>
609+
.new::before {
610+
content: url(./img/star.png);
611+
alt: "New!";
612+
}
613+
</pre>
614+
</div>
615+
616+
<div class="example">
617+
618+
If the pseudo-element is purely decorative and its function is covered elsewhere, setting alt to the empty string can avoid reading out the decorative element. Here the ARIA attribute will be spoken as "collapsed". Without the empty string alt value, the content would also be spoken as "Black right-pointing pointer".
619+
620+
<pre>
621+
.expandable::before {
622+
content: "\25BA"; /* a.k.a. ► */
623+
alt: "";
624+
/* aria-expanded="false" already in DOM,
625+
so this pseudo-element is decorative */
626+
}
627+
</pre>
628+
</div>
629+
572630
<h2 id="interactions">Overlapping Pseudo-element Interactions</h2>
573631

574632
<div class="example" id="overlapping-example">
@@ -645,50 +703,36 @@ Interface CSSPseudoElement</h3>
645703

646704
<pre class="idl">
647705
interface CSSPseudoElement {
648-
readonly attribute unsigned long <a href="#dom-csspseudochild-ordinal">ordinal</a>;
649-
// the ordinal of a column is its index
650706
readonly attribute DOMString <a href="#dom-csspseudochild-type">type</a>;
651707
readonly attribute <a href="http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration">CSSStyleDeclaration</a> <a href="#dom-csspseudochild-style">style</a>;
652708
};
653709

654710
CSSPseudoElement implements EventTarget;
655711
</pre>
656712

657-
The <dfn id="dom-csspseudochild-ordinal">ordinal</dfn> attribute
658-
represents the ordinal of the pseudo-element for the object's type.
659-
It is a strictly positive integer.
660-
The value <code>1</code> for the <code>before</code>&nbsp;
661-
(or <code>after</code>, <code>letter</code> and <code>line</code>)
662-
types represents the ''::before'' (or ''::after'',
663-
''::first-letter'' and ''::first-line'')
664-
pseudo-elements.
665713
The <dfn id="dom-csspseudochild-type">type</dfn> attribute
666714
is a string representing the type of the pseudo-element.
667715
This can be one of the following values:
668716

669717
<dl>
670718
<dt>‘before’
671-
<dd>The pseudo-element was created before the element's contents
719+
<dd>The pseudo-element was created before the element's contents.
672720
<dt>‘after’
673-
<dd>The pseudo-element was created after the element's contents
721+
<dd>The pseudo-element was created after the element's contents.
674722
<dt>‘letter’
675-
<dd>The pseudo-element is the first letter of the element;
676-
the only valid ordinal is 1.
723+
<dd>The pseudo-element is the first letter of the element.
677724
<dt>‘line’
678-
<dd>The pseudo-element is the first line of the element;
679-
the only valid ordinal is 1.
680-
<dt>‘column’
681-
<dd>The pseudo-element is a column created by the element through
682-
the CSS Multi-column Layout Module.
683-
In that case its <code>ordinal</code> is
684-
the index of column in the collection of columns created by the element.
725+
<dd>The pseudo-element is the first line of the element.
726+
<dt>‘selection’
727+
<dd>The selection pseudo-element for the element.
685728
</dl>
686729

687730
The <dfn id="dom-csspseudochild-style">style</dfn> attribute
688731
is a <code>CSSStyleDeclaration</code> [[!CSSOM]]
689732
that allows directly setting style information (inline styles) onto the pseudo-element.
690733
Inline styles on a <code>CSSPseudoElement</code> have precedence over all
691734
style rules styling that pseudo-element.
735+
692736
Issue: This should cascade like actual inline styles, not be a different thing.
693737

694738
The <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget"><code>EventTarget</code></a> interface [[!DOM-LEVEL-2-EVENTS]]
@@ -705,10 +749,9 @@ Interface CSSPseudoElementList</h3>
705749
interface CSSPseudoElementList {
706750
readonly attribute unsigned long <a href="#dom-csspseudochildlist-length">length</a>;
707751
CSSPseudoElement <a href="#dom-csspseudochildlist-item">item</a>(unsigned long index);
708-
CSSPseudoElement <a href="#dom-csspseudochildlist-getbyordinalandtype">getByOrdinalAndType</a>(unsigned long ordinal,
709-
DOMString type);
710-
// replies null if no pseudo-element does not exist for
711-
// the requested ordinal and type
752+
CSSPseudoElement <a href="#dom-csspseudochildlist-getbytype">getByType</a>(DOMString type);
753+
// replies null if no pseudo-element exists for
754+
// the requested type
712755
};
713756
</pre>
714757

@@ -721,14 +764,14 @@ Interface CSSPseudoElementList</h3>
721764
Its return value is the <code>CSSPseudo</code><code>Element</code>
722765
at the requested index in the collection
723766
or null if that is not a valid index.
724-
The method <dfn id="dom-csspseudochildlist-getbyordinalandtype">getByOrdinalAndType()</dfn>
767+
768+
The method <dfn id="dom-csspseudochildlist-getbytype">getByType()</dfn>
725769
is used to retrieve a <code>CSSPseudo</code><code>Element</code>
726-
by its ordinal and type.
727-
It takes two parameters: first, the requested ordinal; second a type.
770+
by its type.
728771
Its return value is the <code>CSSPseudo</code><code>Element</code>
729-
at the requested index in the collection
772+
in the collection that matches the type
730773
or null if there is no <code>CSSPseudo</code><code>Element</code>
731-
in the collection for that index and type.
774+
in the collection for that type.
732775

733776
<h3 id="window-interface">
734777
Addition to the <code>window</code> interface</h3>

0 commit comments

Comments
 (0)