-
Notifications
You must be signed in to change notification settings - Fork 408
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update XHTML, SVG and MathML schemas
This is a major schema update, to reuse the latest schemas from the Nu Html Checker, with the following tweaks: - adapt the integration in schema drivers - replace the Nu Html Checker's pluggable datatype library with EPUBCheck’s more limited static RelaxNG datatypes - add EPUB-specific content model extensions Changes specific to XHTML: - keep allowing missing `title` in the `head` element - but report missing `title` as a WARNING (with a Schematron check) - keep allowing `meta http-equiv` in encoding declaration state (allowed in W3C but forbidden in WHATWG's HTML standard) - keep allowing the `border` attribute on `table` elements (allowed in W3C but forbidden in WHATWG's HTML standard) - report `aria-describedat` as a schema error - add tests for several obsolete features which appeared in previous test content (`time/@pubdate`, `iframe/@seamless`, `keygen`, `menu`, `dropzone`, `contextmenu`, in-body `style`, `style/@scoped`) Changes specific to MathML: - use the schemas from Nu Html Checker, which are based on older MathML schema but bring some specific tweaks. - re-add the changes from the newer MathML 3.0 (2nd edition) schemas - improve the schema checks of EPUB-specific `annotation-xml` restrictions (notably check the combination of the `name` and `encoding` attributes) Changes specific to SVG: - use the schemas from Nu Html Checker, which are based SVG 1.1 Changes specific to Navigation Documents: - do not check the presence of mandatory headings on `nav` elements with no `epub:type` attribute Fixes #892 Fixes #779 Fixes #896 Fixes (partially?) #893 Closes #448
- Loading branch information
Showing
243 changed files
with
16,117 additions
and
7,173 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 1 addition & 17 deletions
18
src/main/resources/com/adobe/epubcheck/schema/30/epub-svg-30.rnc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1 @@ | ||
|
||
namespace x = "http://www.w3.org/1999/xhtml" | ||
|
||
include "./mod/html5/html5-grouping-30.rnc" inherit = x | ||
include "./mod/html5/html5-phrasing-30.rnc" inherit = x | ||
include "./mod/html5/html5-sections-30.rnc" inherit = x | ||
include "./mod/html5/html5-style-30.rnc" inherit = x | ||
include "./mod/epub-ssml-attrs.rnc" | ||
|
||
include "./mod/html5/html5-attrib-30.rnc" | ||
|
||
include "./mod/html5/html5-aria-30.rnc" | ||
|
||
include "./mod/datatypes.rnc" | ||
include "./mod/html5/html5-models-30.rnc" | ||
|
||
start = external "mod/epub-svg11-30.rnc" | ||
include "./mod/epub-svg11.rnc" |
42 changes: 5 additions & 37 deletions
42
src/main/resources/com/adobe/epubcheck/schema/30/epub-xhtml-30.rnc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,7 @@ | ||
## XHTML5 | ||
include "./mod/epub-xhtml.rnc" | ||
|
||
## SVG and MathML | ||
|
||
|
||
default namespace = "http://www.w3.org/1999/xhtml" | ||
|
||
include "./mod/html5/html5-document-30.rnc" | ||
|
||
include "./mod/html5/html5-sections-30.rnc" | ||
include "./mod/html5/html5-grouping-30.rnc" | ||
include "./mod/html5/html5-phrasing-30.rnc" | ||
include "./mod/html5/html5-embed-30.rnc" | ||
|
||
include "./mod/html5/html5-edit-30.rnc" | ||
include "./mod/html5/html5-style-30.rnc" | ||
include "./mod/html5/html5-script-30.rnc" | ||
include "./mod/html5/html5-interactive-30.rnc" | ||
include "./mod/html5/html5-forms-30.rnc" | ||
|
||
include "./mod/html5/html5-attrib-30.rnc" | ||
include "./mod/html5/html5-aria-30.rnc" | ||
include "./mod/html5/html5-rdfa.rnc" | ||
include "./mod/html5/html5-md.rnc" | ||
|
||
include "./mod/datatypes.rnc" | ||
include "./mod/html5/html5-models-30.rnc" | ||
|
||
include "./mod/epub-xhtml-mathml3-30.rnc" | ||
include "./mod/epub-xhtml-svg11-30.rnc" | ||
|
||
include "./mod/epub-trigger.rnc" | ||
include "./mod/epub-switch.rnc" | ||
|
||
include "./mod/epub-type-attr.rnc" | ||
include "./mod/epub-prefix-attr.rnc" | ||
include "./mod/epub-ssml-attrs.rnc" | ||
|
||
start = html5.html | ||
|
||
|
||
include "./mod/epub-xhtml-mathml3.rnc" | ||
include "./mod/epub-xhtml-svg11.rnc" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.