Merge branch 'master' into non-text-contrast-2019-04

.travis.yml

@@ -6,6 +6,10 @@ env:
 git:
   depth: 3
 
+before_install:
+  - tar -xzvf lib/apache-ant-1.10.6-bin.tar.gz
+  - export PATH=`pwd`/apache-ant-1.10.6/bin:$PATH
+
 script:
   - mkdir output
   - git clone --depth=1 --branch=gh-pages https://github.com/w3c/wcag.git output

acknowledgements.html

@@ -27,6 +27,7 @@ <h2>Participants of the AG WG active in the development of this document:</h2>
             <li>Pietro Cirrincione (Invited Expert)</li>
             <li>Vivienne Conway (Web Key IT Pty Ltd)</li>
             <li>Michael Cooper (W3C)</li>
+          <li>Jennifer Delisi (Invited Expert)</li>
             <li>Romain Deltour (DAISY Consortium)</li>
             <li>Wayne Dick (Knowbility, Inc)</li>
             <li>Chaohai Ding (University of Southampton)</li>
@@ -36,6 +37,7 @@ <h2>Participants of the AG WG active in the development of this document:</h2>
             <li>E.A. Draffan (University of Southampton)</li>
             <li>Eric Eggert (W3C)</li>
             <li>Michael Elledge (Invited Expert)</li>
+          <li>David Fazio (Invited Expert)</li>
             <li>Wilco Fiers (Deque Systems, Inc.)</li>
             <li>Detlev Fischer (Invited Expert)</li>
             <li>John Foliot (Deque Systems, Inc.)</li>
@@ -72,7 +74,7 @@ <h2>Participants of the AG WG active in the development of this document:</h2>
             <li>Chris McMeeking (Deque Systems, Inc.)</li>
             <li>Jan McSorley (Pearson plc)</li>
             <li>Neil Milliken (Unify Software and Solutions)</li>
-            <li>Rachael Montgomery (MITRE Corporation)</li>
+            <li>Rachael Montgomery (Invited Expert)</li>
             <li>Mary Jo Mueller (IBM Corporation)</li>
           	<li>Brooks Newton (Thomson Reuters)</li>
             <li>James Nurthen (Oracle Corporation)</li>
@@ -84,7 +86,7 @@ <h2>Participants of the AG WG active in the development of this document:</h2>
             <li>Mike Pluke (Invited Expert)</li>
             <li>Ian Pouncey (The Paciello Group, LLC)</li>
           	<li>Ruoxi Ran (W3C)</li>
-            <li>Stephen Repsher (The Boeing Company)</li>
+            <li>Stephen Repsher (Invited Expert)</li>
             <li>Jan Richards (Invited Expert)</li>
             <li>John Rochford (Invited Expert)</li>
             <li>Marla Runyan (Invited Expert)</li>
@@ -96,6 +98,7 @@ <h2>Participants of the AG WG active in the development of this document:</h2>
             <li>David Sloan (The Paciello Group, LLC)</li>
             <li>Alan Smith (Invited Expert)</li>
             <li>Jim Smith (Unify Software and Solutions)</li>
+          <li>Andrew Somers (Invited Expert)</li>
             <li>Adam Solomon (Invited Expert)</li>
             <li>Jaeil Song (National Information Society Agency (NIA))</li>
             <li>Jeanne Spellman (The Paciello Group, LLC)</li>

build.xml

@@ -44,6 +44,7 @@
 		<delete file="${inputdir.techniques}/technique-associations.xml" failonerror="false"/>
 		<delete file="output.html" failonerror="false"/>
 		<delete dir="output" failonerror="false"/>
+		<delete dir="input" failonerror="false"/>
 	</target>
 
 	<target name="flatten" depends="init" description="Build a copy of guidelines with all data-include files incorporated">
@@ -62,6 +63,19 @@
 		</xslt>
 	</target>
 
+	<target name="guidelines" depends="init">
+		<mkdir dir="output/guidelines/22"/>
+		<copy file="guidelines/guidelines.css" todir="output/guidelines/22"/>
+		<copy file="guidelines/relative-luminance.xml" todir="output/guidelines/22"/>
+		<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 output/guidelines/22/index.html"/>
+			<arg value="-f"/>
+			<arg value="--retry"/>
+			<arg value="3"/>
+		</exec>
+	</target>
+
 	<!-- Techniques -->
 	<target name="techniques-list" description="Create XML list of all the technique files">
 		<property name="output.file" value="${inputdir.techniques}/techniques.xml"/>
@@ -168,16 +182,16 @@
 	</target>
 
 	<!-- Understanding -->
-	<target name="understanding" depends="guidelines-xml, techniques-list, understanding-index" description="Generate formatted Understanding docs">
-		<makeurl file="${basedir}/understanding/" property="base.understanding"/>
+	<target name="understanding" depends="guidelines-xml, techniques-list, understanding-index, understanding-flatten" description="Generate formatted Understanding docs">
+		<makeurl file="${basedir}/input/understanding/" property="input.understanding"/>
 		<mkdir dir="${basedir}/output/understanding/"/>
 		<local name="output.dir"/>
 		<makeurl file="${basedir}/output/understanding/" property="output.dir"/>
 		<echo message="Outputting Understanding to ${output.dir}"/>
 		<xslt in="${inputdir.guidelines}/wcag.xml" out="output.html" style="xslt/generate-understanding.xslt" force="true">
 			<classpath path="${classpath.saxon}"/>
 			<factory name="${xslt.factory}"/>
-			<param name="base.dir" expression="${base.understanding}"/>
+			<param name="base.dir" expression="${input.understanding}"/>
 			<param name="output.dir" expression="${output.dir}"/>
 			<param name="loc.guidelines" expression="https://www.w3.org/TR/WCAG21/" if="publication"/>
 			<param name="loc.understanding" expression="https://www.w3.org/WAI/WCAG21/Understanding/" if="publication"/>
@@ -216,9 +230,24 @@
 		</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>
+
 	<!-- Publish -->
 	<target name="deploy" depends="init, understanding-toc, techniques-toc" description="Generate content ready to deploy to gh-pages">
 		<property name="editors" value="true"/>
+		<antcall target="guidelines"/>
 		<antcall target="techniques"/>
 		<antcall target="understanding"/>
 		<copy todir="output/working-examples/">