Update from upstream:main

css/kb.css

@@ -161,6 +161,12 @@ a.permalink {
 	border-bottom: none !important;
 }
 
+a.breadcrumb,
+a.breadcrumb:visited{
+	color: rgb(0,0,200);
+	border-bottom: 0.1rem dotted rgb(0,0,200);
+}
+
 /* page headers and footers */
 
 header {

googlee5bfefdedc6e792a.html

@@ -0,0 +1 @@
+google-site-verification: googlee5bfefdedc6e792a.html

index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8"/>
 		<title>DAISY Knowledge Bases</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1"/>
+		<link rel="canonical" href="https://kb.daisy.org/index.html">
 		<script async="async" src="https://www.googletagmanager.com/gtag/js?id=UA-327448-3"></script>
 		<script>
 			window.dataLayer = window.dataLayer || [];

js/init.js

@@ -9,6 +9,17 @@
  * 
  */
 
+
+/* flip to https on site */
+
+if (window.location.hostname.toLowerCase() === 'kb.daisy.org' && window.location.protocol === 'http:') {
+  const newUrl = 'https://' + window.location.host + window.location.pathname + window.location.search + window.location.hash;
+  window.location.replace(newUrl);
+}
+
+/* ------------ */
+
+
 var lang = document.documentElement.lang ? document.documentElement.lang.toLowerCase() : 'en';
 
 var msg, topic_list, sc_map;
@@ -72,7 +83,14 @@ function KB() {
 
 KB.prototype.initializePage = function (type) {
 	if (type == 'kb') {
+
 		this.host = 'kb';
+
+		var url = window.location.href.toString();
+		if (!url.match('https://')) {
+			url = url.replace('http://', 'https://');
+		}
+
 		this.writeHeadTag('js', 'https://smart.daisy.org/js/sponsor.js');
 		this.writeHeadTag('css', '/css/kb.css');
 		this.writeHeadTag('css', '/css/sponsor.css');
@@ -401,24 +419,41 @@ KB.prototype.generatePageTitle = function () {
 
 		for (var x = 0; x < page_info['category'].length; x++) {
 
+			var category = findCategory(topic_list, page_info.category[x]);
+
 			var index_url = '';
+
+			if (index_url === '' && category.hasOwnProperty('indexPage')) {
+				index_url = category.indexPage;
+			}
 
-			// if more than one category, need to add ../ to reach the right page
-			if (page_info.category.length > 1) {
-				for (var y = page_info.category.length-1; y > x; y--) {
-					index_url += '../';
+			else {
+				// if more than one category, need to add ../ to reach the right page
+				if (page_info.category.length > 1) {
+					for (var y = page_info.category.length-1; y > x; y--) {
+
+						index_url += '../';
+
+						// handle wcag folder being separated from conformance
+						if (page_info.category[0] === 'conformance' && y == 1) {
+							index_url += 'conformance/'
+						}
+					}
 				}
+
+				index_url += 'index.html'
 			}
 
-			index_url += 'index.html'
-
 			if (x > 0) {
 				div.appendChild(document.createTextNode(' - '));
 			}
 
-			var category = findCategory(topic_list, page_info.category[x]);
+			var cat_a = document.createElement('a');
+				cat_a.href = index_url;
+				cat_a.classList.add('breadcrumb');
+				cat_a.appendChild(document.createTextNode(category.title));
 
-			div.appendChild(document.createTextNode(category.title));
+			div.appendChild(cat_a);
 		}
 	}
 

js/lang/en/topics.json

@@ -955,6 +955,18 @@
 		"id": "schema.org",
 		"showInRootIndex": false,
 		"categories": [
+			{
+				"title": "accessMode",
+				"id": "accessmode",
+				"indexPage": "../accessMode.html",
+				"showInRootIndex": false
+			},
+			{
+				"title": "accessModeSufficient",
+				"id": "accessmodesufficient",
+				"indexPage": "../accessModeSufficient.html",
+				"showInRootIndex": false
+			},
 			{
 				"title": "accessibilityFeature",
 				"id": "accessibilityfeature",

publishing/docs/about.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>About the Knowledge Base</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/about.html">
 		<meta name="description" content="The Accessible Publishing Knowledge Base provides best practices for creating accessible digital publications. Its primary focus is on EPUB but can be used as a reference for any HTML-based format.">
 		<script>
 			var page_info = {

publishing/docs/conformance/epub.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>EPUB Accessibility</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/conformance/epub.html">
 		<meta name="description" content="Provides an overview of the EPUB Accessibility specification and its requirements.">
 		<script>
 			var page_info = {
@@ -77,7 +78,7 @@ <h3>Conformance</h3>
 								><code>accessModeSufficient</code></a>).</p>
 
 						<p>A more complete overview of this metadata is provided in the <a
-							href="../metadata/schema-org.html">Schema.org Metadata</a> section of this knowledge base.</p>
+							href="../metadata/schema.org/index.html">Schema.org Metadata</a> section of this knowledge base.</p>
 
 						<p>The inclusion of this metadata allows EPUB publications to be self-descriptive about their
 							accessibility conformance, or lack thereof.</p>

publishing/docs/conformance/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Accessibility Conformance</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/conformance/index.html">
 		<meta name="description" content="Table of contents for the accessibility conformance section.">
 		<script>
 			var page_info = {

publishing/docs/conformance/s508.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Section 508</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/conformance/s508.html">
 		<meta name="description" content="Provides an overview of the US Section 508 law and its requirements.">
 		<script>
 			var page_info = {

publishing/docs/conformance/wcag.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>WCAG</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/conformance/wcag.html">
 		<meta name="description" content="Provides and overview of the Web Content Accessibility Guidelines (WCAG) standard and its requirements.">
 		<script>
 			var page_info = {

publishing/docs/contribute/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Contributing to the Knowledge Base</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/constribute/index.html">
 		<meta name="description" content="How to contribute content to the DAISY Accessible Publishing Knowledge Base">
 		<script>
 			var page_info = {

publishing/docs/css/color.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Color</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/color.html">
 		<meta name="description" content="Describes best practices when using color to differentiate content.">
 		<script>
 			var page_info = {

publishing/docs/css/contrast.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Contrast</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/contrast.html">
 		<meta name="description" content="Best practices for ensuring sufficient color contrast.">
 		<script>
 			var page_info = {

publishing/docs/css/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>CSS</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/index.html">
 		<meta name="description" content="Table of contents for the CSS section.">
 		<script>
 			var page_info = {

publishing/docs/css/reference.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>CSS Property Reference</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/reference.html">
 		<meta name="description" content="Guidelines for using CSS properties accessibly.">
 		<script>
 			var page_info = {

publishing/docs/css/reflow.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Reflow</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/reflow.html">
 		<meta name="description" content="Guidance on making content reflow when zoomed for easier reading.">
 		<script>
 			var page_info = {

publishing/docs/css/text-resize.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Text Resizing</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/text-resize.html">
 		<meta name="description" content="Guidance on ensuring content adapts to text resizing.">
 		<script>
 			var page_info = {

publishing/docs/css/text-spacing.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Text Spacing</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/css/text-spacing.html">
 		<meta name="description" content="Best practices for ensuring users can control text and line spacing.">
 		<script>
 			var page_info = {

publishing/docs/epub/cmt.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Core Media Types</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/cmt.html">
 		<meta name="description" content="Describes EPUB's concept of core media types that must be supported and how to provide fallbacks for other formats.">
 		<script>
 			var page_info = {

publishing/docs/epub/cover.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Cover</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/cover.html">
 		<meta name="description" content="Accessible practices for including cover images in EPUB publications.">
 		<script>
 			var page_info = {

publishing/docs/epub/dir.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Text Direction</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/dir.html">
 		<meta name="description" content="Guidelines for using the dir attribute in the EPUB package document">
 		<script>
 			var page_info = {

publishing/docs/epub/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>EPUB</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/index.html">
 		<meta name="description" content="Table of contents for the EPUB section.">
 		<script>
 			var page_info = {

publishing/docs/epub/language.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Setting the Language</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/language.html">
 		<meta name="description" content="Best practices for setting the language of the EPUB package document and the publication.">
 		<script>
 			var page_info = {

publishing/docs/epub/reading-order.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Reading Order</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/reading-order.html">
 		<meta name="description" content="Guidance on ordering and identifying epub content documents in the spine">
 		<script>
 			var page_info = {

publishing/docs/epub/remote-resources.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Remote Resources</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/remote-resources.html">
 		<meta name="description" content="">
 		<script>
 			var page_info = {

publishing/docs/epub/title.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Publication Title</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/title.html">
 		<meta name="description" content="Guidance on setting the title of an EPUB publication.">
 		<script>
 			var page_info = {

publishing/docs/epub/validation/ace.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Ace by DAISY</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/validation/ace.html">
 		<meta name="description" content="Overview of using the Ace by DAISY tool to automatically check for accessibility issues.">
 		<script>
 			var page_info = {

publishing/docs/epub/validation/epubcheck.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>EPUBCheck</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/validation/epubcheck.html">
 		<meta name="description" content="Overview of using the EPUBCheck validator to verify conformance.">
 		<script>
 			var page_info = {

publishing/docs/epub/validation/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Validation</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/validation/index.html">
 		<meta name="description" content="Table of contents for the validation section.">
 		<script>
 			var page_info = {

publishing/docs/epub/validation/overview.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Validation Process</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/validation/overview.html">
 		<meta name="description" content="Overview of validating EPUB publications for conformance and accessibility.">
 		<script>
 			var page_info = {

publishing/docs/epub/validation/smart.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Ace SMART</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/epub/validation/smart.html">
 		<meta name="description" content="Overview of using the Ace SMART tool to manually verify accessibility.">
 		<script>
 			var page_info = {

publishing/docs/fxl/html.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>HTML Layouts</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/html.html">
 		<meta name="description" content="Overview of HTML-based EPUB fixed layout publications.">
 		<script>
 			var page_info = {

publishing/docs/fxl/img-spine.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Images in Spine</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/img-spine.html">
 		<meta name="description" content="Overview of issues using images in the EPUB spine for fixed layouts.">
 		<script>
 			var page_info = {

publishing/docs/fxl/img.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Images</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/img.html">
 		<meta name="description" content="Overview of issues using images for fixed layout pages.">
 		<script>
 			var page_info = {

publishing/docs/fxl/index.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Fixed Layouts</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/index.html">
 		<meta name="description" content="Index of fixed layout-related topics for producing accessible digital publications.">
 		<script>
 			var page_info = {

publishing/docs/fxl/orientation.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Orientation</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/orientation.html">
 		<meta name="description" content="Guidance on not constraining fixed layout pages to a specific orientation.">
 		<script>
 			var page_info = {

publishing/docs/fxl/overview.html

@@ -4,6 +4,7 @@
 		<meta charset="utf-8">
 		<title>Overview</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="canonical" href="https://kb.daisy.org/publishing/docs/fxl/overview.html">
 		<meta name="description" content="Overview of accessibility issues related to EPUB fixed layout publications.">
 		<script>
 			var page_info = {