Errata from 3536

.gitignore

@@ -220,3 +220,21 @@ pip-log.txt
 #############
 
 build.properties
+
+#############
+## Output
+#############
+
+/output/
+/output.html
+/techniques/toc.html
+/techniques/techniques.xml
+/techniques/technique-associations.xml
+/techniques/index-flat.html
+/techniques/about-flat.html
+/understanding/toc.html
+/understanding/index-flat.html
+/understanding/about-flat.html
+/guidelines/wcag.xml
+/guidelines/versions.xml
+/guidelines/index-flat.html

acknowledgements/funders.html

@@ -1,4 +1,4 @@
-<section>
-	<h2>Enabling funders</h2>
+<section id="enabling-funders">
+  <h2>Enabling funders</h2>
 	<p>This publication has been funded in part with U.S. Federal funds from the Health and Human Services, National Institute on Disability, Independent Living, and Rehabilitation Research (NIDILRR), initially under contract number ED-OSE-10-C-0067 and now under contract number HHSP23301500054C. The content of this publication does not necessarily reflect the views or policies of the U.S. Department of Health and Human Services or the U.S. Department of Education, nor does mention of trade names, commercial products, or organizations imply endorsement by the U.S. Government.</p>
-</section>
+</section>

act.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?>

biblio.js

@@ -30,18 +30,13 @@ respecConfig.localBiblio = {
         "title": "Ergonomics of human-system interaction -- Part 112: Principles for the presentation of information",
         "publisher": "International Standards Organization"
     },
-
-      	"sRGB": {
-      		"authors": [
-      			"M. Stokes",
-      			"M. Anderson",
-      			"S. Chandrasekar",
-      			"R. Motta"
-      		],
-      		"date": "November 5, 1996",
-      		"href": "https://www.w3.org/Graphics/Color/sRGB.html",
-      		"title": "A Standard Default Color Space for the Internet - sRGB, Version 1.10"
-      	},
+
+    "ISO_9241-391": {
+        "isoNumber": "9241-391",
+        "href": "https://www.iso.org/standard/56350.html",
+        "title": "Ergonomics of human-system interaction—Part 391: Requirements, analysis and compliance test methods for the reduction of photosensitive seizures",
+        "publisher": "International Standards Organization"
+    },
 
       	"UNESCO": {
       		"date": "1997",

build.xml

@@ -10,7 +10,7 @@
 	<!-- The following properties need to be set appropriately before doing a build - they should all be overridden by the above property file, but are kept here to serve as defaults -->
 	<property name="outputdir" location="." description="Directory within which the output folders are created, normally &quot;../YYYY&quot; unless doing TR in which case it is &quot;../../../TR/&lt;YYYY&gt;&quot;"/>
 	<property name="uri.prefix" value="file:///" description="Prefix if any that must be prepended to URIs to make it resolve on the platform"/>
-	<property name="guidelines.version" value="22" description="Which version of WCAG is being built"/>
+	<property name="guidelines.version" value="21" description="Which version of WCAG is being built"/>
 	<property name="w3ccvs.location" location="../../../w3ccvs"/>
 
 	<property name="xslt.factory" value="net.sf.saxon.TransformerFactoryImpl" description="Class name of the XSLT transformer factory, which sets which XSLT engine to use; must be an XSLT 2.0 processor"/>
@@ -42,11 +42,15 @@
 		<delete file="${inputdir.guidelines}/index-flat.html" failonerror="false"/>
 		<delete file="${inputdir.techniques}/index-flat.html" failonerror="false"/>
 		<delete file="${inputdir.understanding}/index-flat.html" failonerror="false"/>
+		<delete file="${inputdir.understanding}/about-flat.html" failonerror="false"/>
 		<delete file="${inputdir.guidelines}/wcag.xml" failonerror="false"/>
 		<delete file="${inputdir.guidelines}/wcag.json" failonerror="false"/>
 		<delete file="${inputdir.guidelines}/versions.xml" failonerror="false"/>
+		<delete file="${inputdir.guidelines}/test-sql.sql" failonerror="false"/>
 		<delete file="${inputdir.techniques}/techniques.xml" failonerror="false"/>
 		<delete file="${inputdir.techniques}/technique-associations.xml" failonerror="false"/>
+		<delete file="${inputdir.techniques}/about-flat.html" failonerror="false"/>
+		<delete file="${inputdir.understanding}/about-flat.html" failonerror="false"/>
 		<delete file="output.html" failonerror="false"/>
 		<delete dir="output" failonerror="false"/>
 		<delete dir="input" failonerror="false"/>
@@ -61,7 +65,7 @@
 		</xslt>
 	</target>
 
-	<target name="guidelines-xml" depends="flatten" description="Build an XML representation of the guidelines">
+	<target name="guidelines-xml" depends="flatten, guidelines-versions" description="Build an XML representation of the guidelines">
 		<xslt in="${inputdir.guidelines}/index-flat.html" out="${inputdir.guidelines}/wcag.xml" style="xslt/generate-structure-xml.xslt">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
@@ -101,7 +105,7 @@
 		<mkdir dir="output/guidelines/${guidelines.version}"/>
 		<copy file="css/base.css" todir="output/guidelines/${guidelines.version}"/>
 		<copy file="guidelines/guidelines.css" todir="output/guidelines/${guidelines.version}"/>
-		<copy file="guidelines/relative-luminance.xml" todir="output/guidelines/${guidelines.version}"/>
+		<copy file="guidelines/relative-luminance.html" todir="output/guidelines/${guidelines.version}"/>
 		<exec executable="curl">
 			<arg value="&quot;https://labs.w3.org/spec-generator/?type=respec&amp;url=https://raw.githack.com/w3c/wcag/master/guidelines/index.html&quot;"/>
 			<arg value="-o"/>
@@ -168,7 +172,7 @@
 		</xslt>
 	</target>
 
-	<target name="techniques" depends="techniques-list, techniques-association, techniques-index">
+	<target name="techniques" depends="techniques-list, techniques-association, techniques-index, techniques-about">
 		<makeurl file="${basedir}/techniques/" property="base.techniques"/>
 		<makeurl file="${basedir}/techniques/technique-associations.xml" property="associations.file"/>
 		<mkdir dir="${basedir}/output/techniques/"/>
@@ -188,10 +192,12 @@
 			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
 			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
 			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Techniques"/>
 		</xslt>
 		<copy file="css/base.css" todir="output/techniques/"/>
+		<copy file="css/a11y-light.css" tofile="output/techniques/a11y-light.css"/>
+		<copy file="script/highlight.min.js" todir="output/techniques/"/>
 		<copy file="techniques/techniques.css" todir="output/techniques/"/>
-		<copy file="css/slicenav.css" todir="output/techniques/"/>
 		<copy todir="output/techniques/">
 			<fileset dir="techniques" includes="**/img/*"/>
 		</copy>
@@ -204,15 +210,15 @@
 		</xslt>
 	</target>
 
-	<target name="techniques-index" depends="techniques-toc" description="Flatten the techniques index file">
+	<target name="techniques-index" depends="techniques-toc" description="Process the techniques index file">
 		<makeurl file="${basedir}/techniques/" property="base.techniques"/>
 		<mkdir dir="${basedir}/output/techniques/"/>
 		<xslt in="${inputdir.techniques}/index.html" out="${inputdir.techniques}/index-flat.html" style="xslt/flatten-document.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.techniques}"/>
 		</xslt>
-		<xslt in="${inputdir.techniques}/index-flat.html" out="${basedir}/output/techniques/index.html" style="xslt/base.xslt" force="true">
+		<xslt in="${inputdir.techniques}/index-flat.html" out="${basedir}/output/techniques/index.html" style="xslt/process-index.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.techniques}"/>
@@ -223,11 +229,38 @@
 			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
 			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
 			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Techniques"/>
+			<param name="navigation.current" expression="all"/>
 		</xslt>
 	</target>
 
+	<target name="techniques-about" description="Process the techniques about file">
+		<makeurl file="${basedir}/techniques/" property="base.techniques"/>
+		<mkdir dir="${basedir}/output/techniques/"/>
+		<xslt in="${inputdir.techniques}/about.html" out="${inputdir.techniques}/about-flat.html" style="xslt/flatten-document.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+			<param name="base.dir" expression="${base.techniques}"/>
+		</xslt>
+		<xslt in="${inputdir.techniques}/about-flat.html" out="${basedir}/output/techniques/about.html" style="xslt/process-index.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+			<param name="base.dir" expression="${base.techniques}"/>
+			<param name="guidelines.version" expression="${guidelines.version}"/>
+			<param name="loc.guidelines" expression="https://www.w3.org/TR/WCAG${guidelines.version}/" if="publication"/>
+			<param name="loc.understanding" expression="https://www.w3.org/WAI/WCAG${guidelines.version}/Understanding/" if="publication"/>
+			<param name="loc.techniques" expression="https://www.w3.org/WAI/WCAG${guidelines.version}/Techniques/" if="publication"/>
+			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
+			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
+			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Techniques"/>
+			<param name="navigation.current" expression="about"/>
+		</xslt>
+		<copy file="css/base.css" todir="output/techniques/"/>
+	</target>
+
 	<!-- Understanding -->
-	<target name="understanding" depends="guidelines-xml, guidelines-versions, techniques-list, understanding-index" description="Generate formatted Understanding docs">
+	<target name="understanding" depends="guidelines-xml, guidelines-versions, techniques-list, understanding-index, understanding-about" description="Generate formatted Understanding docs">
 		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
 		<mkdir dir="${basedir}/output/understanding/"/>
 		<local name="output.dir"/>
@@ -245,10 +278,10 @@
 			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
 			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
 			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Understanding"/>
 		</xslt>
-		<copy file="css/base.css" todir="output/understanding/"/>
 		<copy file="understanding/understanding.css" todir="output/understanding/"/>
-		<copy file="css/slicenav.css" todir="output/understanding/"/>
+		<copy file="guidelines/relative-luminance.html" todir="output/understanding/"/>
 		<copy todir="output/understanding/img/" flatten="true">
 			<fileset dir="understanding">
 				<patternset includes="*/img/*"/>
@@ -263,15 +296,39 @@
 		</xslt>
 	</target>
 
-	<target name="understanding-index" depends="understanding-toc" description="Flatten the understanding index file">
+	<target name="understanding-index" depends="understanding-toc" description="Process the understanding index file">
+		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
+		<mkdir dir="${basedir}/output/understanding/"/>
+		<xslt in="${inputdir.understanding}/index.html" out="${inputdir.understanding}/index-flat.html" style="xslt/flatten-document.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+			<param name="base.dir" expression="${base.understanding}"/>
+		</xslt>
+		<xslt in="${inputdir.understanding}/index-flat.html" out="${basedir}/output/understanding/index.html" style="xslt/process-index.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+			<param name="base.dir" expression="${base.understanding}"/>
+			<param name="guidelines.version" expression="${guidelines.version}"/>
+			<param name="loc.guidelines" expression="https://www.w3.org/TR/WCAG${guidelines.version}/" if="publication"/>
+			<param name="loc.understanding" expression="https://www.w3.org/WAI/WCAG${guidelines.version}/Understanding/" if="publication"/>
+			<param name="loc.techniques" expression="https://www.w3.org/WAI/WCAG${guidelines.version}/Techniques/" if="publication"/>
+			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
+			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
+			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Understanding"/>
+			<param name="navigation.current" expression="all"/>
+		</xslt>
+	</target>
+
+	<target name="understanding-about" description="Process the understanding about file">
 		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
 		<mkdir dir="${basedir}/output/understanding/"/>
-		<xslt in="${inputdir.understanding}/index.html" out="${basedir}/understanding/index-flat.html" style="xslt/flatten-document.xslt" force="true">
+		<xslt in="${inputdir.understanding}/about.html" out="${inputdir.understanding}/about-flat.html" style="xslt/flatten-document.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.understanding}"/>
 		</xslt>
-		<xslt in="${inputdir.understanding}/index-flat.html" out="${basedir}/output/understanding/index.html" style="xslt/base.xslt" force="true">
+		<xslt in="${inputdir.understanding}/about-flat.html" out="${basedir}/output/understanding/about.html" style="xslt/process-index.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.understanding}"/>
@@ -282,7 +339,10 @@
 			<param name="loc.guidelines" expression="https://w3c.github.io/wcag/guidelines/" if="editors"/>
 			<param name="loc.understanding" expression="https://w3c.github.io/wcag/understanding/" if="editors"/>
 			<param name="loc.techniques" expression="https://w3c.github.io/wcag/techniques/" if="editors"/>
+			<param name="documentset" expression="Understanding"/>
+			<param name="navigation.current" expression="about"/>
 		</xslt>
+		<copy file="css/base.css" todir="output/understanding/"/>
 	</target>
 
 	<!-- Requirements -->
@@ -328,18 +388,27 @@
 		<property name="publication" value="true"/>
 		<antcall target="techniques"/>
 		<antcall target="understanding"/>
-		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset dir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}">
+				<type type="file"/>
+				<include name="Understanding/**"/>
+				<include name="Techniques/**"/>
+				<include name="working-examples/**"/>
+				<exclude name="**/CVS/*"/>
+			</fileset>
+		</delete>
+		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/" failonerror="false">
 			<fileset dir="output/"/>
 			<globmapper from="*index.html" to="*Overview.html"/>
 		</copy>
-		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/">
+		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/" failonerror="false">
 			<fileset dir="output" excludes="index.html **/index.html"/>
 		</copy>
-		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/working-examples/">
+		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/working-examples/" failonerror="false">
 			<fileset dir="working-examples/"/>
 			<globmapper from="*index.html" to="*Overview.html"/>
 		</copy>
-		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/working-examples/">
+		<copy todir="${w3ccvs.location}/WWW/WAI/WCAG${guidelines.version}/working-examples/" failonerror="false">
 			<fileset dir="working-examples/" excludes="index.html **/index.html"/>
 		</copy>
 	</target>
@@ -352,6 +421,22 @@
 		</xslt>
 	</target>
 
+	<!-- Redirects -->
+	<target name="redirects">
+		<xslt in="xslt/ids.xml" out="output/understanding/.htaccess" style="xslt/ids-to-redirects.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+		</xslt>
+	</target>
+
+	<!-- SQL for CR test tool -->
+	<target name="cr-sql" depends="guidelines-xml, guidelines-versions, techniques-list, techniques-association">
+		<xslt in="${inputdir.guidelines}/wcag.xml" out="${inputdir.guidelines}/test-sql.sql" style="xslt/generate-test-sql.xslt" force="true">
+			<classpath path="${classpath.saxon}"/>
+			<factory name="${xslt.factory}"/>
+		</xslt>
+	</target>
+
 	<!-- Everything -->
 	<target name="all" depends="init, understanding, techniques" description="Generate entire suite"/>