From edc8b3b4a19ae4067723d21b6cac11b58bd83e72 Mon Sep 17 00:00:00 2001
From: Romain Deltour <rdeltour@gmail.com>
Date: Sat, 13 Nov 2021 17:07:29 +0100
Subject: [PATCH] feat: do not check conformance of SVG content

EPUB 3.3 no longer requires that SVG content conforms to SVG content model requirements,
only that they are well-formed, that ID are uniques, and that they respect some additional
EPUB-specific requirements.

This commit:
  * introduces a new permissive RelaxNG schema for SVG, checking only the EPUB-specific
    requirements on the `title` and `foreignObject` content model
    see w3c/epub-specs#1323
  * removes checks on the value of the `requiredExtensions` attribute of `foreignObject`
    see w3c/epub-specs#1087
  * adapts the main XHTML to SVG schema driver to the new permissive SVG schema
  * adds various tests for EPUB-specific requirements
---
 .../epubcheck/schema/30/epub-svg-30.nvdl      | 19 +-----
 .../adobe/epubcheck/schema/30/epub-svg-30.rnc | 18 ++++-
 .../adobe/epubcheck/schema/30/epub-svg-30.sch |  4 --
 .../epubcheck/schema/30/epub-xhtml-30.rnc     | 18 +++--
 .../epubcheck/schema/30/epub-xhtml-30.sch     |  2 -
 .../epubcheck/schema/30/epub30-catalog.xml    | 10 +--
 .../epubcheck/schema/30/mod/epub-svg-inc.rnc  | 39 +++++++++++
 .../epubcheck/schema/30/mod/epub-svg11-re.sch |  7 --
 .../epubcheck/schema/30/mod/epub-svg11.rnc    | 40 -----------
 .../epub3/content-document-svg.feature        | 57 +++++++++++++---
 .../epub3/content-document-xhtml.feature      | 68 +++++++++++++------
 .../foreignObject-html-invalid-error.svg      | 13 ++++
 .../foreignObject-multiple-body-error.svg     | 19 ++++--
 .../foreignObject-non-html-content-error.svg  | 11 ---
 .../foreignObject-not-flow-content-error.svg  | 13 ++++
 .../foreignObject-not-html-error.svg          | 13 ++++
 ...eignObject-requiredExtensions-ns-error.svg |  9 ---
 ...foreignObject-requiredExtensions-valid.svg | 13 ++++
 .../foreignObject-valid.svg                   | 15 ++--
 .../content-document-svg/id-invalid-error.svg |  5 ++
 .../title-html-invalid-error.svg              |  5 ++
 .../title-not-phrasing-content-error.svg      |  5 ++
 .../title-phrasing-content-valid.svg          |  5 ++
 .../content-document-svg/title-text-valid.svg |  5 ++
 ...svg-foreignObject-html-invalid-error.xhtml | 19 ++++++
 .../svg-foreignObject-no-flow-error.xhtml     | 22 ------
 ...foreignObject-not-flow-content-error.xhtml | 19 ++++++
 ...eignObject-requiredExtensions-valid.xhtml} | 10 +--
 .../svg-foreignObject-valid.xhtml             | 32 ++++-----
 .../content-document-xhtml/svg-id-valid.xhtml | 14 ++++
 ...vg-error.xhtml => svg-invalid-usage.xhtml} |  7 +-
 .../svg-links-valid.xhtml                     | 26 -------
 .../svg-regression-valid.xhtml                | 17 +++++
 .../svg-rel-attribute-valid.xhtml             | 18 +++++
 .../svg-title-html-invalid-error.xhtml        | 15 ++++
 ...svg-title-not-phrasing-content-error.xhtml | 15 ++++
 .../svg-title-phrasing-content-valid.xhtml    | 15 ++++
 .../svg-title-text-valid.xhtml                | 15 ++++
 .../content-document-xhtml/svg-valid.xhtml    | 31 ++-------
 39 files changed, 437 insertions(+), 251 deletions(-)
 create mode 100644 src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc
 delete mode 100644 src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11-re.sch
 delete mode 100644 src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11.rnc
 create mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-html-invalid-error.svg
 delete mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-non-html-content-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-not-flow-content-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-not-html-error.svg
 delete mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-ns-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-valid.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/id-invalid-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/title-html-invalid-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/title-not-phrasing-content-error.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/title-phrasing-content-valid.svg
 create mode 100644 src/test/resources/epub3/files/content-document-svg/title-text-valid.svg
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-html-invalid-error.xhtml
 delete mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-no-flow-error.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-not-flow-content-error.xhtml
 rename src/test/resources/epub3/files/content-document-xhtml/{svg-requiredExtensions-error.xhtml => svg-foreignObject-requiredExtensions-valid.xhtml} (51%)
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-id-valid.xhtml
 rename src/test/resources/epub3/files/content-document-xhtml/{svg-error.xhtml => svg-invalid-usage.xhtml} (57%)
 delete mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-links-valid.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-regression-valid.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-rel-attribute-valid.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-title-html-invalid-error.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-title-not-phrasing-content-error.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-title-phrasing-content-valid.xhtml
 create mode 100644 src/test/resources/epub3/files/content-document-xhtml/svg-title-text-valid.xhtml

diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl
index 026d153a3..0bcd7caf2 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.nvdl
@@ -4,7 +4,7 @@
 		<namespace ns="http://www.w3.org/2000/svg">
 			<validate schema="epub-svg-30.rnc" schemaType="application/relax-ng-compact-syntax"
 				useMode="allowForeignNS">
-				<context path="foreignObject" useMode="allowHTMLOnly"/>
+				<context path="foreignObject" useMode="attachAnyNS"/>
 			</validate>
 			<validate schema="epub-svg-30.sch" useMode="attachAnyNS"/>
 		</namespace>
@@ -29,23 +29,6 @@
 			<allow/>
 		</anyNamespace>
 	</mode>
-	<mode name="allowHTMLOnly">
-		<namespace ns="http://www.w3.org/1999/xhtml">
-			<attach/>
-		</namespace>
-		<namespace ns="http://www.idpf.org/2007/ops" match="attributes">
-			<attach/>
-		</namespace>
-		<namespace ns="http://www.w3.org/1999/xlink" match="attributes">
-			<attach/>
-		</namespace>
-		<namespace ns="http://www.w3.org/XML/1998/namespace" match="attributes">
-			<attach/>
-		</namespace>
-		<namespace ns="" match="attributes">
-			<attach/>
-		</namespace>
-	</mode>
 	<mode name="attachAnyNS">
 		<anyNamespace>
 			<attach/>
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
index 87363bdf2..887e9b79d 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
@@ -1 +1,17 @@
-include "./mod/epub-svg11.rnc"
+namespace svg = "http://www.w3.org/2000/svg"
+
+include "./mod/epub-xhtml.rnc" {
+  start = svg
+}
+include "./mod/epub-mathml3.rnc"
+include "./mod/epub-svg-inc.rnc"
+
+svg.title.content |= common.elem.phrasing
+
+svg.foreignObject.content |= 
+  ( body.elem
+  | common.inner.flow
+  | math 
+  )
+
+mtext.content |= common.elem.phrasing
\ No newline at end of file
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.sch b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.sch
index 10ad603a4..0804a324f 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.sch
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.sch
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema xmlns="http://purl.oclc.org/dsdl/schematron">    
     
-    <ns uri="http://www.w3.org/2000/svg" prefix="svg" />
-    
-    <pattern></pattern>
     <include href="./mod/id-unique.sch"/>
-    <include href="./mod/epub-svg11-re.sch"/>
         
 </schema>
 
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
index acbe1a6aa..8a3368292 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
@@ -1,7 +1,17 @@
-## XHTML5
+namespace svg = "http://www.w3.org/2000/svg"
+
 include "./mod/epub-xhtml.rnc"
+include "./mod/epub-mathml3.rnc"
+include "./mod/epub-svg-inc.rnc" {
+  svg.attr.id = attribute id { datatype.html5.token }?
+}
+
+common.elem.phrasing |= svg
+common.elem.phrasing |= math
 
-## SVG and MathML
+svg.title.content |= common.elem.phrasing
 
-include "./mod/epub-xhtml-mathml3.rnc"
-include "./mod/epub-xhtml-svg11.rnc"
+svg.foreignObject.content |= 
+  ( common.inner.flow
+  | math 
+  )
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch b/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch
index 40d0213ec..5cae1670d 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.sch
@@ -402,6 +402,4 @@
         </rule>
     </pattern>
 
-    <include href="./mod/epub-svg11-re.sch"/>
-
 </schema>
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/epub30-catalog.xml b/src/main/resources/com/adobe/epubcheck/schema/30/epub30-catalog.xml
index c0916fb8f..0ad3c153f 100644
--- a/src/main/resources/com/adobe/epubcheck/schema/30/epub30-catalog.xml
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/epub30-catalog.xml
@@ -52,13 +52,9 @@
            uri="mod/epub-ssml-attrs.rnc"/>
    <system systemId="epub-ssml-attrs.rnc" uri="mod/epub-ssml-attrs.rnc"/>
                         
-   <system systemId="http://www.idpf.org/epub/30/schema/mod/epub-svg11.rnc"
-           uri="mod/epub-svg11.rnc"/>
-   <system systemId="epub-svg11.rnc" uri="mod/epub-svg11.rnc"/>
-                        
-   <system systemId="http://www.idpf.org/epub/30/schema/mod/epub-svg11-re.sch"
-           uri="mod/epub-svg11-re.sch"/>
-   <system systemId="epub-svg11-re.sch" uri="mod/epub-svg11-re.sch"/>
+   <system systemId="http://www.idpf.org/epub/30/schema/mod/epub-svg-inc.rnc"
+           uri="mod/epub-svg-inc.rnc"/>
+   <system systemId="epub-svg-inc.rnc" uri="mod/epub-svg-inc.rnc"/>
                         
    <system systemId="http://www.idpf.org/epub/30/schema/mod/epub-switch.rnc"
            uri="mod/epub-switch.rnc"/>
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc
new file mode 100644
index 000000000..eac862938
--- /dev/null
+++ b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg-inc.rnc
@@ -0,0 +1,39 @@
+default namespace = "http://www.w3.org/2000/svg"
+
+# #####################################################################
+##  Anything-goes schema for svg                                      #
+# #####################################################################
+
+## SVG root
+svg = svg.elem
+svg.elem =
+  element svg { any.content & any.attr }
+
+## Special cases
+specific.elems =
+  ( svg.foreignObject
+  | svg.title
+  )
+specific.attrs = svg.attr.id
+
+### SVG ID datatype
+svg.attr.id = attribute id { xsd:ID }?
+
+### SVG foreignObject element restrictions
+svg.foreignObject = 
+  element foreignObject { any.attr & svg.foreignObject.content }
+svg.foreignObject.content = notAllowed
+
+### SVG title element restrictions
+svg.title =
+  element title { any.attr & svg.title.content }
+svg.title.content = text
+
+## Anything
+
+## Any attribute from any namespace, other than the special cases
+any.attr = attribute * -id { text }* & svg.attr.id
+## Any element from any namespace, other than the special cases
+any.elem = element * - (foreignObject|title) { any.content & any.attr }
+## Any content from any namespace
+any.content = text & any.elem* & specific.elems*
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11-re.sch b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11-re.sch
deleted file mode 100644
index 223d39ab4..000000000
--- a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11-re.sch
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pattern id="svg-fo-re" xmlns="http://purl.oclc.org/dsdl/schematron">    
-    <rule context="svg:foreignObject[@requiredExtensions]">
-        <assert test="@requiredExtensions = 'http://www.idpf.org/2007/ops'"
-            >Invalid value (expecting: "http://www.idpf.org/2007/ops")</assert>
-    </rule>
-</pattern>
\ No newline at end of file
diff --git a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11.rnc b/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11.rnc
deleted file mode 100644
index 56e5cb1aa..000000000
--- a/src/main/resources/com/adobe/epubcheck/schema/30/mod/epub-svg11.rnc
+++ /dev/null
@@ -1,40 +0,0 @@
-# Credit: integration adapted from the Nu Html Checker drivers
-
-namespace svg = "http://www.w3.org/2000/svg"
-namespace math = "http://www.w3.org/1998/Math/MathML"
-namespace rdf = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-
-include "epub-xhtml.rnc" {
-	start = svg
-}
-include "svg11/svg11-inc.rnc"
-include "svg11/inkscape.rnc"
-
-include "epub-mathml3.rnc"
-
-common.elem.phrasing |= svg
-
-common.elem.phrasing |= math
-
-SVG.foreignObject.content |=
-	(	math
-	|	html.elem
-	|	body.elem
-	|	common.inner.flow
-	)
-
-SVG.Core.attrib &= aria.global?
-SVG.Core.extra.attrib &= epub.type.attr?
-
-# augment MathML annotation-xml content model
-# annotation-xml.model.svg |= svg
-# annotation-xml.model.xhtml |=
-#	(	html.elem
-#	|	common.elem.flow
-#	)
-
-# in our integration, <mtext> is the only MathML "token element" that can
-# contain HTML element content; the <mi>, <mn>, <mo> and <ms> elements
-# cannot; see http://www.w3.org/Bugs/Public/show_bug.cgi?id=9859#c8 for a
-# rationale
-mtext.content |= common.elem.phrasing
diff --git a/src/test/resources/epub3/content-document-svg.feature b/src/test/resources/epub3/content-document-svg.feature
index c41d4f778..fff944a69 100644
--- a/src/test/resources/epub3/content-document-svg.feature
+++ b/src/test/resources/epub3/content-document-svg.feature
@@ -19,7 +19,7 @@ Feature: EPUB 3 ▸ Content Documents ▸ SVG Document Checks
   ##  3.2 Content Conformance
 
   ###  ARIA attributes
- 
+
   Scenario: Verify ARIA attributes are allowed
     When checking document 'aria-attributes-valid.svg'
     Then no errors or warnings are reported
@@ -65,6 +65,12 @@ Feature: EPUB 3 ▸ Content Documents ▸ SVG Document Checks
     And the message contains 'Duplicate'
     And no other errors or warnings are reported
 
+  Scenario: Report invalid `id` attribute values 
+    When checking document 'id-invalid-error.svg'
+    Then error RSC-005 is reported
+    And the message contains '"id" is invalid'
+    And no other errors or warnings are reported
+
   ### Style Attribute
 
   Scenario: Verify `style` element without explicit `type` (issue 688)
@@ -84,20 +90,51 @@ Feature: EPUB 3 ▸ Content Documents ▸ SVG Document Checks
     When checking document 'foreignObject-valid.svg'
     Then no errors or warnings are reported
 
-  Scenario: Report `foreignObject` with a `requiredExtensions` attribute with a non-OPS namespace 
-    When checking document 'foreignObject-requiredExtensions-ns-error.svg'
+  Scenario: Verify that the `requiredExtensions` attribute can have any value
+    Note: 'requiredExensions' was required to be set to 'http://www.idpf.org/2007/ops' in EPUB 3.2 and earlier versions  
+    When checking document 'foreignObject-requiredExtensions-valid.svg'
+    Then no errors or warnings are reported
+
+  Scenario: Report `foreignObject` with non-HTML child content 
+    When checking document 'foreignObject-not-html-error.svg'
     Then error RSC-005 is reported
-    And the message contains 'Invalid value (expecting: "http://www.idpf.org/2007/ops")'
+    And the message contains 'element "foo" not allowed here'
     And no other errors or warnings are reported
-  
-  Scenario: Report `foreignObject` with non-HTML child content 
-    When checking document 'foreignObject-non-html-content-error.svg'
+
+  Scenario: Report `foreignObject` with non-flow content
+    When checking document 'foreignObject-not-flow-content-error.svg'
     Then error RSC-005 is reported
-    And the message contains 'elements from namespace "https://example.org" are not allowed'
+    And the message contains 'element "title" not allowed here'
     And no other errors or warnings are reported
-  
+
   Scenario: Report `foreignObject` with multiple HTML `body` elements
     When checking document 'foreignObject-multiple-body-error.svg'
     Then error RSC-005 is reported
-    And the message contains 'element "h:body" not allowed here'
+    And the message contains 'element "body" not allowed here'
+    And no other errors or warnings are reported
+    
+  Scenario: Report HTML validation errors within `foreignObject` content
+    When checking document 'foreignObject-html-invalid-error.svg'
+    Then error RSC-005 is reported
+    And the message contains 'attribute "href" not allowed here'
+    And no other errors or warnings are reported
+
+  Scenario: Verify `title` can contain text
+    When checking document 'title-text-valid.svg'
+    Then no errors or warnings are reported
+
+  Scenario: Verify `title` can contain HTML phrasing content
+    When checking document 'title-phrasing-content-valid.svg'
+    Then no errors or warnings are reported
+
+  Scenario: Report `title` with non-phrasing content
+    When checking document 'title-not-phrasing-content-error.svg'
+    Then error RSC-005 is reported
+    And the message contains 'element "h1" not allowed here'
+    And no other errors or warnings are reported
+    
+  Scenario: Report HTML validation errors within `title` content
+    When checking document 'title-html-invalid-error.svg'
+    Then error RSC-005 is reported
+    And the message contains 'attribute "href" not allowed here'
     And no other errors or warnings are reported
diff --git a/src/test/resources/epub3/content-document-xhtml.feature b/src/test/resources/epub3/content-document-xhtml.feature
index b233eec86..c1630a6e7 100644
--- a/src/test/resources/epub3/content-document-xhtml.feature
+++ b/src/test/resources/epub3/content-document-xhtml.feature
@@ -710,26 +710,25 @@ Feature: EPUB 3 ▸ Content Documents ▸ XHTML Document Checks
     When checking document 'svg-valid.xhtml'
     Then no errors or warnings are reported
 
+  Scenario: Verify conforming SVG markup does not create false-positives
+    When checking document 'svg-regression-valid.xhtml'
+    Then no errors or warnings are reported
+  Scenario: Verify the SVG IDs can be any valid HTML ID
+    When checking document 'svg-id-valid.xhtml'
+    Then no errors or warnings are reported
+
   Scenario: Verify that `epub:type` attribute can be used on SVG
     When checking document 'svg-with-epubtype-valid.xhtml'
     Then no errors or warnings are reported
 
-  Scenario: Report SVG with invalid content model
-    When checking document 'svg-error.xhtml'
-    Then error RSC-005 is reported 
-    And the message contains 'The svg element must not appear inside title elements'
-    And no other errors or warnings are reported
-
-  Scenario: Report SVG with incorrect `requiredExtensions` attribute value
-    When checking document 'svg-requiredExtensions-error.xhtml'
-    Then error RSC-005 is reported
-    And the message contains 'Invalid value (expecting: "http://www.idpf.org/2007/ops")'
+  Scenario: Verify that SVG validation erors are reported as USAGE
+    Given the reporting level set to usage 
+    When checking document 'svg-invalid-usage.xhtml'
+    #Then usage SVG-000 is reported 
+    #And the message contains 'element "foo" not allowed here'
     And no other errors or warnings are reported
 
-  Scenario: Verify `xlink:href` allowed on SVG elements
-    When checking document 'svg-links-valid.xhtml'
-    Then no errors or warnings are reported
-
+  #TODO review if this warning is relevant
   Scenario: Report an SVG link without a recommended title
     When checking document 'svg-links-no-title-warning.xhtml'
     Then warning ACC-011 is reported
@@ -739,19 +738,48 @@ Feature: EPUB 3 ▸ Content Documents ▸ XHTML Document Checks
     When checking document 'svg-foreignObject-valid.xhtml'
     Then no errors or warnings are reported
 
-  Scenario: Report `foreignObject` with disallowed body element
+  Scenario: Verify that the `requiredExtensions` attribute can have any value
+    When checking document 'svg-foreignObject-requiredExtensions-valid.xhtml'
+    And no other errors or warnings are reported
+
+  Scenario: Report `foreignObject` with a body element
     When checking document 'svg-foreignObject-with-body-error.xhtml'
     Then error RSC-005 is reported
     And the message contains 'element "body" not allowed here'
     And no other errors or warnings are reported
+    
+  Scenario: Report HTML validation errors within `foreignObject` content
+    When checking document 'svg-foreignObject-html-invalid-error.xhtml'
+    Then error RSC-005 is reported
+    And the message contains 'attribute "href" not allowed here'
+    And no other errors or warnings are reported
 
   Scenario: Report `foreignObject` without flow content
-    When checking document 'svg-foreignObject-no-flow-error.xhtml'
+    When checking document 'svg-foreignObject-not-flow-content-error.xhtml'
     Then error RSC-005 is reported
     And the message contains 'element "title" not allowed here'
     And no other errors or warnings are reported
 
-#  Still not allowed by epubcheck - https://github.com/w3c/epubcheck/issues/173
-#  Scenario: Verify RDF elements can be embedded in SVG
-#    When checking document 'svg-rdf-valid.xhtml'
-#    Then no errors or warnings are reported
+  Scenario: Verify `title` can contain text
+    When checking document 'svg-title-text-valid.xhtml'
+    Then no errors or warnings are reported
+
+  Scenario: Verify `title` can contain HTML phrasing content
+    When checking document 'svg-title-phrasing-content-valid.xhtml'
+    Then no errors or warnings are reported
+
+  Scenario: Report `title` with non-phrasing content
+    When checking document 'svg-title-not-phrasing-content-error.xhtml'
+    Then error RSC-005 is reported
+    And the message contains 'element "h1" not allowed here'
+    And no other errors or warnings are reported
+    
+  Scenario: Report HTML validation errors within `title` content
+    When checking document 'svg-title-html-invalid-error.xhtml'
+    Then error RSC-005 is reported
+    And the message contains 'attribute "href" not allowed here'
+    And no other errors or warnings are reported
+
+  Scenario: Verify RDF elements can be embedded in SVG
+    When checking document 'svg-rdf-valid.xhtml'
+    Then no errors or warnings are reported
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-html-invalid-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-html-invalid-error.svg
new file mode 100644
index 000000000..35c750d5d
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-html-invalid-error.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>SVG Test</title>
+	<desc>Rectangle</desc>
+	<switch>
+		<foreignObject width="50" height="50">
+			<body xmlns="http://www.w3.org/1999/xhtml">
+				<p href="#invalid">Hello</p>
+			</body>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-multiple-body-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-multiple-body-error.svg
index 31fdbe346..e3d87793c 100644
--- a/src/test/resources/epub3/files/content-document-svg/foreignObject-multiple-body-error.svg
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-multiple-body-error.svg
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
-	<title>foreignObject cannot contain more than one HTML body</title>
+	<title>SVG Test</title>
 	<desc>Rectangle</desc>
-	<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-	<foreignObject width="" height="" requiredExtensions="http://www.idpf.org/2007/ops"
-		xmlns:h="http://www.w3.org/1999/xhtml">
-		<h:body/>
-		<h:body/>
-	</foreignObject>
+	<switch>
+		<foreignObject width="50" height="50">
+			<body xmlns="http://www.w3.org/1999/xhtml">
+				<p>Hello</p>
+			</body>
+			<body xmlns="http://www.w3.org/1999/xhtml">
+				<p>Hello</p>
+			</body>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
 </svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-non-html-content-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-non-html-content-error.svg
deleted file mode 100644
index c72aaec1d..000000000
--- a/src/test/resources/epub3/files/content-document-svg/foreignObject-non-html-content-error.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
-	<title>foreignObject has to contain only html content</title>
-	<desc>Rectangle</desc>
-	<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-	<foreignObject width="" height="" requiredExtensions="http://www.idpf.org/2007/ops"
-		xmlns:h="http://www.w3.org/1999/xhtml" xmlns:foo="https://example.org">
-		<foo:p>hello</foo:p>
-		<h:p>hello</h:p>
-	</foreignObject>
-</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-not-flow-content-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-not-flow-content-error.svg
new file mode 100644
index 000000000..769e49598
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-not-flow-content-error.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>SVG Test</title>
+	<desc>Rectangle</desc>
+	<switch>
+		<foreignObject width="50" height="50">
+			<title xmlns="http://www.w3.org/1999/xhtml">
+				Test
+			</title>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-not-html-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-not-html-error.svg
new file mode 100644
index 000000000..09fad21b7
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-not-html-error.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>SVG Test</title>
+	<desc>Rectangle</desc>
+	<switch>
+		<foreignObject width="50" height="50">
+			<foo xmlns="https://example.org">
+				<p>Hello</p>
+			</foo>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-ns-error.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-ns-error.svg
deleted file mode 100644
index bb773d3a5..000000000
--- a/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-ns-error.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
-	<title>foreignObject has to have OPS namespace in requiredExtensions</title>
-	<desc>Rectangle</desc>
-	<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-	<foreignObject width="" height="" requiredExtensions="http://example.org" xmlns:h="http://www.w3.org/1999/xhtml">
-		<h:p>hello</h:p>
-	</foreignObject>
-</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-valid.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-valid.svg
new file mode 100644
index 000000000..79bcc86b3
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-requiredExtensions-valid.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>SVG Test</title>
+	<desc>Rectangle</desc>
+	<switch>
+		<foreignObject width="50" height="50" requiredExtensions="http://example.org">
+			<body xmlns="http://www.w3.org/1999/xhtml">
+				<p>Hello</p>
+			</body>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/foreignObject-valid.svg b/src/test/resources/epub3/files/content-document-svg/foreignObject-valid.svg
index 9ed4a23dd..272b8abdb 100644
--- a/src/test/resources/epub3/files/content-document-svg/foreignObject-valid.svg
+++ b/src/test/resources/epub3/files/content-document-svg/foreignObject-valid.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
-	<title>Valid foreignObject element</title>
+	<title>SVG Test</title>
 	<desc>Rectangle</desc>
-	<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-	<foreignObject width="" height="" requiredExtensions="http://www.idpf.org/2007/ops"
-		xmlns:h="http://www.w3.org/1999/xhtml">
-		<h:p>hello</h:p>
-	</foreignObject>
+	<switch>
+		<foreignObject width="50" height="50">
+			<body xmlns="http://www.w3.org/1999/xhtml">
+				<p>Hello</p>
+			</body>
+		</foreignObject>
+		<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
+	</switch>
 </svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/id-invalid-error.svg b/src/test/resources/epub3/files/content-document-svg/id-invalid-error.svg
new file mode 100644
index 000000000..023c2e5ce
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/id-invalid-error.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="1" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>Two elements with the same ID value</title>
+	<desc>Rectangle</desc>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/title-html-invalid-error.svg b/src/test/resources/epub3/files/content-document-svg/title-html-invalid-error.svg
new file mode 100644
index 000000000..ff287bba0
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/title-html-invalid-error.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title><span href="#invalid" xmlns="http://www.w3.org/1999/xhtml">SVG Test</span></title>
+	<desc>Rectangle</desc>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/title-not-phrasing-content-error.svg b/src/test/resources/epub3/files/content-document-svg/title-not-phrasing-content-error.svg
new file mode 100644
index 000000000..5e577203f
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/title-not-phrasing-content-error.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title><h1 xmlns="http://www.w3.org/1999/xhtml">SVG Test</h1></title>
+	<desc>Rectangle</desc>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/title-phrasing-content-valid.svg b/src/test/resources/epub3/files/content-document-svg/title-phrasing-content-valid.svg
new file mode 100644
index 000000000..af7f1a5e5
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/title-phrasing-content-valid.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title><span xmlns="http://www.w3.org/1999/xhtml">SVG Test</span></title>
+	<desc>Rectangle</desc>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-svg/title-text-valid.svg b/src/test/resources/epub3/files/content-document-svg/title-text-valid.svg
new file mode 100644
index 000000000..9e68f0f9c
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-svg/title-text-valid.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" xml:lang="en">
+	<title>SVG Test</title>
+	<desc>Rectangle</desc>
+</svg>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-html-invalid-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-html-invalid-error.xhtml
new file mode 100644
index 000000000..778d8fc7c
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-html-invalid-error.xhtml
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg:svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<svg:desc>Example</svg:desc>
+			<svg:switch>
+				<svg:foreignObject width="50" height="50">
+					<p href="#error">Hello</p>
+				</svg:foreignObject>
+			</svg:switch>
+		</svg:svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-no-flow-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-no-flow-error.xhtml
deleted file mode 100644
index b7827d313..000000000
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-no-flow-error.xhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<title>foreignObject element with non-flow content</title>
-	</head>
-	<body>
-		<svg:svg version="1.1" baseProfile="tiny" viewBox="0 0 4320 6480">
-			<svg:g transform="scale(10)">
-				<svg:g fill="none" stroke="green" stroke-width="1">
-					<svg:line x1="0" y1="0" x2="431" y2="0"/>
-					<svg:line x1="431" y1="0" x2="431" y2="647"/>
-					<svg:line x1="431" y1="647" x2="0" y2="647"/>
-					<svg:line x1="0" y1="647" x2="0" y2="0"/>
-				</svg:g>
-				<svg:foreignObject x="0" y="0" width="300" height="300">
-					<title>Disallowed</title>
-				</svg:foreignObject>
-			</svg:g>
-		</svg:svg>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-not-flow-content-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-not-flow-content-error.xhtml
new file mode 100644
index 000000000..7c0755393
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-not-flow-content-error.xhtml
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg:svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<svg:desc>Example</svg:desc>
+			<svg:switch>
+				<svg:foreignObject width="50" height="50">
+					<title>Hello</title>
+				</svg:foreignObject>
+			</svg:switch>
+		</svg:svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-requiredExtensions-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-requiredExtensions-valid.xhtml
similarity index 51%
rename from src/test/resources/epub3/files/content-document-xhtml/svg-requiredExtensions-error.xhtml
rename to src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-requiredExtensions-valid.xhtml
index d62a9850a..1fda7fe58 100644
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-requiredExtensions-error.xhtml
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-requiredExtensions-valid.xhtml
@@ -1,21 +1,15 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<!-- no svg descendants of svg:title, value of foreignObject@requiredExtensions -->
 	<head>
 		<meta charset="utf-8" />
-		<title>SVG with invalid requiredExtensions</title>
+		<title>SVG Test</title>
 	</head>
 	<body>
 		<section>
 			<p>...</p>
 			<svg width="12cm" height="4cm" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" version="1.1">
-				<desc>Example rect02 - rounded rectangles</desc>
-				<!-- Show outline of canvas using 'rect' element -->
+				<desc>Example</desc>
 				<rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
-				<rect x="100" y="100" width="400" height="200" rx="50" fill="green"/>
-				<g transform="translate(700 210) rotate(-30)">
-					<rect x="0" y="0" width="400" height="200" rx="50" fill="none" stroke="purple" stroke-width="30"/>
-				</g>
 				<foreignObject width="123" height="123" requiredExtensions="http://example.com"> </foreignObject>
 			</svg>
 			<p>...</p>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-valid.xhtml
index 0f144c9e6..8b9e6b1c9 100644
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-valid.xhtml
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-foreignObject-valid.xhtml
@@ -1,27 +1,19 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<title>Allow html elements inside prefixed svg:foreignObject</title>
+		<title>Test</title>
 	</head>
 	<body>
-		<div class="partpage">
-			<svg:svg version="1.1" width="6in" height="9in" baseProfile="tiny" viewBox="0 0 4320 6480"
-				preserveAspectRatio="xMidYMid">
-				<svg:g transform="scale(10)">
-					<svg:g fill="none" stroke="green" stroke-width="1">
-						<svg:line x1="0" y1="0" x2="431" y2="0"/>
-						<svg:line x1="431" y1="0" x2="431" y2="647"/>
-						<svg:line x1="431" y1="647" x2="0" y2="647"/>
-						<svg:line x1="0" y1="647" x2="0" y2="0"/>
-					</svg:g>
-					<svg:foreignObject x="0" y="148" width="432" height="300"
-						requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-						<h2>heading</h2>
-						<p>text</p>
-					</svg:foreignObject>
-				</svg:g>
-			</svg:svg>
-		</div>
+		<h1>Test</h1>
+		<svg:svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<svg:desc>Example</svg:desc>
+			<svg:switch>
+				<svg:foreignObject width="50" height="50">
+					<p>Hello</p>
+				</svg:foreignObject>
+			</svg:switch>
+		</svg:svg>
 	</body>
 </html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-id-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-id-valid.xhtml
new file mode 100644
index 000000000..9b169aa15
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-id-valid.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg id="1" width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<desc>Example</desc>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-invalid-usage.xhtml
similarity index 57%
rename from src/test/resources/epub3/files/content-document-xhtml/svg-error.xhtml
rename to src/test/resources/epub3/files/content-document-xhtml/svg-invalid-usage.xhtml
index d0d129853..105002b24 100644
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-error.xhtml
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-invalid-usage.xhtml
@@ -9,11 +9,8 @@
 		<section>
 			<p>...</p>
 			<svg xmlns="http://www.w3.org/2000/svg" width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1">
-				<title>Title <svg/></title>
-				<desc>Example rect01 - rectangle with sharp corners</desc>
-				<!-- Show outline of canvas using 'rect' element -->
-				<rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
-				<rect x="400" y="100" width="400" height="200" fill="yellow" stroke="navy" stroke-width="10"/>
+				<title>Title</title>
+				<foo>Invalid</foo>
 			</svg>
 			<p>...</p>
 		</section>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-links-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-links-valid.xhtml
deleted file mode 100644
index 65e6fc4ea..000000000
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-links-valid.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<title>xlink:href allowed on SVG elements</title>
-	</head>
-	<body>
-		<h1>SVG test</h1>
-		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" version="1.1"
-			xmlns:x="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink">
-			<title>Rectangle</title>
-			<desc>Example rect01 - rectangle with sharp corners </desc>
-
-			<a xlink:href="doc.xhtml" xlink:title="link" target="ch1">
-				<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-			</a>
-			<a xlink:href="doc.xhtml" target="ch1">
-				<title>link</title>
-				<rect x="10" y="20" width="75" height="30" style="stroke: #333366; fill: #6666cc"/>
-			</a>
-		</svg>
-		<p>
-			<a href="doc.xhtml">another link outside svg</a>
-		</p>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-regression-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-regression-valid.xhtml
new file mode 100644
index 000000000..f08129e81
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-regression-valid.xhtml
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<desc>Example</desc>
+			<!-- regression testing of false-positives:-->
+			<!--'rel' attribute must be allowed (see #1172)-->
+			<a xlink:href="https://example.org" xlink:title="example" target="_blank" rel="noreferrer">link</a>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-rel-attribute-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-rel-attribute-valid.xhtml
new file mode 100644
index 000000000..e63cae24d
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-rel-attribute-valid.xhtml
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<desc>Example rect01 - rectangle with sharp corners</desc>
+			<!-- Show outline of canvas using 'rect' element -->
+			<rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
+			<rect x="400" y="100" width="400" height="200" fill="yellow" stroke="navy" stroke-width="10"/>
+			<a xlink:href="https://example.org" target="_blank" rel="noreferrer">link</a>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-title-html-invalid-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-title-html-invalid-error.xhtml
new file mode 100644
index 000000000..7fdd9b9c3
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-title-html-invalid-error.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<title><span href="#error" xmlns="http://www.w3.org/1999/xhtml">title</span></title>
+			<desc>Example</desc>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-title-not-phrasing-content-error.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-title-not-phrasing-content-error.xhtml
new file mode 100644
index 000000000..5b4fd6ea4
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-title-not-phrasing-content-error.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<title><h1 xmlns="http://www.w3.org/1999/xhtml">title</h1></title>
+			<desc>Example</desc>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-title-phrasing-content-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-title-phrasing-content-valid.xhtml
new file mode 100644
index 000000000..02fc22782
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-title-phrasing-content-valid.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<title><span xmlns="http://www.w3.org/1999/xhtml">title</span></title>
+			<desc>Example</desc>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-title-text-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-title-text-valid.xhtml
new file mode 100644
index 000000000..85c11cd3c
--- /dev/null
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-title-text-valid.xhtml
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<title>Test</title>
+	</head>
+	<body>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<title>title</title>
+			<desc>Example</desc>
+		</svg>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/content-document-xhtml/svg-valid.xhtml b/src/test/resources/epub3/files/content-document-xhtml/svg-valid.xhtml
index 15533ce50..4ea5385f9 100644
--- a/src/test/resources/epub3/files/content-document-xhtml/svg-valid.xhtml
+++ b/src/test/resources/epub3/files/content-document-xhtml/svg-valid.xhtml
@@ -1,31 +1,14 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:x="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<title>Embedded SVG</title>
+		<title>Test</title>
 	</head>
 	<body>
-		<section>
-			<p>...</p>
-			<svg xmlns="http://www.w3.org/2000/svg" width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1">
-				<desc>Example rect01 - rectangle with sharp corners</desc>
-				<!-- Show outline of canvas using 'rect' element -->
-				<rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
-				<rect x="400" y="100" width="400" height="200" fill="yellow" stroke="navy" stroke-width="10"/>
-			</svg>
-			<svg width="12cm" height="4cm" viewBox="0 0 1200 400" xmlns="http://www.w3.org/2000/svg" version="1.1">
-				<desc>Example rect02 - rounded rectangles</desc>
-				<!-- Show outline of canvas using 'rect' element -->
-				<rect x="1" y="1" width="1198" height="398" fill="none" stroke="blue" stroke-width="2"/>
-				<rect x="100" y="100" width="400" height="200" rx="50" fill="green"/>
-				<g transform="translate(700 210) rotate(-30)">
-					<rect x="0" y="0" width="400" height="200" rx="50" fill="none" stroke="purple" stroke-width="30"/>
-				</g>
-				<foreignObject width="123" height="123" requiredExtensions="http://www.idpf.org/2007/ops">
-					<x:p></x:p>
-				</foreignObject>
-			</svg>
-			<p>...</p>
-		</section>
+		<h1>Test</h1>
+		<svg width="12cm" height="4cm" viewBox="0 0 1200 400" version="1.1"
+			xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+			<desc>Example</desc>
+		</svg>
 	</body>
 </html>