diff --git a/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java b/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java index 24919679..96536594 100755 --- a/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java +++ b/src/main/java/com/adobe/epubcheck/ops/OPSChecker.java @@ -56,7 +56,7 @@ .putAll(Predicates.and(mimetype("application/xhtml+xml"), version(EPUBVersion.VERSION_3)), XMLValidators.XHTML_30_RNC, XMLValidators.XHTML_30_SCH) .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_2)), - XMLValidators.SVG_20_RNG, XMLValidators.IDUNIQUE_20_SCH) + XMLValidators.SVG_20_NVDL, XMLValidators.IDUNIQUE_20_SCH) .putAll(Predicates.and(mimetype("image/svg+xml"), version(EPUBVersion.VERSION_3)), XMLValidators.SVG_30_NVDL) .putAll( diff --git a/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java b/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java index 103893ad..bc72f17b 100644 --- a/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java +++ b/src/main/java/com/adobe/epubcheck/xml/XMLValidators.java @@ -36,7 +36,7 @@ SEARCH_KEY_MAP_RNC("schema/30/dict/search-key-map.rnc"), SIG_20_RNG("schema/20/rng/signatures.rng"), SIG_30_RNC("schema/30/ocf-signatures-30.rnc"), - SVG_20_RNG("schema/20/rng/svg11.rng"), + SVG_20_NVDL("schema/20/rng/ops20-svg.nvdl"), SVG_30_RNC("schema/30/epub-svg-30.rnc"), SVG_30_NVDL("schema/30/epub-svg-30.nvdl"), SVG_30_SCH("schema/30/epub-svg-30.sch"), diff --git a/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20-svg.nvdl b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20-svg.nvdl new file mode 100644 index 00000000..97a43a1d --- /dev/null +++ b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20-svg.nvdl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl index a4228351..4823776b 100644 --- a/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl +++ b/src/main/resources/com/adobe/epubcheck/schema/20/rng/ops20.nvdl @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -67,4 +67,24 @@ + + + + + + + + + + + + + + + + + + + +