Skip to content

Commit 0f1ba73

Browse files
alastcalastc
committed
Merge branch 'master' into wcag22-pointer-target-spacing
2 parents 064bca6 + b3b33e0 commit 0f1ba73

File tree

12 files changed

+37
-56
lines changed

12 files changed

+37
-56
lines changed

‎build.xml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
name="clean" description="Clean up any temp files">
4040
<delete file="${inputdir.guidelines}/index-flat.html" failonerror="false"/>
41+
<delete file="${inputdir.techniques}/index-flat.html" failonerror="false"/>
42+
<delete file="${inputdir.understanding}/index-flat.html" failonerror="false"/>
4143
<delete file="${inputdir.guidelines}/wcag.xml" failonerror="false"/>
4244
<delete file="${inputdir.guidelines}/wcag.json" failonerror="false"/>
4345
<delete file="${inputdir.guidelines}/versions.xml" failonerror="false"/>
@@ -200,7 +202,12 @@
200202
name="techniques-index" depends="techniques-toc" description="Flatten the techniques index file">
201203
<makeurl file="${basedir}/techniques/" property="base.techniques"/>
202204
<mkdir dir="${basedir}/output/techniques/"/>
203-
<xslt in="${inputdir.techniques}/index.html" out="${basedir}/output/techniques/index.html" style="xslt/flatten-document.xslt" force="true">
205+
<xslt in="${inputdir.techniques}/index.html" out="${inputdir.techniques}/index-flat.html" style="xslt/flatten-document.xslt" force="true">
206+
<classpath path="${classpath.saxon}"/>
207+
<factory name="${xslt.factory}"/>
208+
<param name="base.dir" expression="${base.techniques}"/>
209+
xslt>
210+
<xslt in="${inputdir.techniques}/index-flat.html" out="${basedir}/output/techniques/index.html" style="xslt/base.xslt" force="true">
204211
<classpath path="${classpath.saxon}"/>
205212
<factory name="${xslt.factory}"/>
206213
<param name="base.dir" expression="${base.techniques}"/>
@@ -251,7 +258,12 @@
251258
name="understanding-index" depends="understanding-toc" description="Flatten the understanding index file">
252259
<makeurl file="${basedir}/understanding/" property="base.understanding"/>
253260
<mkdir dir="${basedir}/output/understanding/"/>
254-
<xslt in="${inputdir.understanding}/index.html" out="${basedir}/output/understanding/index.html" style="xslt/flatten-document.xslt" force="true">
261+
<xslt in="${inputdir.understanding}/index.html" out="${basedir}/understanding/index-flat.html" style="xslt/flatten-document.xslt" force="true">
262+
<classpath path="${classpath.saxon}"/>
263+
<factory name="${xslt.factory}"/>
264+
<param name="base.dir" expression="${base.understanding}"/>
265+
xslt>
266+
<xslt in="${inputdir.understanding}/index-flat.html" out="${basedir}/output/understanding/index.html" style="xslt/base.xslt" force="true">
255267
<classpath path="${classpath.saxon}"/>
256268
<factory name="${xslt.factory}"/>
257269
<param name="base.dir" expression="${base.understanding}"/>
@@ -264,20 +276,6 @@
264276
xslt>
265277
target>
266278

267-
name="understanding-flatten" depends="guidelines-xml" description="Generate temp files for Understanding with includes included">
268-
<makeurl file="${basedir}/understanding/" property="base.understanding"/>
269-
<mkdir dir="${basedir}/input/understanding/"/>
270-
<local name="output.dir"/>
271-
<makeurl file="${basedir}/input/understanding/" property="output.dir"/>
272-
<xslt in="${inputdir.guidelines}/wcag.xml" out="output.html" style="xslt/flatten-understanding.xslt" force="true">
273-
<classpath path="${classpath.saxon}"/>
274-
<factory name="${xslt.factory}"/>
275-
<param name="base.dir" expression="${base.understanding}"/>
276-
<param name="output.dir" expression="${output.dir}"/>
277-
xslt>
278-
279-
target>
280-
281279
282280
name="requirements" depends="init">
283281
<mkdir dir="output/requirements/22"/>

‎guidelines/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@

New Features in WCAG 2.2

9191
<p>WCAG 2.2 extends WCAG 2.1 by adding new success criteria, definitions to support them, and guidelines to organize the additions. This additive approach helps to make it clear that sites which conform to WCAG 2.2 also conform to WCAG 2.1. The Accessibility Guidelines Working Group recommends that sites adopt WCAG 2.2 as their new conformance target, even if formal obligations mention previous versions, to provide improved accessibility and to anticipate future policy changes.p>
9292
<p>The following Success Criteria are new in WCAG 2.2:p>
9393
<ul>
94-
<li><a href="#focus-visible-enhanced">Focus visible (enhanced)a>li>
94+
<li><a href="#accessible-authentication">Accessible Authenticationa>li>
95+
<li><a href="#dragging">Dragginga>li>
96+
<li><a href="#focus-visible-enhanced">Focus visible (enhanced)a>li>
9597
ul>
9698
<p>The new success criteria may reference new terms that have also been added to the glossary and form part of the normative requirements of the success criteria.p>
9799
section>

‎techniques/failures/F-dragging.html renamed to ‎techniques/failures/F108.html

File renamed without changes.

‎techniques/general/G-Dragging.html renamed to ‎techniques/general/G219.html

File renamed without changes.

‎techniques/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@

Updated

2626

2727
<p class="copyright">
2828
<a href="https://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyrighta> ©
29-
2017-2018
29+
2017-<span class="generate-year">2018span>
3030

3131
<a href="https://www.w3.org/"><abbr title="World Wide Web Consortium">W3Cabbr>a><sup>®sup>
3232
(<a href="https://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MITabbr>a>,

‎understanding/20/focus-visible.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@

Intent of Focus Visible

2121

2222
<p>Where the success criterion says “mode of operation”, this is to account for platforms which may not always show a focus indicator. In most cases there is only one mode of operation so this success criteria applies.p>
2323

24-
<p>Note that a keyboard focus indicator can take different forms.<span class="wcag22"> This criterion does not specify what the form is, but <a>Focus Visible (Enhanced)a> does define how visible the indicator should be. Passing <a>Focus Visible (Enhanced)a> would pass this success criterion.span>p>
24+
<p>Note that a keyboard focus indicator can take different forms.<span class="wcag22"> This criterion does not specify what the form is, but <a href="focus-visible-enhanced">Focus Visible (Enhanced)a> does define how visible the indicator should be. Passing <a href="focus-visible-enhanced">Focus Visible (Enhanced)a> would pass this success criterion.span>p>
2525

2626

2727
section>

‎understanding/20/timing-adjustable.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@

Intent of Timing Adjustable

3636

3737
<p> It also includes content that is advancing or updating at a rate beyond the user's
3838
ability to read and/or understand it. In other words, animated, moving or scrolling
39-
content introduces a time limit on a users ability to read content.
39+
content introduces a time limit on a user's ability to read content.
4040
p>
4141

4242
<p>In some cases, however, it is not possible to change the time limit (for example,
@@ -109,7 +109,7 @@

Intent of Timing Adjustable

109109
p>
110110

111111
<p>See also
112-
<a href="no-timing">2.2.1: No Timinga>.
112+
<a href="no-timing">2.2.3: No Timinga>.
113113
p>
114114

115115

‎understanding/22/dragging.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@

Sufficient Techniques for Dragging

7171

7272
<ol>
7373
<li>
74-
<a href="../../techniques/general/G-Dragging" class="general">Ensuring that a single pointer operable alternative is available for dragging movements that operate on contenta>
74+
<a href="../../techniques/general/G219" class="general">Ensuring that a single pointer operable alternative is available for dragging movements that operate on contenta>
7575
li>
7676
ol>
7777

@@ -87,7 +87,7 @@

Failures for Dragging

8787

8888
<ul>
8989
<li>
90-
<a href="../../techniques/failures/F-dragging" class="failure">Failure of Success Criterion 2.5.X Dragging due to not providing a single pointer method for the user to operate a function that does not require a dragging movementa>
90+
<a href="../../techniques/failures/F108" class="failure">Failure of Success Criterion 2.5.X Dragging due to not providing a single pointer method for the user to operate a function that does not require a dragging movementa>
9191
li>
9292
ul>
9393
section>

‎understanding/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@

Updated

2626

2727
<p class="copyright">
2828
<a href="https://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyrighta> ©
29-
2017-2018
29+
2017-<span class="generate-year">2018span>
3030

3131
<a href="https://www.w3.org/"><abbr title="World Wide Web Consortium">W3Cabbr>a><sup>®sup>
3232
(<a href="https://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MITabbr>a>,

‎working-examples/aria-labelledby-workshop-booking-timetable/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@

Emerging scholarship

9090
tr>
9191
table>
9292
<p> p>
93-
<table role=”presentation” cellspacing="0" cellpadding="4" border="0">
93+
<table role="presentation" cellspacing="0" cellpadding="4" border="0">
9494
<tr>
9595
<td><label for="123">Maiden Name:label>td>
9696
<td>
97-
<input type="text" maxlength="255" size="30" id="123" value="" name="maidenName" aria-describedby=”986”>
98-
<span id=”986”>(Only enter if different from last name) span>
97+
<input type="text" maxlength="255" size="30" id="123" value="" name="maidenName" aria-describedby="986">
98+
<span id="986">(Only enter if different from last name) span>
9999
td>
100100
table>
101101
<p> p>

‎xslt/base.xslt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
xsl:choose>
7575
xsl:function>
7676

77+
<xsl:template match="node()|@*" priority="-1">
78+
<xsl:copy>
79+
<xsl:apply-templates select="node()|@*"/>
80+
xsl:copy>
81+
xsl:template>
82+
7783
<xsl:template match="html:a[wcag:is-technique-link(.)]">
7884
<xsl:variable name="technique-id" select="replace(@href, '^.*/([\w\d]*)(\.html)?$', '$1')"/>
7985
<xsl:choose>
@@ -123,6 +129,10 @@
123129
<xsl:value-of select="format-date(current-date(), '[D] [MNn] [Y]')"/>
124130
xsl:template>
125131

132+
<xsl:template match="html:*[@class = 'generate-year']">
133+
<xsl:value-of select="format-date(current-date(), '[Y]')"/>
134+
xsl:template>
135+
126136
<xsl:template match="html:link[@href][contains(@href, 'css/editors.css')]"/>
127137

128138
<xsl:template match="html:figure">

‎xslt/flatten-understanding.xslt

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)