diff --git a/build.gradle b/build.gradle
index b45f6e5d2..d93f75f87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1586,6 +1586,9 @@ fileTree(
 }
 testGenerator.createTasks()
 
+testSummary.dependsOn project.tasks.named("all_mo_tests")
+report.dependsOn project.tasks.named("all_mo_tests")
+
 // These are the xspec files authored by hand for whatever reason
 fileTree(dir: "${projectDir}/src/test/xspec", include: "*.xspec").each { xspec ->
   String fn = xspec.toString().replace('\\', '/').split('/')[-1]
diff --git a/buildSrc/src/main/groovy/org/docbook/xsltng/gradle/TestGenerator.groovy b/buildSrc/src/main/groovy/org/docbook/xsltng/gradle/TestGenerator.groovy
index 0d80cac41..d5cd3fd7f 100644
--- a/buildSrc/src/main/groovy/org/docbook/xsltng/gradle/TestGenerator.groovy
+++ b/buildSrc/src/main/groovy/org/docbook/xsltng/gradle/TestGenerator.groovy
@@ -155,6 +155,7 @@ class TestGenerator {
     configureCalloutTests()
     configureNumberedFromTests()
     configureInheritedFromTests()
+    configureMediaObjectTests()
   }
 
   void configure(File xml) {
@@ -338,6 +339,1207 @@ class TestGenerator {
     }
   }
 
+  void configureMediaObjectTests() {
+    def all_mo_tests = project.tasks.register("all_mo_tests") {
+      // Just somewhere to hang dependencies
+    }
+
+    ["1", "2"].each { mo ->
+      project.tasks.register("mo_${mo}_test_1", SaxonXsltTask) {
+        // Single output HTML file, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-1"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 1"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-1"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-1/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-1"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_1")
+      }
+
+      project.tasks.register("mo_${mo}_test_2", SaxonXsltTask) {
+        // Single output HTML file, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-2"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 2"
+        
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-2"
+        }
+
+        doFirst {
+          // N.B. These copy commands are a bit redundant because they
+          // have to work for all of the input layouts
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/front"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-2/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "false"
+        ])
+        
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-2"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_2")
+      }
+
+      project.tasks.register("mo_${mo}_test_3", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-3"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 3"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-3"
+        }
+
+        doFirst {
+          // N.B. These copy commands are a bit redundant because they
+          // have to work for all of the input layouts
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-3/"
+        ])
+        
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-3"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_3")
+      }
+
+      project.tasks.register("mo_${mo}_test_4", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        // but segregated by type
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        inputs.file "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        outputs.dir "${buildDir}/actual/mo-${mo}-4"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 4"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-4"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/body/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/video"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/front/video"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/front"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/audio"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp3"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.png"
+          }
+        }
+        
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book.xml"
+        stylesheet "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-4/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-4"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_4")
+      }
+      
+      project.tasks.register("mo_${mo}_test_5", SaxonXsltTask) {
+        // Chunked output HTML, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-5"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 5"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-5"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/front"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-5/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "false"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-5"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_5")
+      }
+    }
+
+    // Test 3 is different because, although the media are relative to the
+    // source locations, they escape out above the "book" as might occur
+    // if you had several books with some common media.
+    ["3"].each { mo ->
+      project.tasks.register("mo_${mo}_test_1", SaxonXsltTask) {
+        // Single output HTML file, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-1"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 1"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-1/book"
+          project.mkdir "${buildDir}/actual/mo-${mo}-1/media"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1/book"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-1/book/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-1"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_1")
+      }
+
+      project.tasks.register("mo_${mo}_test_2", SaxonXsltTask) {
+        // Single output HTML file, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-2"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 2"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-2/book"
+        }
+
+        doFirst {
+          // N.B. These copy commands are a bit redundant because they
+          // have to work for all of the input layouts
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/book/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/book/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/book/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/book"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-2/book/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "false"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-2"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_2")
+      }
+
+      project.tasks.register("mo_${mo}_test_3", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-3"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 3"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-3/book"
+          project.mkdir "${buildDir}/actual/mo-${mo}-3/media"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3/book"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-3/book/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-3"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_3")
+      }
+
+      project.tasks.register("mo_${mo}_test_4", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        // but segregated by type
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        inputs.file "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        outputs.dir "${buildDir}/actual/mo-${mo}-4"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 4"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-4/book"
+          project.mkdir "${buildDir}/actual/mo-${mo}-4/media"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/book/body/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/book/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/audio"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp3"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/media/video"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/front/video"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/front"
+            include "*.mp4"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/book"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-4/book/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-4"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_4")
+      }
+
+      project.tasks.register("mo_${mo}_test_5", SaxonXsltTask) {
+        // Chunked output HTML, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-5"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 5"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-5"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/book/body"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.png"
+            include "*.mp4"
+            include "*.mp3"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-5/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "false"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-5"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_5")
+      }
+    }
+
+    // Test 4 stores the media in a separate hierarchy
+    ["4"].each { mo ->
+      project.tasks.register("mo_${mo}_test_1", SaxonXsltTask) {
+        // Single output HTML file, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-1"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 1"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-1"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "**/*"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-1/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-1"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_1")
+      }
+
+      project.tasks.register("mo_${mo}_test_2", SaxonXsltTask) {
+        // Single output HTML file, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-2"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 2"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-2"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-2/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-2"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_2")
+      }
+
+      project.tasks.register("mo_${mo}_test_3", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-3"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 3"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-3"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-3/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-3"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_3")
+      }
+
+      project.tasks.register("mo_${mo}_test_4", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        // but segregated by type
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        inputs.file "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        outputs.dir "${buildDir}/actual/mo-${mo}-4"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 4"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-4"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/left/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/left"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/right/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/right"
+            include "*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/video"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/audio"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "*.mp3"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-4
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-4/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-4"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_4")
+      }
+
+      project.tasks.register("mo_${mo}_test_5", SaxonXsltTask) {
+        // Chunked output HTML, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-5"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 5"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-5"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-5/",
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-5"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_5")
+      }
+    }
+
+    // Test 5 stores the media grouped by type
+    ["5"].each { mo ->
+      project.tasks.register("mo_${mo}_test_1", SaxonXsltTask) {
+        // Single output HTML file, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-1"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 1"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-1"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "**/*"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-1"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-1/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-grouped-by-type": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-1"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_2")
+      }
+
+      project.tasks.register("mo_${mo}_test_2", SaxonXsltTask) {
+        // Single output HTML file, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-2"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 2"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-2"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-2"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        output "${buildDir}/actual/mo-${mo}-2/index.html"
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "true",
+          "mediaobject-grouped-by-type": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-2"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_2")
+      }
+
+      project.tasks.register("mo_${mo}_test_3", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-3"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 3"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-3"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+            include "**/*"
+            exclude "**/*.xml"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-3"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-3/",
+          "mediaobject-grouped-by-type": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-3"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_3")
+      }
+
+      project.tasks.register("mo_${mo}_test_4", SaxonXsltTask) {
+        // Chunked output HTML, media all in the same relative locations
+        // but segregated by type
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        inputs.file "${projectDir}/src/test/resources/mo_1_test_4.xsl" // even for mo-2
+        outputs.dir "${buildDir}/actual/mo-${mo}-4"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 4"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-4"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/left/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/left"
+            include "**/*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/right/image"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/right"
+            include "**/*.png"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/video/mp4"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/mp4"
+          }
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4/audio/mp3"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media/mp3"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-4"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${projectDir}/src/test/resources/mo_5_test_4.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-grouped-by-type": "true",
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-4/"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-4"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_4")
+      }
+
+      project.tasks.register("mo_${mo}_test_5", SaxonXsltTask) {
+        // Chunked output HTML, media all in a common directory
+        inputs.dir "${projectDir}/src/test/resources/xml/mo-${mo}"
+        inputs.dir "${buildDir}/xslt"
+        outputs.dir "${buildDir}/actual/mo-${mo}-5"
+        dependsOn project.tasks.named('makeXslt')
+        dependsOn project.tasks.named('copyResources')
+
+        group: "mediaobject-test"
+        description: "Test source mo-${mo}, output version 5"
+
+        doFirst {
+          project.mkdir "${buildDir}/actual/mo-${mo}-5"
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5/media"
+            from "${projectDir}/src/test/resources/xml/mo-${mo}/media"
+          }
+        }
+
+        doFirst {
+          project.copy {
+            into "${buildDir}/actual/mo-${mo}-5"
+            from "${buildDir}/actual"
+            include "js/**"
+            include "css/**"
+          }
+        }
+
+        input "${projectDir}/src/test/resources/xml/mo-${mo}/book/book.xml"
+        stylesheet "${buildDir}/xslt/docbook.xsl"
+        // no output
+        args(['-init:org.docbook.xsltng.extensions.Register'])
+        parameters([
+          "chunk": "index.html",
+          "chunk-output-base-uri": "${buildDir}/actual/mo-${mo}-5/",
+          "mediaobject-input-base-uri": "../media/",
+          "mediaobject-output-base-uri": "media/",
+          "mediaobject-output-paths": "true",
+          "mediaobject-grouped-by-type": "true"
+        ])
+
+        doLast {
+          project.exec {
+            commandLine "python", "src/bin/linkcheck.py",
+              "${buildDir}/actual/mo-${mo}-5"
+          }
+        }
+      }
+      all_mo_tests.configure {
+        dependsOn project.tasks.named("mo_${mo}_test_5")
+      }
+    }
+  }
+
   void createTasks() {
     testCases.createTasks()
     testConfigurations.createTasks()
diff --git a/properties.gradle b/properties.gradle
index 8000b1bbe..182be6a04 100644
--- a/properties.gradle
+++ b/properties.gradle
@@ -2,9 +2,9 @@
 ext {
   xslTNGtitle = 'DocBook xslTNG'
   xslTNGbaseName = 'docbook-xslTNG'
-  xslTNGversion = '2.0.17'
-  guideVersion = '2.0.17'
-  guidePrerelease = true
+  xslTNGversion = '2.1.0'
+  guideVersion = '2.1.0'
+  guidePrerelease = false
 
   docbookVersion = '5.2CR5'
   publishersVersion = '5.2CR5'
diff --git a/src/bin/linkcheck.py b/src/bin/linkcheck.py
index 935fa7cd4..4af9816a9 100644
--- a/src/bin/linkcheck.py
+++ b/src/bin/linkcheck.py
@@ -14,10 +14,10 @@
 import click
 from saxonche import PySaxonProcessor
 
-def linkcheck(root, debug):
+def linkcheck(root, server_root, debug):
     if debug:
         print("Checking links in", root)
-    
+
     globpatn = root + '/**/*'
     if root.endswith('/'): # can this happen?
         globpatn = root + '**/*'
@@ -32,11 +32,19 @@ def linkcheck(root, debug):
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:h="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="xs"
+                xmlns:f="http://nwalsh.com/ns/functions"
+                exclude-result-prefixes="#all"
                 version="3.0">
 
 <xsl:output method="json" encoding="utf-8"/>
 
+<xsl:param name="server-root" as="xs:string?" select="()"/>
+
+<xsl:variable name="server-base-uri" as="xs:string?"
+              select="if (empty($server-root))
+                      then ()
+                      else resolve-uri($server-root, base-uri(.)) || '/'"/>
+
 <xsl:mode on-no-match="shallow-skip"/>
 
 <xsl:template match="/">
@@ -48,19 +56,47 @@ def linkcheck(root, debug):
 </xsl:template>
 
 <xsl:template match="*[@href]" as="xs:string">
-  <xsl:sequence select="resolve-uri(@href, base-uri(.))"/>
+  <xsl:sequence select="f:resolve(@href, .)"/>
+  <xsl:if test="(self::h:a or self::a) and empty(node())">
+    <xsl:message select="'Unclickable:', string(@href), 'in', base-uri(.)"/>
+  </xsl:if>
 </xsl:template>
 
 <xsl:template match="*[@src]" as="xs:string">
-  <xsl:sequence select="resolve-uri(@src, base-uri(.))"/>
+  <xsl:sequence select="f:resolve(@src, .) "/>
 </xsl:template>
 
+<xsl:function name="f:resolve" as="xs:string">
+  <xsl:param name="href" as="xs:string"/>
+  <xsl:param name="context" as="element()"/>
+
+  <!-- work around for bug in SaxonC HE 12.1 -->
+  <xsl:variable name="baseuri"
+                select="if (contains(base-uri($context), '/file:'))
+                        then 'file:' || substring-after(base-uri($context), '/file:')
+                        else base-uri($context)"/>
+
+  <xsl:variable name="res" as="xs:string">
+    <xsl:choose>
+      <xsl:when test="exists($server-base-uri) and starts-with($href, '/')">
+        <xsl:sequence select="$server-base-uri || substring($href, 2)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:sequence select="resolve-uri($href, $baseuri)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <!--<xsl:message select="$href, '→', $res"/>-->
+  <xsl:sequence select="$res"/>
+</xsl:function>
+
 </xsl:stylesheet>
 """
 
     seen = []
     fail = {}
-    
+
     for htmlfile in files:
         with open(htmlfile, "r", encoding="utf-8") as html:
             doc = html5_parser.parse(html.read())
@@ -69,13 +105,17 @@ def linkcheck(root, debug):
 
         with PySaxonProcessor(license=False) as saxon:
             xslt = saxon.new_xslt30_processor()
+            if server_root:
+                xslt.set_parameter("{}server-root", saxon.make_string_value(root))
             xexec = xslt.compile_stylesheet(stylesheet_text=extract)
 
             builder = saxon.new_document_builder()
             builder.set_base_uri('file:' + htmlfile)
             node = builder.parse_xml(xml_text=text)
 
-            uris = json.loads(xexec.apply_templates_returning_string(xdm_value=node))
+            xexec.set_global_context_item(xdm_item=node)
+            result = xexec.apply_templates_returning_string(xdm_value=node)
+            uris = json.loads(result)
 
             for uri in uris:
                 if uri.startswith('file:'):
@@ -84,8 +124,14 @@ def linkcheck(root, debug):
                     # FIXME: check fragment identifiers...
                     if "#" in fn:
                         fn = fn[0:fn.index("#")]
-                    
+
+                    # FIXME?: check queries
+                    if "?" in fn:
+                        fn = fn[0:fn.index("?")]
+
                     if fn not in seen:
+                        if debug:
+                            print(f"\tCheck {uri}")
                         seen.append(fn)
                         if not os.path.exists(fn):
                             if not htmlfile in fail:
@@ -102,10 +148,11 @@ def linkcheck(root, debug):
 
 @click.command()
 @click.option("--debug", help="Debug", is_flag=True)
+@click.option("--server-root", "-s", help="Server root", is_flag=True)
 @click.argument("root", type=click.Path(exists=True))
-def main(debug, root):
+def main(debug, server_root, root):
     """ The main entry point."""
-    linkcheck(os.path.abspath(root), debug)
+    linkcheck(os.path.abspath(root), server_root, debug)
 
 if __name__ == "__main__":
     main()
diff --git a/src/guide/xml/changelog.xml b/src/guide/xml/changelog.xml
index 4165f9c82..d5abb8a75 100644
--- a/src/guide/xml/changelog.xml
+++ b/src/guide/xml/changelog.xml
@@ -2,787 +2,19 @@
             xmlns:xlink="http://www.w3.org/1999/xlink">
 <?db revhistory-style="list"?>
 
-<revision xml:id="r217">
-<revnumber>2.0.17</revnumber>
-<date>2023-04-07</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r216">2.0.16</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Changed <parameter>mediaobject-accessibility</parameter> and
-<parameter>table-accessibility</parameter> parameters into space-separated lists of strings.</para>
-</listitem>
-<listitem>
-<para>Reworked how metadata is formatted for media objects so that more accessibility metadata
-can be added.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r216">
-<revnumber>2.0.16</revnumber>
-<date>2023-04-05</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r215">2.0.15</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Completely reworked the way the <link
-linkend="onpage-toc">on-page ToC</link> is implemented. The previous
-implementation used a CSS “sticky” property and flex to manage the
-ToC. That was nice and all, but it was impossible to scroll the ToC.
-There’s a lot more JavaScript in the new implementation, but since
-there was already JavaScript in the implementation, I think that’s justified.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r215">
-<revnumber>2.0.15</revnumber>
-<date>2023-04-04</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r214">2.0.14</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Improved error messages when the persistent ToC is unavailable. Updated documentation.</para>
-</listitem>
-<listitem>
-<para>Improved some dependencies in the build.</para>
-</listitem>
-</itemizedlist>
-<para>Hopefully, <emphasis>this</emphasis>
-is the <emphasis>last</emphasis> pre-release of the 2.x stylesheets.</para>
-</revdescription>
-</revision>
-
-<revision xml:id="r214">
-<revnumber>2.0.14</revnumber>
-<date>2023-04-03</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r213">2.0.13</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Mostly, this update is a complete rewrite of how tests are managed. There are new
-classes to move a bunch of complexity out of <filename>build.gradle</filename> and manage
-XSpec tests and configurations automatically.</para>
-</listitem>
-<listitem>
-<para>That said, there were a few bugs fixed along the way.
-The <link linkend="persistent-toc">persistent ToC</link> was not being handled correctly
-when chunking was not being used.</para>
-</listitem>
-<listitem>
-<para>Added <parameter>message-level</parameter> to allow some
-informational messages to be suppressed.</para>
-</listitem>
-<listitem>
-<para>Updated the build to use Pygments 2.14.0. (That just changes a bunch of test results in
-some insignificant ways.)</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r213">
-<revnumber>2.0.13</revnumber>
-<date>2023-03-25</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r212">2.0.12</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Reworked audio and video fallback. Placing an HTML prose description
-in the video tag is apparently not supported. Apparently, it has to be
-handled by JavaScript. There’s now a <parameter>fallback-js</parameter>
-parameter.</para>
-</listitem>
-<listitem>
-<para>Removed <code>db-footnote</code> attributes from HTML output.</para>
-</listitem>
-<listitem>
-<para>Placement of table titles, before or after the table, can now be
-set with <parameter>formal-object-title-placement</parameter>. For backwards
-compatibility, it defaults to ‘before’ for tables. Within a
-<tag>formalgroup</tag>, title placement is controlled by
-<parameter>formalgroup-nested-object-title-placement</parameter>. Finally,
-the placement of media
-object details can be set with <parameter>mediaobject-details-placement</parameter>.
-</para>
-</listitem>
-<listitem>
-<para>Added a <parameter>unwrap-paragraphs</parameter> parameter.
-</para>
-</listitem>
-<listitem>
-<para>Completely reworked how numbering of elements is performed. See
-<xref linkend="numeration"/>. It’s a bit more complicated now, but it’s also
-more flexible and better tested. The default numeration should be the same
-as before, although a few small changes may appear in places where (I think)
-the previous numeration was wrong.
-</para>
-</listitem>
-<listitem>
-<para>I tinkered a bit with the
-<link linkend="onpage-toc">on-page table of contents</link> feature.
-It’s a bit easier to configure and there’s a JavaScript API for it.
-</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-<revision xml:id="r212">
-<revnumber>2.0.12</revnumber>
-<date>2023-03-12</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r210">2.0.10</link>.
-(Note that version 2.0.11 was not adequately documented in the change log.)</para>
-<itemizedlist>
-<listitem>
-<para>Fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/271">a bug</link>
-where chapter and appendix numbering was wrong.
-</para>
-</listitem>
-<listitem>
-<para>Implemented an
-<link linkend="onpage-toc">on-page table of contents</link> feature.
-</para>
-</listitem>
-<listitem>
-<para>Switched to
-<tag namespace="http://www.w3.org/1999/xhtml">section</tag> elements for
-sections inside a <tag>refentry</tag> instead of
-<tag namespace="http://www.w3.org/1999/xhtml">div</tag> elements.
-This supports the new 
-<link linkend="onpage-toc">on-page table of contents</link> feature and
-should have been done when the rest of the sectioning elements
-were converted.
-</para>
-</listitem>
-<listitem>
-<para>Moved the 
-<tag namespace="http://www.w3.org/1999/xhtml">footer</tag> element from
-just after
-<tag namespace="http://www.w3.org/1999/xhtml">main</tag> to just inside it.
-This simplifies and improves CSS rendering and is arguably more correct.
-</para>
-</listitem>
-<listitem>
-<para>Made including the <filename>docbook-print.css</filename> file conditional
-on producing print output. Modern browsers attempt to parse the file, even when
-the link specifies that it’s for print media, and produce a large number of
-spurious error messages.</para>
-</listitem>
-<listitem>
-<para>Fixed a bug where the <filename>catalog.xml</filename> file in the
-jar file was not at a location where the XML Resolver would find it.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
 <revision xml:id="r210">
-<revnumber>2.0.10</revnumber>
-<date>2023-02-21</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r209">2.0.9</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Reworked ToC handling. Added <parameter>auto-toc</parameter> parameter.
-The placement of generated lists-of-titles can now be controlled with an
-empty <tag>toc</tag> element (or <tag class="pi">db-toc</tag> processing
-instruction).</para>
-</listitem>
-<listitem>
-<para>Support creation of ToCs generated by hand. (Former handling for
-<tag>tocdiv</tag> and <tag>tocentry</tag> was just broken.)
-</para>
-</listitem>
-<listitem>
-<para>Updated the XML Resolver to version 5.1.0.</para>
-</listitem> 
-<listitem>
-<para>Deprecated the <mode>m:html-body-script</mode> mode.</para>
-</listitem> 
-<listitem>
-<para>Fixed incorrect URIs for SVG draft overlay in print CSS.</para>
-</listitem> 
-</itemizedlist>
-<para>Hopefully, <emphasis>this</emphasis>
-is the last pre-release of the 2.x stylesheets.</para>
-</revdescription>
-</revision>
-
-<revision xml:id="r209">
-<revnumber>2.0.9</revnumber>
-<date>2023-02-13</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r208">2.0.8</link>.</para>
-<itemizedlist>
-<listitem>
-<para>There are no changes to the stylesheets in this release. It
-simply updates the XML Resolver to version 5.0.0 and the XInclude
-extension function to version 5.0.0.</para>
-<para>Hopefully, this is the last pre-release of the 2.x stylesheets.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r208">
-<revnumber>2.0.8</revnumber>
-<date>2023-02-11</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r206">2.0.6</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Fixed a bug in localization support (a missing localization file accidentally
-caused the transformation to terminate). Fixed a bug the initializer for
-<varname>v:chunk-output-base-uri</varname>. Added
-<parameter>mediaobject-grouped-by-type</parameter> to group media objects by
-type.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r206">
-<revnumber>2.0.6</revnumber>
-<date>2023-02-01</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r205">2.0.5</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Completely refactored the way that media objects are located
-during the transformation and how the URIs for them are generated in
-the output. It is now possible to store the media objects in a location
-independent of the source files. Four separate source arrangements are represented
-in the test suite and each can be processed to produce several different outputs;
-see the <code>mediaobject-test</code> group of tasks. (Run
-<command>./gradlew tasks</command> in the source repository.)</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r205">
-<revnumber>2.0.5</revnumber>
-<date>2023-01-25</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r204">2.0.4</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Fixed the bug where attributes on image, video, audio, and text objects
-in <tag>mediaobject</tag> and <tag>inlinemediaobject</tag> were not being preserved
-in the output. In particular, this meant that <tag class="attribute">role</tag>
-attributes on those objects were not reflected in the HTML
-<tag class="attribute">class</tag> attribute.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r204">
-<revnumber>2.0.4</revnumber>
-<date>2023-01-22</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r203">2.0.3</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Changed <code>ext:cwd()</code> so that it always returns an absolute URI.
-This fixes a bug in chunk output base URI handling. Tidied up some code.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r203">
-<revnumber>2.0.3</revnumber>
-<date>2023-01-21</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r202">2.0.2</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Removed <keycap>↑</keycap> from <parameter>chunk-nav</parameter>.</para>
-</listitem>
-<listitem>
-<para>Support media objects that have no media (e.g., a media object that contains
-only inline text objects).</para>
-</listitem>
-<listitem>
-<para>Process unexected elements in titlepage templates in the normal way; removed
-the warning message associated with them. Added it back by putting
-<code>templates</code> in <parameter>debug</parameter>.</para>
-</listitem>
-<listitem>
-<para>Improved presentation of multiple <tag>keycap</tag> elements in a 
-<tag>keycombo</tag>.</para>
-</listitem>
-<listitem>
-<para>Added table-of-contents to the linear flow of EPUBs. This fixes an
-<application>epubcheck</application> 3.3 error. Fixed the CSS for the ToC.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r202">
-<revnumber>2.0.2</revnumber>
-<date>2023-01-05</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r201">2.0.1</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Reworked the way the <link linkend="persistent-toc">persistent ToC</link>
-is generated.</para>
-</listitem>
-<listitem>
-<para>Documented some subtleties with respect to the 
-<parameter>chunk-output-base-uri</parameter> parameter.</para>
-</listitem>
-<listitem>
-<para>Documentation improvements.</para>
-</listitem>
-<listitem>
-<para>Cleaned up the build scripts a bit.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r201">
-<revnumber>2.0.1</revnumber>
-<date>2023-01-03</date>
-<revdescription>
-<para>This is still a pre-release; see <link linkend="r200">2.0.0</link>.</para>
-<itemizedlist>
-<listitem>
-<para>Added support for ISO 690 bibliographies via a
-<parameter>bibliography-style</parameter> parameter.
-</para>
-</listitem>
-<listitem>
-<para>Fixed bug where <tag>authorgroup</tag> wasn’t being processed in
-<tag>biblioentry</tag>.
-</para>
-</listitem>
-<listitem>
-<para>Another few (but hopefully nearly the last) refactorings in the area of
-localization. Properties have been removed and all template lookups are now
-done with XPath expressions instead ad hoc string matching.</para>
-</listitem>
-<listitem>
-<para>A number of smaller changes have also been made to improve localization.
-(I discovered a small number of tests that weren’t being run in automation;
-those revealed new errors, mostly in generated text for cross references.)</para>
-</listitem>
-<listitem>
-<para>The way lists-of-titles and the persistent table of contents
-are generated has been changed. This happened in the 2.0.0 release, but was lost
-behind all the localization changes.</para>
-</listitem>
-</itemizedlist>
-</revdescription>
-</revision>
-
-<revision xml:id="r200">
-<revnumber>2.0.0</revnumber>
-<date>2022-12-30</date>
+<revnumber>2.1.0</revnumber>
+<date>2023-04-07</date>
 <revdescription>
-<para>This is a pre-release; existing customization layers will very
-likely require work. Some generated text may be rendered
-differently.</para>
-<itemizedlist>
-<listitem>
-<para>The system for dealing with generated text has been completely rewritten.
-We’re back to using templates as described in <xref linkend="gentext"/>.
-Most of the parameters, variables, and functions associated with gentext have
-been removed.
-</para>
-<para>It’s likely that there are small changes to the way lists-of-titles
-and cross references are formatted by default in some cases.</para>
-</listitem>
-<listitem>
-<para>Labels for formal objects may be different, but I think the previous
-formatting was actually in error.
-</para>
-</listitem>
-<listitem>
-<para>In some contexts, for example callouts, labels are now used for the
-links instead of titles.</para>
-</listitem>
-<listitem>
-<para>The parameters for the <template>t:top-nav</template> and
-<template>t:bottom-nav</template> templates have changed. They are now always
-called, even when chunking is not being performed. The new
-<code>$chunk</code> parameter indicates whether or not a chunk is being formatted.
-</para>
-</listitem>
-<listitem>
-<para>Fixed a bug where <tag>orderedlist</tag> numeration was not handled
-correctly in cross-references to list items.</para>
-</listitem>
-<listitem>
-<para>Made <emphasis>another</emphasis> attempt at sorting out how
-media object URIs are resolved in the source (for reading their properties)
-and formatted in the output. If the
-<parameter>mediaobject-input-base-uri</parameter> is specified, it is always
-used.</para>
-</listitem>
-</itemizedlist>
-<para>It’s possible that there are other changes as well, fixing localization
-was a pretty substantial change.</para>
+<para>This is the first official release of the “2.x” versions of the
+stylesheets. Version 2.1.0 introduces a number of new features and
+corrects major issues with localization and media object rendering,
+but is not entirely backwards compatible with the 1.x versions. The
+incompatibilities should mostly effect customization layers, not
+formatted documents, though the HTML output will be a little different
+in most cases. For a summary of the changes, see <xref
+linkend="version2"/>.</para>
 </revdescription>
 </revision>
 
-  <revision>
-    <revnumber>1.11.1</revnumber>
-    <date>2022-11-08</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-          <para>Fixed a CSS problem and removed some debugging cruft.</para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-  <revision>
-    <revnumber>1.11.0</revnumber>
-    <date>2022-11-07</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-          <para>Added support for EPUB3 output.</para>
-        </listitem>
-        <listitem>
-          <para>Reworked how media objects are processed</para>
-          <itemizedlist>
-            <listitem>
-              <para>Reworked how <tag class="attribute">contentwidth</tag>,
-              <tag class="attribute">contentdepth</tag>, <tag class="attribute">width</tag>,
-              <tag class="attribute">depth</tag>, <tag class="attribute">scalefit</tag>, and
-              <tag class="attribute">scale</tag> are handled. Width and height (depth)
-              are now processed independently. The results are
-              <emphasis>supposed</emphasis> to be the same as
-              before.</para>
-            </listitem>
-            <listitem>
-              <para>It now makes sense to have both multiple <tag>imageobject</tag> elements
-    and multiple <tag>imagedata</tag> elements with an <tag>imageobject</tag>. (And, analogously,
-    multiple <tag>videoobject</tag> elements with multiple <tag>videodata</tag>, and
-    multiple <tag>audioobject</tag> elements with multiple <tag>audiodata</tag> inside.)</para>
-    <itemizedlist>
-            <listitem>
-              <para>The stylesheets select the first object for which none of
-      the data elements are excluded by <parameter>mediaobject-exclude-extensions</parameter>
-      and then process all of the data elements inside.</para>
-              <itemizedlist>
-                <listitem>
-                  <para>For images, all of the alternatives are placed in a <tag>picture</tag> element using
-        <tag>source</tag> and <tag>img</tag>.</para>
-                </listitem>
-                <listitem>
-                  <para>For videos, all of the alternatives are placed in a <tag>video</tag> element using
-        <tag>source</tag> unless the <parameter>mediaobject-video-element</parameter> is <tag>iframe</tag>.</para>
-                </listitem>
-                <listitem>
-                  <para>For audio, all of the alternatives are placed in an <tag>audio</tag> elemnt using
-        <tag>source</tag>.
-                  </para>
-                </listitem>
-              </itemizedlist>
-            </listitem>
-            <listitem>
-              <para>The fallback for audio and video elements is a paragraph that offers download
-      links. This can be configured by overriding the <template>t:audio-fallback</template> and
-      <template>t:video-fallback</template> templates, respectively.
-              </para>
-            </listitem>
-            <listitem>
-            <para>Use <tag>multimediaparams</tag> to specify the controls for audio and vidoe objects.
-      If <emphasis>no</emphasis> parameters are specified, <tag class="attribute">controls</tag> will be added automatically.
-      (If you specify any parameters, you are responsible for specifying the controls
-      parameter.)
-              </para>
-            </listitem>
-            <listitem>
-              <para>If you have multiple data elements in an object, <emphasis>only</emphasis> the
-      attributes associated with the <emphasis>last</emphasis> alternative are considered
-      when calculating the viewport, alignment, etc. This is (a)
-      consistent with HTML, and (b) at least partly justifiable by the
-      observation that for scalable formats like SVG, it doesn’t make
-      sense to say that the image has a particular height or width.
-      Specify that on the raster fallback image where it makes sense.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-            <listitem>
-              <para>The actual nesting of divs and spans and some of the class values
-    have changed. Check your CSS.</para>
-            </listitem>
-            <listitem>
-              <para>Fixed a bug where the <tag class="attribute">summary</tag> accesibility attribute was not always output.
-              </para>
-            </listitem>
-            <listitem>
-              <para>Reworked image maps.</para>
-              <itemizedlist>
-            <listitem>
-              <para>Simpified the code for computing how <code>calspair</code> coordinates are calculated. 
-              </para>
-            </listitem>
-            <listitem>
-              <para>Added support for <code>html-rect</code>, <code>html-circle</code>, and <code>html-poly</code>
-      styles. Use <code>units="other"</code> and place the new styles in
-      <code>otherunits</code>. See the <filename>calloutlist.005.xml</filename> unit test for
-      examples.</para>
-            </listitem>
-              </itemizedlist>
-            </listitem>
-            <listitem>
-              <para>Changed the <parameter>mediaobject-exclude-extensions</parameter> parameter into
-      space-delimited string so that it’s easier to pass as a
-      parameter. The variable <varname>v:mediaobject-exclude-extensions</varname> is a
-      list constructed from the string.
-              </para>
-            </listitem>
-            <listitem>
-              <para>Added <parameter>mediaobject-video-element</parameter> parameter.
-              </para>
-            </listitem>
-            <listitem>
-              <para>Changed <function>f:parse-length</function> so that it accepts <code>xs:string?</code> and returns
-      an empty sequence if it’s passed one.</para>
-            </listitem>
-            <listitem>
-              <para>Added support for <tag>db:textdata</tag>. If a text data element is present, the first
-      one encountered is used (unless it contains only a single <tag>db:phrase</tag> as those
-      where historically used for alt text).</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>The icons used for admonitions have been changed. One or two of them
-  didn’t show up in EPUB readers.</para>
-        </listitem>
-        <listitem>
-          <para>Updated the extension functions that attempt to extract metadata
-  from images so that they accept filenames that aren’t URIs. Also
-  added support for a second “image” parameter, so that you can
-  prevent them from attempting to parse, for example, a video as an
-  image.</para>
-        </listitem>
-        <listitem>
-          <para>Added convenience variables
-          <varname>v:as-xml</varname> and <varname>v:as-json</varname> for
-          convenience in calls to <code>fn:serialize()</code>. Mostly
-          this is for debugging.</para>
-        </listitem>
-        <listitem>
-          <para>Reworked how the preprocessing pipeline is evaluated.</para>
-        </listitem>
-        <listitem>
-          <para>Switched to using Sass to generate CSS.</para>
-        </listitem>
-        <listitem>
-          <para>Fixed a bug in link processing that sometimes resulted in nested anchors.</para>
-        </listitem>
-        <listitem>
-          <para>Fixed bug where unnumbered verbatim listings still had room for line numbers.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-<!--
-  <revision>
-    <revnumber>1.10.1</revnumber>
-    <date>2022-10-28</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-<para>Added support for <tag>enumsynopsis</tag>.</para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-  <revision>
-    <revnumber>1.10.0</revnumber>
-    <date>2022-10-26</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-<para>Reworked the presentation of verbatim listings. The line numbers (in
-the “lines” format) are now padded to align on the right and have a space
-after them. This has no visible effect in a browser using CSS for rendering,
-but improves the result in text renderings. Also added a new “table” format
-that places the line numbers and the lines in separate columns of a table.</para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-  <revision>
-    <revnumber>1.9.0</revnumber>
-    <date>2022-10-02</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-<para>The styling process begins with a series of preprocessing
-transformations: cleaning up the logical structure of the input;
-expanding XIncludes, converting DocBook 4.x to 5.x, if necessary;
-transclusion processing; normalizing the document structure;
-processing annotations; dealing with link bases; etc.</para>
-
-<para>Starting in this release, these transformations are distributed in both
-“<link xlink:href="https://www.saxonica.com/documentation/#!using-xsl/compiling">compiled</link>”
-and source forms. By default, if you’re using a
-<link xlink:href="https://saxonica.com/">Saxonica</link> XSLT processor,
-the compiled forms will be used. This will generally result in faster
-transformations because it avoids the cost of analyzing the XSLT and
-preparing it for execution each time.</para>
-
-<para>You can disable them by setting
-<literal>use-compiled-transforms</literal> to “false”.</para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-  <revision>
-    <revnumber>1.8.1</revnumber>
-    <date>2022-09-06</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-          <para>Fixed <link xlink:href="https://github.com/docbook/xslTNG/issues/173">a bug</link>
-          where ordered list continuations were being incorrectly identified.</para>
-        </listitem>
-        <listitem>
-          <para>Reworked how localizations
-          <link xlink:href="https://github.com/docbook/xslTNG/issues/166">are computed</link>.
-          The <code>$v:locales</code> variable has been replaced by the
-          <code>f:locales($context)</code> function which returns the locales (languages)
-          used by the document. (I’ve left the name <code>f:locales</code> for consistency
-          with <code>v:locales</code> though I suspect <code>f:languages</code> would be
-          a better name.) The correct locales are now loaded by default for modular documents.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
-  <revision>
-    <revnumber>1.8.0</revnumber>
-    <date>2022-07-24</date>
-    <revdescription>
-      <itemizedlist>
-        <listitem>
-          <para>Reworked CSS. The CSS stylesheets, especially the
-          stylesheets related to print output, have been updated and
-          the mechanism by which CSS links are added to the output
-          <link linkend="managing-css">has changed</link>.
-          </para>
-          <para>The <literal>$css-links</literal> parameter no longer
-          exists (nor does the corresponding
-          <literal>$v:css-links</literal> variable). It has been
-          replaced by the <parameter>user-css-links</parameter> and
-          <parameter>use-docbook-css</parameter> parameters.
-          </para>
-        </listitem>
-        <listitem>
-          <para>Added an <parameter>output-media</parameter> parameter
-          to allow conditional behavior based on output medium (screen
-          or print).
-          </para>
-        </listitem>
-        <listitem>
-          <para>Added <parameter>page-style</parameter> and
-          <parameter>paper-size</parameter> parameters for controlling
-          aspects of print output.
-          </para>
-        </listitem>
-        <listitem>
-          <para>Some class attribute values have been changed.</para>
-          <itemizedlist>
-            <listitem>
-              <para>The page style, page size, and “draft” classes are
-              now reflected on the top-level <tag
-              namespace="http://www.w3.org/1999/xhtml">html</tag>
-              element.</para>
-            </listitem>
-            <listitem>
-              <para>The class attribute value “<literal>division</literal>” is
-              added to
-              <tag>book</tag>,
-              <tag>part</tag>, and
-              <tag>reference</tag> elements.
-              </para>
-            </listitem>
-            <listitem>
-              <para>The class attribute value “<literal>component</literal>” is
-              added to
-              <tag>acknowledgements</tag>,
-              <tag>appendix</tag>,
-              <tag>article</tag>,
-              <tag>bibliography</tag>,
-              <tag>chapter</tag>,
-              <tag>colophon</tag>,
-              <tag>dedication</tag>,
-              <tag>glossary</tag>,
-              <tag>index</tag>,
-              <tag>partintro</tag>,
-              <tag>preface</tag>, and
-              <tag>refentry</tag> elements.
-              </para>
-            </listitem>
-            <listitem>
-              <para>The class attribute value “<literal>formalobject</literal>” is
-              added to
-              <tag>equation</tag>,
-              <tag>example</tag>,
-              <tag>figure</tag>,
-              <tag>formalgroup</tag>, and
-              <tag>table</tag> elements.
-              </para>
-            </listitem>
-            <listitem>
-              <para>The class attribute value
-              “<literal>informalobject</literal>” is
-              added to
-              <tag>informalequation</tag>,
-              <tag>informalexample</tag>,
-              <tag>informalfigure</tag>, and
-              <tag>informaltable</tag> elements.
-              </para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-        <listitem>
-          <para>There is now CSS support for adding a “draft” watermark
-          to documents with a draft status (for both screen and print
-          renderings).
-          </para>
-        </listitem>
-        <listitem>
-          <para>An extra wrapper has been added to the content of
-          <tag>revision</tag> in a <tag>revhistory</tag>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>A bug has been fixed where <tag>sidebar</tag> was
-          accidentally being rendered in the DocBook namespace.
-          </para>
-        </listitem>
-        <listitem>
-          <para><link xlink:href="https://prismjs.com/">Prism</link> highlighting
-          has been updated to version 1.28.0.</para>
-        </listitem>
-        <listitem>
-          <para><link xlink:href="https://highlightjs.org/">Highlight.js</link>
-          highlighting has been updated to version 11.6.0 and is now part
-          of the distribution rather than relying on CDN access.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </revdescription>
-  </revision>
--->
 </revhistory>
diff --git a/src/guide/xml/ver2.xml b/src/guide/xml/ver2.xml
index a1ee462e5..c974436ac 100644
--- a/src/guide/xml/ver2.xml
+++ b/src/guide/xml/ver2.xml
@@ -2,7 +2,7 @@
           version="5.0" xml:id="version2">
 <info>
   <?db filename="version2"?>
-  <title>Changes in version 2.0</title>
+  <title>Changes in version 2.1.0</title>
 </info>
 
 <para>Version 2.x of the <citetitle>DocBook xslTNG
@@ -30,21 +30,67 @@ system should produce “the same results” as the old system for an
 equivalent localization, but there may be small changes in the way
 lists of titles and cross references are formatted.</para>
 
-<note>
-<para>This chapter is still being revised. This is (mostly) a placeholder.</para>
-</note>
+<para>The major changes are:</para>
 
 <itemizedlist>
 <listitem>
+<para>Completely reworked how localization is handled. See
+<xref linkend="gentext"/>. The
+localization file format has changed. Localization files are no longer
+simply transformed from the XSLT 1.0 stylesheet format.</para>
+</listitem>
+<listitem>
+<para>Completely reworked how numbering of elements is performed. See
+<xref linkend="numeration"/>. It’s a bit more complicated now, but it’s also
+more flexible and better tested. The default numeration should be the same
+as before, although a few small changes may appear in places where (I think)
+the previous numeration was wrong.
+</para>
+</listitem>
+<listitem>
+<para>Completely refactored the way that media objects are located
+during the transformation and how the URIs for them are generated in
+the output. It is now possible to store the media objects in a location
+independent of the source files. Four separate source arrangements are represented
+in the test suite and each can be processed to produce several different outputs;
+see the <buildtarget>all_mo_tests</buildtarget> build target and its dependencies.</para>
+</listitem>
+<listitem>
+<para>Refactored the templates for processing media objects to improve support for
+accessibility metadata and formatting copyright statements, legal notices, etc.
+See <mode>m:mediaobject-start</mode> and <mode>m:mediaobject-end</mode>.
+</para>
+</listitem>
+<listitem>
+<para>Fixed the bug where attributes on image, video, audio, and text objects
+in <tag>mediaobject</tag> and <tag>inlinemediaobject</tag> were not being preserved
+in the output. In particular, this meant that <tag class="attribute">role</tag>
+attributes on those objects were not reflected in the HTML
+<tag class="attribute">class</tag> attribute.</para>
+</listitem>
+<listitem>
+<para>Reworked audio and video fallback. Placing an HTML prose description
+in the video tag is not the correct approach in modern browsers. That prose is only
+rendered by browsers that don’t understand the 
+<tag namespace="http://www.w3.org/1999/xhtml">video</tag> tag <emphasis>at all</emphasis>.
+Apparently, it has to be
+handled by JavaScript. There’s now a <parameter>fallback-js</parameter>
+parameter.</para>
+</listitem>
+<listitem>
+<para>Support media objects that have no media (e.g., a media object that contains
+only inline text objects).</para>
+</listitem>
+<listitem>
 <para>Implemented an
 <link linkend="onpage-toc">on-page table of contents</link> feature.
 </para>
 </listitem>
 <listitem>
 <para>Switched to
-<tag namespace="http://www.w3.org/1999/xhtml">section</tag> elements for
-sections inside a <tag>refentry</tag> instead of
-<tag namespace="http://www.w3.org/1999/xhtml">div</tag> elements.
+<tag namespace="http://www.w3.org/1999/xhtml">section</tag> elements
+(instead of <tag namespace="http://www.w3.org/1999/xhtml">div</tag> elements)
+for sections inside of <tag>refentry</tag> and a number of other places.
 This supports the new 
 <link linkend="onpage-toc">on-page table of contents</link> feature and
 should have been done when the rest of the sectioning elements
@@ -52,6 +98,43 @@ were converted.
 </para>
 </listitem>
 <listitem>
+<para>Reworked ToC handling. Added <parameter>auto-toc</parameter> parameter.
+The placement of generated lists-of-titles can now be controlled with an
+empty <tag>toc</tag> element (or <tag class="pi">db-toc</tag> processing
+instruction).</para>
+</listitem>
+<listitem>
+<para>Added support for creating ToCs by hand. (Former handling for
+<tag>tocdiv</tag> and <tag>tocentry</tag> was just broken.)
+</para>
+</listitem>
+<listitem>
+<para>Placement of table titles, before or after the table, is now
+set with <parameter>formal-object-title-placement</parameter>. For backwards
+compatibility, it defaults to ‘before’ for tables. Within a
+<tag>formalgroup</tag>, title placement is controlled by
+<parameter>formalgroup-nested-object-title-placement</parameter>. In a related way,
+the placement of media
+object details can be set with <parameter>mediaobject-details-placement</parameter>.
+</para>
+</listitem>
+<listitem>
+<para>Labels for formal objects may be different, but I think the previous
+formatting was actually in error.
+</para>
+</listitem>
+<listitem>
+<para>Changed <parameter>mediaobject-accessibility</parameter> and
+<parameter>table-accessibility</parameter> parameters into space-separated lists of strings.</para>
+</listitem>
+<listitem>
+<para>The parameters for the <template>t:top-nav</template> and
+<template>t:bottom-nav</template> templates have changed. They are now always
+called, even when chunking is not being performed. The new
+<code>$chunk</code> parameter indicates whether or not a chunk is being formatted.
+</para>
+</listitem>
+<listitem>
 <para>Moved the 
 <tag namespace="http://www.w3.org/1999/xhtml">footer</tag> element from
 just after
@@ -60,27 +143,18 @@ This simplifies and improves CSS rendering and is arguably more correct.
 </para>
 </listitem>
 <listitem>
+<para>Added an <parameter>unwrap-paragraphs</parameter> parameter. If this
+parameter <glossterm>is true</glossterm>, a single DocBook paragraph that contains
+block elements (for example, tables or figures) will be rendered as several HTML paragraphs
+with blocks between them. HTML doesn’t allow blocks inside paragraphs.</para>
+</listitem>
+<listitem>
 <para>Made including the <filename>docbook-print.css</filename> file conditional
 on producing print output. Modern browsers attempt to parse the file, even when
 the link specifies that it’s for print media, and produce a large number of
 spurious error messages.</para>
 </listitem>
 <listitem>
-<para>Fixed a bug where the <filename>catalog.xml</filename> file in the
-jar file was not at a location where the XML Resolver would find it.</para>
-</listitem>
-<listitem>
-<para>Reworked ToC handling. Added <parameter>auto-toc</parameter> parameter.
-The placement of generated lists-of-titles can now be controlled with an
-empty <tag>toc</tag> element (or <tag class="pi">db-toc</tag> processing
-instruction).</para>
-</listitem>
-<listitem>
-<para>Support creation of ToCs generated by hand. (Former handling for
-<tag>tocdiv</tag> and <tag>tocentry</tag> was just broken.)
-</para>
-</listitem>
-<listitem>
 <para>Deprecated the <mode>m:html-body-script</mode> mode.
 Changed the way the standard scripts are included; instead of putting them
 at the end of the 
@@ -91,36 +165,25 @@ deferred.
 </para>
 </listitem> 
 <listitem>
-<para>Fixed incorrect URIs for SVG draft overlay in print CSS.</para>
-</listitem> 
+<para>In some contexts, for example callouts, labels are now used for the
+links instead of titles.</para>
+</listitem>
 <listitem>
-<para>Completely refactored the way that media objects are located
-during the transformation and how the URIs for them are generated in
-the output. It is now possible to store the media objects in a location
-independent of the source files. Four separate source arrangements are represented
-in the test suite and each can be processed to produce several different outputs;
-see the <code>mediaobject-test</code> group of tasks. (Run
-<command>./gradlew tasks</command> in the source repository.)</para>
+<para>Removed up-arrow from the keys that <parameter>chunk-nav</parameter> responds
+to. The up-arrow key is used by browser to move up the page and chunk navigation was
+interfering with that behavior. The <keycap>U</keycap> key will still go “up” in
+chunk navigation.</para>
 </listitem>
 <listitem>
-<para>Fixed the bug where attributes on image, video, audio, and text objects
-in <tag>mediaobject</tag> and <tag>inlinemediaobject</tag> were not being preserved
-in the output. In particular, this meant that <tag class="attribute">role</tag>
-attributes on those objects were not reflected in the HTML
-<tag class="attribute">class</tag> attribute.</para>
+<para>Reworked the <link linkend="persistent-toc">persistent
+ToC</link>. It can now store the ToC in a separate file. Improved the
+error messages when the persistent ToC is unavailable.</para>
 </listitem>
 <listitem>
 <para>Changed <code>ext:cwd()</code> so that it always returns an absolute URI.
 This fixes a bug in chunk output base URI handling. Tidied up some code.</para>
 </listitem>
 <listitem>
-<para>Removed <keycap>↑</keycap> from <parameter>chunk-nav</parameter>.</para>
-</listitem>
-<listitem>
-<para>Support media objects that have no media (e.g., a media object that contains
-only inline text objects).</para>
-</listitem>
-<listitem>
 <para>Process unexected elements in titlepage templates in the normal way; removed
 the warning message associated with them. Add it back by putting
 <code>templates</code> in <parameter>debug</parameter>.</para>
@@ -134,24 +197,23 @@ the warning message associated with them. Add it back by putting
 <application>epubcheck</application> 3.3 error. Fixed the CSS for the ToC.</para>
 </listitem>
 <listitem>
-<para>Reworked the way the <link linkend="persistent-toc">persistent ToC</link>
-is generated.</para>
-</listitem>
-<listitem>
 <para>Added support for ISO 690 bibliographies via a
 <parameter>bibliography-style</parameter> parameter.
 </para>
 </listitem>
 <listitem>
-<para>Fixed bug where <tag>authorgroup</tag> wasn’t being processed in
-<tag>biblioentry</tag>.
-</para>
+<para>Added a <parameter>message-level</parameter> parameter to support suppressing
+some informational messages.</para>
 </listitem>
 <listitem>
-<para>The parameters for the <template>t:top-nav</template> and
-<template>t:bottom-nav</template> templates have changed. They are now always
-called, even when chunking is not being performed. The new
-<code>$chunk</code> parameter indicates whether or not a chunk is being formatted.
+<para>Removed <att>db-footnote</att> attributes from the output. Technically, attribute
+names that contain a hyphen are HTML5 extension attributes, but sometimes they make validation
+more difficult. Some extension attributes remain, because they’re used by JavaScript in
+the presentation for example, but <att>db-footnote</att> isn’t used that way.</para>
+</listitem>
+<listitem>
+<para>Fixed bug where <tag>authorgroup</tag> wasn’t being processed in
+<tag>biblioentry</tag>.
 </para>
 </listitem>
 <listitem>
@@ -159,13 +221,20 @@ called, even when chunking is not being performed. The new
 correctly in cross-references to list items.</para>
 </listitem>
 <listitem>
-<para>Labels for formal objects may be different, but I think the previous
-formatting was actually in error.
-</para>
+<para>Fixed incorrect URIs for SVG draft overlay in print CSS.</para>
+</listitem> 
+<listitem>
+<para>Fixed a bug where the <filename>catalog.xml</filename> file in the
+jar file was not at a location where the XML Resolver would find it.</para>
 </listitem>
 <listitem>
-<para>In some contexts, for example callouts, labels are now used for the
-links instead of titles.</para>
+<para>Updated the build system to use Pygments version 2.14.0. This effects the markup
+produced in some syntax highlighted listings. (You’re free to use any version of Pygments
+that’s convenient; this is just about conformance with the expected test results.)</para>
+</listitem>
+<listitem>
+<para>The way unit tests are managed has been completely rewritten.
+See <xref linkend="testingtasks"/>.</para>
 </listitem>
 </itemizedlist>
 
diff --git a/src/guide/xsl/common.xsl b/src/guide/xsl/common.xsl
index bef5f05fe..cbc832678 100644
--- a/src/guide/xsl/common.xsl
+++ b/src/guide/xsl/common.xsl
@@ -48,7 +48,7 @@
                     'self::*[ancestor::db:partintro]',
                     'self::db:section')"/>
 
-<xsl:param name="component-numbers-inherit" select="'true'"/>
+<xsl:param name="sections-inherit-from" select="'component section'"/>
 
 <xsl:param name="section-toc-depth" select="1"/>
 <xsl:param name="footnote-numeration" select="('*', '**', '†','‡', '§', '1')"/>
diff --git a/src/main/xslt/main.xsl b/src/main/xslt/main.xsl
index dd17885a8..550d68857 100644
--- a/src/main/xslt/main.xsl
+++ b/src/main/xslt/main.xsl
@@ -141,6 +141,10 @@
             <script src="{$resource-base-uri}{$control-js}" defer="defer"/>
           </xsl:if>
         </db-script>
+        <db-fallback-script>
+          <!-- NOT deferred! -->
+          <script src="{$resource-base-uri}{$fallback-js}"/>
+        </db-fallback-script>
       </xsl:if>
     </html>
   </xsl:document>
diff --git a/src/main/xslt/modules/chunk-cleanup.xsl b/src/main/xslt/modules/chunk-cleanup.xsl
index 311cd0fcf..8261f41ef 100644
--- a/src/main/xslt/modules/chunk-cleanup.xsl
+++ b/src/main/xslt/modules/chunk-cleanup.xsl
@@ -31,7 +31,7 @@
 
 <xsl:template match="h:db-footnote|h:db-annotation|h:head
                      |h:db-annotation-script|h:db-xlink-script
-                     |h:db-toc-script|h:db-pagetoc-script
+                     |h:db-toc-script|h:db-pagetoc-script|h:db-fallback-script
                      |h:db-mathml-script|h:db-script">
   <!-- discard -->
 </xsl:template>
@@ -137,8 +137,11 @@
       </xsl:apply-templates>
     </xsl:if>
 
-    <xsl:if test="$fallback-js != '' and (.//h:video|.//h:audio)">
-      <script src="{$fallback-js}"/> <!-- not deferred! -->
+    <xsl:if test=".//h:video|.//h:audio">
+      <xsl:apply-templates select="/h:html/h:db-fallback-script/*">
+        <xsl:with-param name="rootbaseuri" select="$rbu"/>
+        <xsl:with-param name="chunkbaseuri" select="$cbu"/>
+      </xsl:apply-templates>
     </xsl:if>
 
     <!-- Unconditionally add h:db-script children. -->
diff --git a/src/test/resources/expected/audioobject.001.html b/src/test/resources/expected/audioobject.001.html
index cf429bdee..a97ad5909 100644
--- a/src/test/resources/expected/audioobject.001.html
+++ b/src/test/resources/expected/audioobject.001.html
@@ -1 +1 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: audiodata.001</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: audiodata.001</h1></header><p>A test for the <code class="tag tag-element">audioobject</code>.</p><div class="mediaobject"><div class="media audio"><audio class="audioobject" controls="controls"><source src="media/this_is_a_test.mp3" type="audio/mpeg" onerror="docbook_object_fallback(parentNode)"/></audio></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: audiodata.001</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="./js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: audiodata.001</h1></header><p>A test for the <code class="tag tag-element">audioobject</code>.</p><div class="mediaobject"><div class="media audio"><audio class="audioobject" controls="controls"><source src="media/this_is_a_test.mp3" type="audio/mpeg" onerror="docbook_object_fallback(parentNode)"/></audio></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
diff --git a/src/test/resources/expected/audioobject.002.html b/src/test/resources/expected/audioobject.002.html
index f8622f63a..88b1a3103 100644
--- a/src/test/resources/expected/audioobject.002.html
+++ b/src/test/resources/expected/audioobject.002.html
@@ -1 +1 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: audiodata.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: audiodata.002</h1></header><p>A test for the <code class="tag tag-element">audioobject</code>.</p><div class="mediaobject"><div class="media audio"><audio class="audioobject" controls="controls"><source src="media/this_is_a_test.oga" type="audio/ogg"/><source src="media/this_is_a_test.mp3" type="audio/mpeg" onerror="docbook_object_fallback(parentNode)"/></audio></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: audiodata.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="./js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: audiodata.002</h1></header><p>A test for the <code class="tag tag-element">audioobject</code>.</p><div class="mediaobject"><div class="media audio"><audio class="audioobject" controls="controls"><source src="media/this_is_a_test.oga" type="audio/ogg"/><source src="media/this_is_a_test.mp3" type="audio/mpeg" onerror="docbook_object_fallback(parentNode)"/></audio></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
diff --git a/src/test/resources/expected/mediaobject.005.html b/src/test/resources/expected/mediaobject.005.html
index 8fad6bff0..585863414 100644
--- a/src/test/resources/expected/mediaobject.005.html
+++ b/src/test/resources/expected/mediaobject.005.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: mediaobject.005</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: mediaobject.005</h1></header><p>This tests adding additional metadata to the media objects. (I’m no a11y expert,
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: mediaobject.005</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="./js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: mediaobject.005</h1></header><p>This tests adding additional metadata to the media objects. (I’m no a11y expert,
 so don’t assume these examples represent good practice.)</p><div class="mediaobject" summary="A video of a spinning top."><meta property="a11y:accessibilitySummary" content="A video of a spinning top."/><meta property="a11y:accessMode" content="visual"/><meta property="a11y:accessModeSufficient" content="auditory"/><details><p>This is a short video of a spinning top. The top has six faces, labeled
     alternately “yes” and “no”. The final resting position of the top shows
     one of the faces. Spoiler alert: it shows “no”.</p></details><div class="media video"><video class="videoobject" controls="controls" poster="../media/spinning-top-poster.png"><meta property="a11y:accessMode" content="visual"/><meta property="a11y:accessMode" content="auditory"/><meta property="a11y:accessModeSufficient" content="auditory"/><source src="media/spinning-top.webm" type="video/webm"/><source src="media/spinning-top.mp4" type="video/mp4" onerror="docbook_object_fallback(parentNode)"/></video></div><div class="caption"><p>A spinning top to answer the question ‘yes’ or ‘no’.</p></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
diff --git a/src/test/resources/expected/videoobject.002.html b/src/test/resources/expected/videoobject.002.html
index 1cb82d6dc..bcce9181b 100644
--- a/src/test/resources/expected/videoobject.002.html
+++ b/src/test/resources/expected/videoobject.002.html
@@ -1 +1 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: videoobject.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: videoobject.002</h1></header><p>A test for the <code class="tag tag-element">videoobject</code>.</p><div class="mediaobject"><div class="media video"><video class="videoobject" controls="controls"><source src="media/spinning-top.webm" type="video/webm"/><source src="media/spinning-top.mp4" type="video/mp4" onerror="docbook_object_fallback(parentNode)"/></video></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: videoobject.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="./js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: videoobject.002</h1></header><p>A test for the <code class="tag tag-element">videoobject</code>.</p><div class="mediaobject"><div class="media video"><video class="videoobject" controls="controls"><source src="media/spinning-top.webm" type="video/webm"/><source src="media/spinning-top.mp4" type="video/mp4" onerror="docbook_object_fallback(parentNode)"/></video></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file
diff --git a/src/test/resources/expected/videoobject.003.html b/src/test/resources/expected/videoobject.003.html
index b17f35311..0f9a9fb9d 100644
--- a/src/test/resources/expected/videoobject.003.html
+++ b/src/test/resources/expected/videoobject.003.html
@@ -1,2 +1,2 @@
-<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: videoobject.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: videoobject.002</h1></header><p>A test for the <code class="tag tag-element">videoobject</code> with image fallback.
+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml" class="no-js"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script><title>Unit test: videoobject.002</title><meta name="viewport" content="width=device-width, initial-scale=1.0"/><link href="https://purl.org/dc/elements/1.1/" rel="schema.dc"/><meta content="2011-04-22T17:02:00-06:00" name="dc.modified"/><meta content="DocBook xslTNG" name="generator"/><link href="./css/docbook.css" rel="stylesheet" media="screen"/><script src="./js/fallback.js"></script></head><body class="home"><nav class="top"></nav><main><article class="article component"><header><h1>Unit test: videoobject.002</h1></header><p>A test for the <code class="tag tag-element">videoobject</code> with image fallback.
    If the video is selected, it will have a <code class="tag tag-attribute">poster</code> attribute.</p><div class="mediaobject"><div class="media video"><video class="videoobject" controls="controls" poster="../media/spinning-top-poster.png"><source src="media/spinning-top.webm" type="video/webm"/><source src="media/spinning-top.mp4" type="video/mp4" onerror="docbook_object_fallback(parentNode)"/></video></div></div></article></main><nav class="bottom"></nav></body></html>
\ No newline at end of file