Skip to content

Commit af4cdc1

Browse files
authored
Merge branch 'main' into htmlaam-571
2 parents 701c5ea + a19c2ac commit af4cdc1

File tree

7 files changed

+301
-401
lines changed

7 files changed

+301
-401
lines changed

.github/workflows/prettier.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
ref: ${{github.event.pull_request.head.ref}}
1818
repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -24,9 +24,10 @@ jobs:
2424

2525
- name: Prettify code
2626
id: prettify
27-
uses: creyD/prettier_action@v4.3
27+
uses: creyD/prettier_action@v4.5
2828
with:
29-
prettier_options: --write **/index.html --print-width 200
29+
prettier_options: --write "**/index.html" "!index.html" --print-width 200
30+
only_changed: True
3031
commit_message: "chore: prettier"
3132
continue-on-error: true
3233

accname/index.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,8 @@ <h4>Computation steps</h4>
536536
<li id="comp_labelledby_set_current">
537537
<span id="step2B.ii.a"><!-- Don't link to this legacy numbered ID. --></span>Set the <code>current node</code> to the node referenced by the IDREF.
538538
</li>
539-
<li id="comp_labelledby_recursion">
540-
<span id="step2B.ii.b"><!-- Don't link to this legacy numbered ID. --></span><em>LabelledBy Recursion:</em> Compute the text alternative of the
539+
<li id="comp_labelledby_traversal">
540+
<span id="step2B.ii.b"><!-- Don't link to this legacy numbered ID. --></span><em>LabelledBy Traversal:</em> Compute the text alternative of the
541541
<code>current node</code> beginning with the overall <a href="#comp_computation">Computation</a> step. Set the <code>result</code> to that text alternative.
542542
</li>
543543
<li id="comp_labelledby_append">
@@ -551,7 +551,7 @@ <h4>Computation steps</h4>
551551
</ol>
552552
<div>
553553
<p>
554-
The result of <a href="#comp_labelledby_recursion">LabelledBy Recursion</a> in combination with <a href="#comp_hidden_not_referenced">Hidden Not Referenced</a> means that
554+
The result of <a href="#comp_labelledby_traversal">LabelledBy Traversal</a> in combination with <a href="#comp_hidden_not_referenced">Hidden Not Referenced</a> means that
555555
<a class="termref">user agents</a> MUST include all nodes in the subtree as part of the <a class="termref">accessible name</a> or <a class="termref">accessible description</a>,
556556
when the node referenced by <code>aria-labelledby</code> or <code>aria-describedby</code> is hidden.
557557
</p>
@@ -612,8 +612,8 @@ <h4>Computation steps</h4>
612612
<code>aria-label</code> [=attribute=] whose value is not undefined, not the empty string, nor, when trimmed of [=ascii whitespace|whitespace=], is not the empty string:
613613
<ol class="acc-ol">
614614
<li>
615-
If traversal of the <code>current node</code> is due to recursion <strong>and</strong> the <code>current node</code> is an embedded control, ignore <code>aria-label</code> and
616-
skip to rule <a href="#comp_embedded_control">Embedded Control</a>.
615+
If traversal of the <code>current node</code> is due to <a href="#comp_name_from_content_for_each_child">Name From Content descendant node recursion</a> <strong>and</strong> the
616+
<code>current node</code> is an embedded control, ignore <code>aria-label</code> and skip to rule <a href="#comp_embedded_control">Embedded Control</a>.
617617
</li>
618618
<li>Otherwise, return the value of <code>aria-label</code>.</li>
619619
</ol>
@@ -665,8 +665,13 @@ <h4>Computation steps</h4>
665665
<span id="step2F.ii"><!-- Don't link to this legacy numbered ID. --></span><em>Name From Generated Content:</em> Check for
666666
<abbr title="Cascading Style Sheets">CSS</abbr> generated textual content associated with the <code>current node</code> and include it in the <code>accumulated text</code>. The
667667
<abbr title="Cascading Style Sheets">CSS</abbr> <a href="https://www.w3.org/TR/selectors-3/#gen-content"><code>::before</code> and <code>::after</code></a> pseudo elements
668-
[[!CSS2]] can provide textual content for [=element|elements=] that have a content model.
668+
[[!CSS2]] can provide textual content for [=element|elements=] that have a content model, in addition to the
669+
<a href="https://www.w3.org/TR/css-pseudo-4/#selectordef-marker"><code>::marker</code></a> pseudo element.
669670
<ol class="acc-ol">
671+
<li id="comp_name_from_content_pseudo_element_marker">
672+
For <code>::marker</code> pseudo elements, <a class="termref">User agents</a> MUST append <abbr title="Cascading Style Sheets">CSS</abbr> textual content, without a space, to
673+
the textual content of the <code>current node</code> if the <code>current node</code> supports <code>::marker</code>.
674+
</li>
670675
<li id="comp_name_from_content_pseudo_element_before">
671676
For <code>::before</code> pseudo elements, <a class="termref">User agents</a> MUST prepend <abbr title="Cascading Style Sheets">CSS</abbr> textual content, without a space,
672677
to the textual content of the <code>current node</code>.

documentation/tests.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,7 @@ Many of the automated tests in listed above started as a [Accessibility Investig
7272

7373
### Running (and writing) WPT Tests for ARIA and Related Specs
7474

75-
Start with [Running the WPT Tests for ARIA and Related Specs](./wpt.md)
75+
Start with [Running the WPT Tests for ARIA and Related Specs](./wpt.md).
76+
77+
For detailed guidance on writing tests for the purposes of accessibility interoperability, please visit: [Accessibility Interop Project Overview and Contribution Guidelines](https://github.com/web-platform-tests/interop-accessibility/wiki/Accessibility-Interop-Project-Overview-and-Contribution-Guidelines).
7678

dpub-aam/index.html

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313

1414
// specification status (e.g., WD, LC, NOTE, etc.). If in doubt use ED.
1515
specStatus: "WD",
16-
crEnd: "2023-07-29",
17-
//perEnd: "2013-07-23",
16+
//crEnd: "2023-07-29",
17+
//prEnd: "2025-04-21",
18+
//errata: "https://www.w3.org/WAI/ARIA/1.1/errata/dpub",
1819
// the specifications short name, as in http://www.w3.org/TR/short-name/
1920
shortName: "dpub-aam-1.1",
20-
implementationReportURI: "https://www.w3.org/2021/04/wpt-fyi-snapshot.html?filter=dpub-aam&date=2025-03-06",
21-
// if you wish the publication date to be other than today, set this
22-
// publishDate: "2009-08-06",
21+
implementationReportURI: "https://www.w3.org/2021/04/wpt-fyi-snapshot.html",
2322
copyrightStart: "2015",
2423
license: "w3c-software-doc",
2524

@@ -61,7 +60,7 @@
6160
companyURL: "https://www.igalia.com",
6261
w3cid: 68182,
6362
},
64-
{ name: "Richard Schwerdtfeger", mailto: "[email protected]", company: "Knowbility", companyURL: "https://www.knowbility.org/", w3cid: 2460 },
63+
{ name: "Richard Schwerdtfeger", mailto: "[email protected]", company: "Knowbility", companyURL: "https://knowbility.org/", w3cid: 2460 },
6564
],
6665
// authors, add as many as you like.
6766
// This is optional, uncomment if you have authors as well as editors.
@@ -165,30 +164,27 @@
165164
<body>
166165
<section id="abstract">
167166
<p>
168-
The Digital Publishing Accessibility API Mappings (DPub-AAM) defines how [=user agents=] map the Digital Publishing WAI-ARIA Module [[dpub-aria-1.1]] markup to platform
167+
Digital Publishing Accessibility API Mappings (DPUB-AAM) defines how [=user agents=] map the Digital Publishing WAI-ARIA Module [[dpub-aria-1.1]] markup to platform
169168
<a class="termref">accessibility <abbr title="Application Programming Interfaces">APIs</abbr></a
170-
>. It is intended for user agent developers responsible for accessibility in their user agent so that they can support the accessibility content produced for digital publishing.
169+
>. It is intended for developers who are responsible for accessibility in their user agent so that they can support the accessibility content produced for digital publishing.
171170
</p>
172171
</section>
173172
<section id="sotd">
174-
<p>
175-
The primary change since the First Public Working Draft was to update the Mac AX API mappings to add the AXCustomContent fields for announcing roles. Feedback on any aspect of the
176-
specification is encouraged. A list of all substantive changes is available in the <a href="#changelog">change log</a>.
177-
</p>
173+
<p>Future updates to this specification may incorporate <a href="https://www.w3.org/policies/process/20231103/#allow-new-features">new features</a>.</p>
178174
</section>
179175
<section id="intro" class="informative">
180176
<h2>Introduction</h2>
181177

182178
<p>
183-
The implementation of this specification in user agents enables authors to produce more accessible e-books, by conveying structural book constructs used by the digital publishing industry to
184-
assistive technologies. It does this by extending the <cite><a href="https://www.w3.org/TR/core-aam-1.1/">Core Accessibility API Mappings 1.1</a></cite> [[CORE-AAM-1.1]] and the
185-
<cite><a href="https://www.w3.org/TR/accname-1.2/">Accessible Name and Description: Computation 1.2</a></cite> [[ACCNAME-1.2]] specifications for user agents. It provides Accessibility API
186-
Mapping guidance for the roles defined in the Digital Publish WAI-ARIA Module.
179+
The implementation of this specification in user agents enables authors to produce more accessible e-books by conveying structural book constructs that are used by the digital publishing
180+
industry to assistive technologies. It does this by extending the <cite><a href="https://www.w3.org/TR/core-aam-1.1/">Core Accessibility API Mappings 1.1</a></cite> [[CORE-AAM-1.1]] and the
181+
<cite><a href="https://www.w3.org/TR/accname-1.2/">Accessible Name and Description Computation 1.2</a></cite> [[ACCNAME-1.2]] specifications for user agents. It provides Accessibility API
182+
Mapping guidance for the roles defined in the Digital Publishing WAI-ARIA Module.
187183
</p>
188184

189185
<p>
190-
The DPub-AAM is part of the <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> suite described in the
191-
<a href="https://www.w3.org/WAI/intro/aria.php"><abbr title="Accessible Rich Internet Application">WAI-ARIA</abbr> Overview</a>.
186+
The DPUB-AAM is part of the <abbr title="Accessible Rich Internet Applications">WAI-ARIA</abbr> suite that is described in the
187+
<a href="https://www.w3.org/WAI/standards-guidelines/aria/"><abbr title="Accessible Rich Internet Application">WAI-ARIA</abbr> Overview</a>.
192188
</p>
193189
</section>
194190
<section id="conformance" class="normative">
@@ -2555,8 +2551,9 @@ <h4 id="role-map-toc"><code>doc-toc</code></h4>
25552551
<h2>Translatable Values</h2>
25562552

25572553
<p>
2558-
The HTML specification states that other specifications can define <a data-cite="html#translatable-attributes">translatable attributes</a> [[html]]. The language and directionality of each
2559-
attribute value is the same as the <a data-cite="html#language">language</a> and <a data-cite="html#the-directionality">directionality</a> of the element [[html]].
2554+
The HTML specification states that other specifications can define <a href="https://html.spec.whatwg.org/multipage/dom.html#translatable-attributes">translatable attributes</a> [[html]]. The
2555+
language and directionality of each attribute value is the same as the [=Node/language=] and <a href="https://html.spec.whatwg.org/multipage/dom.html#the-directionality">directionality</a> of
2556+
the element [[html]].
25602557
</p>
25612558

25622559
<p>To be understandable by assistive technology users, the following <code>role</code> mapping values intended for human consumption SHOULD be translated when a page is localized:</p>
@@ -2654,7 +2651,7 @@ <h3>Substantive changes since the <a href="https://www.w3.org/TR/2021/WD-dpub-aa
26542651
</section>
26552652

26562653
<section id="older-changes">
2657-
<h4>Other substantive changes since <a href="https://www.w3.org/TR/2017/REC-dpub-aam-1.0-20171214//">Digital Publishing Accessibility API Mappings 1.0</a></h4>
2654+
<h4>Other substantive changes since <a href="https://www.w3.org/TR/2017/REC-dpub-aam-1.0-20171214/">Digital Publishing Accessibility API Mappings 1.0</a></h4>
26582655
<ul>
26592656
<li>20-Sep-2021: Added mappings for doc-pageheader and doc-pagefooter roles.</li>
26602657
</ul>

0 commit comments

Comments
 (0)