Wcag22 focus visible enh updates 1067

.travis.yml

@@ -13,6 +13,7 @@ before_install:
 script:
   - mkdir output
   - git clone --depth=1 --branch=gh-pages https://github.com/w3c/wcag.git output
+  - curl https://labs.w3.org/spec-generator/?type=respec"&"url=https://raw.githack.com/w3c/wcag/master/guidelines/index.html -o output/guidelines/22/index.html -f  --retry 3
   - curl https://labs.w3.org/spec-generator/?type=respec"&"url=https://raw.githack.com/w3c/wcag/master/requirements/22/index.html -o output/requirements/22/index.html -f  --retry 3
   - curl https://labs.w3.org/spec-generator/?type=respec"&"url=https://raw.githack.com/w3c/wcag/master/conformance-challenges/index.html -o output/conformance-challenges/index.html -f  --retry 3
   - ant deploy

README.md

@@ -115,7 +115,7 @@ The generator used to publish techniques uses XML processing, so techniques must
 
 ### Images, Examples, Cross References for Techniques
 
-Techniques can include images. Place the image file in the `img` folder of the relevant technology - meaning all techniques for a technology share a common set of images. Use a relative link to load the image. Most images should be loaded with a `<figure>` element and labeled with a `<figcaption>` positioned at the bottom of the figure. Small inline images may be loaded with a `<img>` element with suitable `alt` text.
+Techniques can include images. Place the image file in the `img` folder of the relevant technology - meaning all techniques for a technology share a common set of images. Use a relative link to load the image. Most images should be loaded with a `<figure>` element and labeled with a `<figcaption>` positioned at the bottom of the figure. `<figure>` elements must have an `id` attribute. Small inline images may be loaded with a `<img>` element with suitable `alt` text.
 
 Techniques should include brief code examples to demonstrate how to author content that follows the technique. Code examples should be easy to read, and usually not complete content in themselves. More complete examples can be provided as [working examples](#user-content-provide-working-examples-of-techniques) (see below). Link to working examples at the bottom of each example, in a `<p class="working-example">` element, containing a relative link to `../../working-examples/{example-name}/`.
 

build.xml

@@ -38,6 +38,8 @@
 
 	<target name="clean" description="Clean up any temp files">
 		<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.guidelines}/wcag.xml" failonerror="false"/>
 		<delete file="${inputdir.guidelines}/wcag.json" failonerror="false"/>
 		<delete file="${inputdir.guidelines}/versions.xml" failonerror="false"/>
@@ -200,7 +202,12 @@
 	<target name="techniques-index" depends="techniques-toc" description="Flatten the techniques index file">
 		<makeurl file="${basedir}/techniques/" property="base.techniques"/>
 		<mkdir dir="${basedir}/output/techniques/"/>
-		<xslt in="${inputdir.techniques}/index.html" out="${basedir}/output/techniques/index.html" style="xslt/flatten-document.xslt" force="true">
+		<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">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.techniques}"/>
@@ -251,7 +258,12 @@
 	<target name="understanding-index" depends="understanding-toc" description="Flatten the understanding index file">
 		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
 		<mkdir dir="${basedir}/output/understanding/"/>
-		<xslt in="${inputdir.understanding}/index.html" out="${basedir}/output/understanding/index.html" style="xslt/flatten-document.xslt" force="true">
+		<xslt in="${inputdir.understanding}/index.html" out="${basedir}/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/base.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
 			<param name="base.dir" expression="${base.understanding}"/>
@@ -264,20 +276,6 @@
 		</xslt>
 	</target>
 
-	<target name="understanding-flatten" depends="guidelines-xml" description="Generate temp files for Understanding with includes included">
-		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
-		<mkdir dir="${basedir}/input/understanding/"/>
-		<local name="output.dir"/>
-		<makeurl file="${basedir}/input/understanding/" property="output.dir"/>
-		<xslt in="${inputdir.guidelines}/wcag.xml" out="output.html" style="xslt/flatten-understanding.xslt" force="true">
-			<classpath path="${classpath.saxon}"/>
-			<factory name="${xslt.factory}"/>
-			<param name="base.dir" expression="${base.understanding}"/>
-			<param name="output.dir" expression="${output.dir}"/>
-		</xslt>
-
-	</target>
-
 	<!-- Requirements -->
 	<target name="requirements" depends="init">
 		<mkdir dir="output/requirements/22"/>