From e4a69a5c8da30922c705a20de5b7bfad9d1c67ae Mon Sep 17 00:00:00 2001 From: Romain Deltour Date: Wed, 16 Nov 2022 22:30:24 +0100 Subject: [PATCH 1/2] test: add test for media overlays for SVG content --- .../EPUB/content_001.mp3 | Bin 0 -> 10363 bytes .../EPUB/content_001.smil | 9 ++++++++ .../EPUB/content_001.svg | 6 ++++++ .../mediaoverlays-svg-valid/EPUB/nav.xhtml | 14 ++++++++++++ .../mediaoverlays-svg-valid/EPUB/package.opf | 20 ++++++++++++++++++ .../META-INF/container.xml | 6 ++++++ .../files/mediaoverlays-svg-valid/mimetype | 1 + .../09-media-overlays/media-overlays.feature | 5 +++++ 8 files changed, 61 insertions(+) create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.mp3 create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.smil create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.svg create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/nav.xhtml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/package.opf create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/META-INF/container.xml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/mimetype diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..3f140bbc4f2bba4396e38c140245d027a5aa5681 GIT binary patch literal 10363 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 LR + + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.svg b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.svg new file mode 100644 index 000000000..cb4d2de6e --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/content_001.svg @@ -0,0 +1,6 @@ + + + SVG Content Document + Rectangle + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/nav.xhtml new file mode 100644 index 000000000..b75e4403d --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/nav.xhtml @@ -0,0 +1,14 @@ + + + + + Minimal Nav + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/package.opf new file mode 100644 index 000000000..454ecc580 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/EPUB/package.opf @@ -0,0 +1,20 @@ + + + + Minimal EPUB 3.0 + en + NOID + 2017-06-14T00:00:01Z + 2.5s + 2.5s + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/META-INF/container.xml new file mode 100644 index 000000000..318782179 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/META-INF/container.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/mimetype new file mode 100644 index 000000000..57ef03f24 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-svg-valid/mimetype @@ -0,0 +1 @@ +application/epub+zip \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/media-overlays.feature b/src/test/resources/epub3/09-media-overlays/media-overlays.feature index d06245211..027a47b6a 100644 --- a/src/test/resources/epub3/09-media-overlays/media-overlays.feature +++ b/src/test/resources/epub3/09-media-overlays/media-overlays.feature @@ -33,6 +33,11 @@ Feature: EPUB 3 — Media Overlays When checking EPUB 'mediaoverlays-multiple-overlay-ref-error' Then error MED-011 is reported And no other errors or warnings are reported + + @spec @xref:sec-overlay-req + Scenario: Verify a minimal EPUB 3 publication with Media Overlays for SVG content + When checking EPUB 'mediaoverlays-svg-valid' + Then no errors or warnings are reported ### 9.2.2 Media overlay document definition From 2091d1408fdddbac3e033f9aa0ccf725abff98dd Mon Sep 17 00:00:00 2001 From: Romain Deltour Date: Wed, 16 Nov 2022 23:40:47 +0100 Subject: [PATCH 2/2] feat: check fragment requirements on overlays links to text content This commit checks the updated requirements on referencing document fragments from media overlays. - Warning `MED-017` (new) is reported for fragment references to XHTML content documents that do not indicate an element ID - Warning `MED-018` (new) is reported for fragment references SVG content document that are not valid SVG fragment identifiers Fixes #1248, fixes #1301 --- .../adobe/epubcheck/dtbook/DTBookHandler.java | 2 +- .../epubcheck/messages/DefaultSeverities.java | 2 + .../adobe/epubcheck/messages/MessageId.java | 2 + .../com/adobe/epubcheck/opf/XRefChecker.java | 61 ++++++----- .../com/adobe/epubcheck/ops/OPSHandler.java | 2 - .../epubcheck/overlay/OverlayHandler.java | 102 +++++++----------- .../epubcheck/overlay/OverlayTextChecker.java | 6 +- .../messages/MessageBundle.properties | 4 +- .../EPUB/content_001.mp3 | Bin .../EPUB/content_001.smil | 9 ++ .../EPUB/content_001.xhtml | 0 .../EPUB/nav.xhtml | 0 .../EPUB/package.opf | 0 .../META-INF/container.xml | 0 .../mimetype | 0 .../EPUB/content_001.mp3 | Bin .../EPUB/content_001.smil | 0 .../EPUB/content_001.xhtml | 0 .../EPUB/nav.xhtml | 0 .../EPUB/package.opf | 0 .../META-INF/container.xml | 0 .../mimetype | 0 .../EPUB/content_001.mp3 | Bin 0 -> 10363 bytes .../EPUB/content_001.smil | 4 +- .../EPUB/content_001.xhtml | 11 ++ .../EPUB/nav.xhtml | 14 +++ .../EPUB/package.opf | 20 ++++ .../META-INF/container.xml | 6 ++ .../mimetype | 1 + .../EPUB/content_001.mp3 | Bin 0 -> 10363 bytes .../EPUB/content_001.smil | 9 ++ .../EPUB/content_001.svg | 6 ++ .../EPUB/nav.xhtml | 14 +++ .../EPUB/package.opf | 20 ++++ .../META-INF/container.xml | 6 ++ .../mimetype | 1 + .../EPUB/content_001.mp3 | Bin 0 -> 10363 bytes .../EPUB/content_001.smil | 9 ++ .../EPUB/content_001.svg | 6 ++ .../EPUB/nav.xhtml | 14 +++ .../EPUB/package.opf | 20 ++++ .../META-INF/container.xml | 6 ++ .../mimetype | 1 + .../09-media-overlays/media-overlays.feature | 41 ++++--- 44 files changed, 285 insertions(+), 114 deletions(-) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/EPUB/content_001.mp3 (100%) create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.smil rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/EPUB/content_001.xhtml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/EPUB/nav.xhtml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/EPUB/package.opf (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/META-INF/container.xml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-fragment-schemebased-warning}/mimetype (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/EPUB/content_001.mp3 (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/EPUB/content_001.smil (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/EPUB/content_001.xhtml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/EPUB/nav.xhtml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/EPUB/package.opf (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/META-INF/container.xml (100%) rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-resolve-error => mediaoverlays-textref-fragment-unresolved-error}/mimetype (100%) create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.mp3 rename src/test/resources/epub3/09-media-overlays/files/{mediaoverlays-fragid-invalid-error => mediaoverlays-textref-no-fragment-valid}/EPUB/content_001.smil (73%) create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.xhtml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/nav.xhtml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/package.opf create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/META-INF/container.xml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/mimetype create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.mp3 create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.smil create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.svg create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/nav.xhtml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/package.opf create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/META-INF/container.xml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/mimetype create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.mp3 create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.smil create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.svg create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/nav.xhtml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/package.opf create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/META-INF/container.xml create mode 100644 src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/mimetype diff --git a/src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java b/src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java index adc9180db..71c37caa7 100755 --- a/src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java +++ b/src/main/java/com/adobe/epubcheck/dtbook/DTBookHandler.java @@ -51,7 +51,7 @@ public void startElement() if (ns.equals("http://www.daisy.org/z3986/2005/dtbook/")) { // Register IDs - xrefChecker.registerID(e.getAttribute("id"), XRefChecker.Type.HYPERLINK, location()); + xrefChecker.registerID(e.getAttribute("id"), XRefChecker.Type.GENERIC, location()); // Check cross-references (link@href | a@href | img@src) URL url = null; diff --git a/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java b/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java index a24f07318..77621f6d9 100644 --- a/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java +++ b/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java @@ -160,6 +160,8 @@ private void initialize() severities.put(MessageId.MED_014, Severity.ERROR); severities.put(MessageId.MED_015, Severity.USAGE); severities.put(MessageId.MED_016, Severity.WARNING); + severities.put(MessageId.MED_017, Severity.WARNING); + severities.put(MessageId.MED_018, Severity.WARNING); // NAV severities.put(MessageId.NAV_001, Severity.ERROR); diff --git a/src/main/java/com/adobe/epubcheck/messages/MessageId.java b/src/main/java/com/adobe/epubcheck/messages/MessageId.java index 475d76c15..63e66921b 100644 --- a/src/main/java/com/adobe/epubcheck/messages/MessageId.java +++ b/src/main/java/com/adobe/epubcheck/messages/MessageId.java @@ -154,6 +154,8 @@ public enum MessageId implements Comparable MED_014("MED_014"), MED_015("MED_015"), MED_016("MED_016"), + MED_017("MED_017"), + MED_018("MED_018"), // Epub3 based table of content errors NAV_001("NAV-001"), diff --git a/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java b/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java index 655478a2a..731841ffb 100755 --- a/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java +++ b/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java @@ -407,6 +407,7 @@ public void checkReferences() break; case OVERLAY_TEXT_LINK: overlayLinks.add(reference); + checkReference(reference); break; default: checkReference(reference); @@ -419,11 +420,7 @@ public void checkReferences() private void checkReference(URLReference reference) { - Resource hostResource = resources.get(reference.location.url); - - // Retrieve the Resource instance representing the targeted document - // If the resource was not declared in the manifest, - // we build a new Resource object for the data URL. + // Retrieve the target resource Resource targetResource = resources.get(reference.targetDoc); String targetMimetype = (targetResource != null) ? targetResource.getMimeType() : ""; @@ -487,6 +484,7 @@ else if (!undeclared.contains(reference.targetDoc) switch (reference.type) { case HYPERLINK: + if ("epubcfi".equals(fragment.getScheme())) { break; // EPUB CFI is not supported @@ -536,6 +534,14 @@ else if (reference.type == Type.IMAGE && !targetResource.hasImageFallback()) } } break; + case OVERLAY_TEXT_LINK: + if (!OPFChecker.isBlessedItemType(targetMimetype, version)) + { + report.message(MessageId.RSC_010, + reference.location.context(container.relativize(reference.url))); + return; + } + break; case SEARCH_KEY: // TODO update when we support EPUB CFI if ((!fragment.exists() || !"epubcfi".equals(fragment.getScheme())) @@ -584,31 +590,27 @@ else if (reference.type == Type.IMAGE && !targetResource.hasImageFallback()) // Fragment integrity checks if (fragment.exists() && !fragment.isEmpty()) { - // EPUB CFI - if ("epubcfi".equals(fragment.getScheme())) - { - // FIXME HOT should warn if in MO - // FIXME epubcfi currently not supported (see issue 150). - return; - } - // Media fragments in Data Navigation Documents - else if (fragment.isMediaFragment() && hostResource != null && hostResource.hasItem() - && hostResource.getItem().getProperties() - .contains(PackageVocabs.ITEM_VOCAB.get(PackageVocabs.ITEM_PROPERTIES.DATA_NAV))) - { - // Ignore, - return; - } - // Non-ID-based fragments are ignored - else if (fragment.getId().isEmpty()) + // Check media overlays requirements + if (reference.type == Type.OVERLAY_TEXT_LINK) { - return; + // Check that references to XHTML indicate an element by ID + if (MIMEType.XHTML.is(targetMimetype) && fragment.getId().isEmpty()) + { + report.message(MessageId.MED_017, reference.location, fragment.toString()); + } + // Check that references to SVG use a SVG fragment identifier + else if (MIMEType.SVG.is(targetMimetype) && !fragment.isValid()) + { + report.message(MessageId.MED_018, reference.location, fragment.toString()); + } } - // Fragment Identifier (by default) - else if (!container.isRemote(reference.targetDoc)) + + // Check ID-based fragments + // Other fragment types (e.g. EPUB CFI) are not currently supported + if (!fragment.getId().isEmpty() && !container.isRemote(reference.targetDoc)) { - ID anchor = targetResource.ids.get(fragment.getId()); - if (anchor == null) + ID targetID = targetResource.ids.get(fragment.getId()); + if (targetID == null) { report.message(MessageId.RSC_012, reference.location.context(reference.url.toString())); return; @@ -617,7 +619,7 @@ else if (!container.isRemote(reference.targetDoc)) { case SVG_PAINT: case SVG_CLIP_PATH: - if (anchor.type != reference.type) + if (targetID.type != reference.type) { report.message(MessageId.RSC_014, reference.location.context(reference.url.toString())); return; @@ -625,7 +627,8 @@ else if (!container.isRemote(reference.targetDoc)) break; case SVG_SYMBOL: case HYPERLINK: - if (anchor.type != reference.type && anchor.type != Type.GENERIC) + case OVERLAY_TEXT_LINK: + if (targetID.type != reference.type && targetID.type != Type.GENERIC) { report.message(MessageId.RSC_014, reference.location.context(reference.url.toString())); return; diff --git a/src/main/java/com/adobe/epubcheck/ops/OPSHandler.java b/src/main/java/com/adobe/epubcheck/ops/OPSHandler.java index ad3993eaa..f2590e9f9 100755 --- a/src/main/java/com/adobe/epubcheck/ops/OPSHandler.java +++ b/src/main/java/com/adobe/epubcheck/ops/OPSHandler.java @@ -290,8 +290,6 @@ else if (name.equals("script")) checkScript(); } - resourceType = XRefChecker.Type.HYPERLINK; - String style = e.getAttribute("style"); if (style != null && style.length() > 0) { diff --git a/src/main/java/com/adobe/epubcheck/overlay/OverlayHandler.java b/src/main/java/com/adobe/epubcheck/overlay/OverlayHandler.java index 6903e0036..59cf5e24a 100644 --- a/src/main/java/com/adobe/epubcheck/overlay/OverlayHandler.java +++ b/src/main/java/com/adobe/epubcheck/overlay/OverlayHandler.java @@ -12,6 +12,7 @@ import com.adobe.epubcheck.opf.OPFChecker30; import com.adobe.epubcheck.opf.ValidationContext; import com.adobe.epubcheck.opf.XRefChecker; +import com.adobe.epubcheck.opf.XRefChecker.Type; import com.adobe.epubcheck.util.EpubConstants; import com.adobe.epubcheck.vocab.AggregateVocab; import com.adobe.epubcheck.vocab.PackageVocabs; @@ -22,7 +23,6 @@ import com.adobe.epubcheck.vocab.VocabUtil; import com.adobe.epubcheck.xml.handlers.XMLHandler; import com.adobe.epubcheck.xml.model.XMLElement; -import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -54,6 +54,8 @@ public void startElement() XMLElement e = currentElement(); String name = e.getName(); + processGlobalAttrs(); + switch (name) { case "smil": @@ -64,8 +66,7 @@ public void startElement() case "body": case "seq": - case "par": - processGlobalAttrs(); + processTextRef(); break; case "text": @@ -140,79 +141,65 @@ private void checkType(String type) private void processTextSrc() { - URL srcURL = checkURL(currentElement().getAttribute("src")); - if (srcURL != null) + URL url = checkURL(currentElement().getAttribute("src")); + if (url != null && context.xrefChecker.isPresent()) { - processRef(srcURL, XRefChecker.Type.HYPERLINK); - - if (context.xrefChecker.isPresent()) - { - context.xrefChecker.get().registerReference(srcURL, XRefChecker.Type.OVERLAY_TEXT_LINK, - location()); - } + processContentDocumentLink(url); } } + private void processTextRef() + { + URL url = checkURL( + currentElement().getAttributeNS(EpubConstants.EpubTypeNamespaceUri, "textref")); + if (url != null && context.xrefChecker.isPresent()) + { + processContentDocumentLink(url); + } + } + private void processAudioSrc() { - URL srcURL = checkURL(currentElement().getAttribute("src")); - if (srcURL != null) + URL url = checkURL(currentElement().getAttribute("src")); + if (url != null && context.xrefChecker.isPresent()) { - processRef(srcURL, XRefChecker.Type.AUDIO); + // check that the audio type is a core media type resource + String mimeType = context.xrefChecker.get().getMimeType(url); + if (mimeType != null && !OPFChecker30.isBlessedAudioType(mimeType)) + { + report.message(MessageId.MED_005, location(), context.relativize(url), mimeType); + } + + // register the URL for cross-reference checking + context.xrefChecker.get().registerReference(url, Type.AUDIO, location()); - if (context.isRemote(srcURL)) + // if needed, register we found a remote resource + if (context.isRemote(url)) { requiredProperties.add(ITEM_PROPERTIES.REMOTE_RESOURCES); } } } - private void processRef(URL ref, XRefChecker.Type type) + private void processContentDocumentLink(URL url) { - assert ref != null; - if (context.xrefChecker.isPresent()) + assert url != null; + assert context.xrefChecker.isPresent(); + assert context.overlayTextChecker.isPresent(); + URL documentURL = URLUtils.docURL(url); + if (!context.overlayTextChecker.get().registerOverlay(documentURL, + context.opfItem.get().getId())) { - if (type == XRefChecker.Type.AUDIO) - { - String mimeType = context.xrefChecker.get().getMimeType(ref); - if (mimeType != null && !OPFChecker30.isBlessedAudioType(mimeType)) - { - report.message(MessageId.MED_005, location(), context.relativize(ref), mimeType); - } - } - else - { - checkFragment(ref); - URL resourceURL = URLUtils.docURL(ref); - // FIXME 2022 see if test case is needed - // if (!Strings.isNullOrEmpty(uniqueResource)) - // { - // (uniqueResource was ref-minus-fragment string) - // OverlayTextChecker must be present if XRefChecker is also present - assert context.overlayTextChecker.isPresent(); - if (!context.overlayTextChecker.get().registerOverlay(resourceURL, context.opfItem.get().getId())) - { - report.message(MessageId.MED_011, location(), context.relativize(ref)); - } - // } - } - context.xrefChecker.get().registerReference(ref, type, location()); + report.message(MessageId.MED_011, location(), context.relativize(url)); } + context.xrefChecker.get().registerReference(url, Type.OVERLAY_TEXT_LINK, location()); } private void processGlobalAttrs() { XMLElement e = currentElement(); - if (!e.getName().equals("audio")) - { - URL textrefURL = checkURL(e.getAttributeNS(EpubConstants.EpubTypeNamespaceUri, "textref")); - if (textrefURL != null) - { - processRef(textrefURL, XRefChecker.Type.HYPERLINK); - } - } checkType(e.getAttributeNS(EpubConstants.EpubTypeNamespaceUri, "type")); } @@ -238,17 +225,6 @@ private void checkItemReferences() } - private void checkFragment(URL url) - { - String fragment = url.fragment(); - - if (Strings.isNullOrEmpty(fragment)) - { - // must include a non-empty fragid - report.message(MessageId.MED_014, location()); - } - } - protected void checkProperties() { if (!context.container.isPresent()) // single file validation diff --git a/src/main/java/com/adobe/epubcheck/overlay/OverlayTextChecker.java b/src/main/java/com/adobe/epubcheck/overlay/OverlayTextChecker.java index ee974abd6..37466d0db 100644 --- a/src/main/java/com/adobe/epubcheck/overlay/OverlayTextChecker.java +++ b/src/main/java/com/adobe/epubcheck/overlay/OverlayTextChecker.java @@ -24,8 +24,7 @@ public boolean registerOverlay(URL contentDocURL, String overlayID) } else { - // TODO check if case must really be ignored - return overlayID.equalsIgnoreCase(docToOverlayMap.get(contentDocURL)); + return overlayID.equals(docToOverlayMap.get(contentDocURL)); } } @@ -40,7 +39,6 @@ public boolean isReferencedByOverlay(URL contentDocURL) public boolean isCorrectOverlay(URL contentDocURL, String overlayID) { - // TODO check if case must really be ignored - return overlayID.equalsIgnoreCase(docToOverlayMap.get(contentDocURL)); + return overlayID.equals(docToOverlayMap.get(contentDocURL)); } } diff --git a/src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties b/src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties index 9c361cf09..a5ae619f9 100644 --- a/src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties +++ b/src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties @@ -144,7 +144,9 @@ MED_012=The "media-overlay" attribute does not match the ID of the Media Overlay MED_013=Media Overlay Document referenced from the "media-overlay" attribute does not contain a reference to this Content Document. MED_014=A non-empty fragment identifier is required. MED_015=Media overlay text references must be in reading order. Text target "%1$s" is before the previous link target in %2$s order. -MED_016=Media Overlays total duration should be the sum of the durations of all Media Overlays documents. +MED_016=Media Overlays total duration should be the sum of the durations of all Media Overlays documents. +MED_017=URL fragment should indicate an element ID, but found '#%1$s'. +MED_018=URL fragment should be an SVG fragment identifier, but found '#%1$s'. #NAV EPUB v3 Table of contents NAV_001=The nav file is not supported for EPUB v2. diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.mp3 similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/content_001.mp3 rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.mp3 diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.smil b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.smil new file mode 100644 index 000000000..d08dc8bdf --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.smil @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/content_001.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.xhtml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/content_001.xhtml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/content_001.xhtml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/nav.xhtml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/nav.xhtml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/nav.xhtml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/package.opf similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/EPUB/package.opf rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/EPUB/package.opf diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/META-INF/container.xml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/META-INF/container.xml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/META-INF/container.xml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/mimetype similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-invalid-error/mimetype rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-schemebased-warning/mimetype diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.mp3 similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.mp3 rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.mp3 diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.smil b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.smil similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.smil rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.smil diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.xhtml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/content_001.xhtml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/content_001.xhtml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/nav.xhtml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/nav.xhtml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/nav.xhtml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/package.opf similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/EPUB/package.opf rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/EPUB/package.opf diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/META-INF/container.xml similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/META-INF/container.xml rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/META-INF/container.xml diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/mimetype similarity index 100% rename from src/test/resources/epub3/09-media-overlays/files/mediaoverlays-fragid-resolve-error/mimetype rename to src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-fragment-unresolved-error/mimetype diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..3f140bbc4f2bba4396e38c140245d027a5aa5681 GIT binary patch literal 10363 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 LR - + - + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.xhtml new file mode 100644 index 000000000..28757800c --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/content_001.xhtml @@ -0,0 +1,11 @@ + + + + + Minimal EPUB + + +

Loomings

+

Call me Ishmael.

+ + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/nav.xhtml new file mode 100644 index 000000000..240745e63 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/nav.xhtml @@ -0,0 +1,14 @@ + + + + + Minimal Nav + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/package.opf new file mode 100644 index 000000000..d45324410 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/EPUB/package.opf @@ -0,0 +1,20 @@ + + + + Minimal EPUB 3.0 + en + NOID + 2017-06-14T00:00:01Z + 2.5s + 2.5s + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/META-INF/container.xml new file mode 100644 index 000000000..318782179 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/META-INF/container.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/mimetype new file mode 100644 index 000000000..57ef03f24 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-no-fragment-valid/mimetype @@ -0,0 +1 @@ +application/epub+zip \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..3f140bbc4f2bba4396e38c140245d027a5aa5681 GIT binary patch literal 10363 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 LR + + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.svg b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.svg new file mode 100644 index 000000000..cb4d2de6e --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/content_001.svg @@ -0,0 +1,6 @@ + + + SVG Content Document + Rectangle + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/nav.xhtml new file mode 100644 index 000000000..b75e4403d --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/nav.xhtml @@ -0,0 +1,14 @@ + + + + + Minimal Nav + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/package.opf new file mode 100644 index 000000000..454ecc580 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/EPUB/package.opf @@ -0,0 +1,20 @@ + + + + Minimal EPUB 3.0 + en + NOID + 2017-06-14T00:00:01Z + 2.5s + 2.5s + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/META-INF/container.xml new file mode 100644 index 000000000..318782179 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/META-INF/container.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/mimetype new file mode 100644 index 000000000..57ef03f24 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-invalid-warning/mimetype @@ -0,0 +1 @@ +application/epub+zip \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.mp3 b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..3f140bbc4f2bba4396e38c140245d027a5aa5681 GIT binary patch literal 10363 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 LR + + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.svg b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.svg new file mode 100644 index 000000000..cb4d2de6e --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/content_001.svg @@ -0,0 +1,6 @@ + + + SVG Content Document + Rectangle + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/nav.xhtml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/nav.xhtml new file mode 100644 index 000000000..b75e4403d --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/nav.xhtml @@ -0,0 +1,14 @@ + + + + + Minimal Nav + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/package.opf b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/package.opf new file mode 100644 index 000000000..454ecc580 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/EPUB/package.opf @@ -0,0 +1,20 @@ + + + + Minimal EPUB 3.0 + en + NOID + 2017-06-14T00:00:01Z + 2.5s + 2.5s + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/META-INF/container.xml b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/META-INF/container.xml new file mode 100644 index 000000000..318782179 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/META-INF/container.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/mimetype b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/mimetype new file mode 100644 index 000000000..57ef03f24 --- /dev/null +++ b/src/test/resources/epub3/09-media-overlays/files/mediaoverlays-textref-svg-fragment-viewbox-valid/mimetype @@ -0,0 +1 @@ +application/epub+zip \ No newline at end of file diff --git a/src/test/resources/epub3/09-media-overlays/media-overlays.feature b/src/test/resources/epub3/09-media-overlays/media-overlays.feature index 027a47b6a..5a84c3934 100644 --- a/src/test/resources/epub3/09-media-overlays/media-overlays.feature +++ b/src/test/resources/epub3/09-media-overlays/media-overlays.feature @@ -69,12 +69,6 @@ Feature: EPUB 3 — Media Overlays | RSC-005 | element "audio" not allowed here | And no other errors or warnings are reported - @spec @xref:sec-smil-seq-elem - Scenario: Report a fragment identifier that does not resolve to an element - When checking EPUB 'mediaoverlays-fragid-resolve-error' - Then error RSC-012 is reported - And no other errors or warnings are reported - #### 9.2.2.6 The `par` element @@ -94,12 +88,6 @@ Feature: EPUB 3 — Media Overlays #### 9.2.2.7 The `text` element - - @spec @xref:sec-smil-text-elem @xref:sec-smil-body-elem - Scenario: Report empty fragment identifiers - When checking EPUB 'mediaoverlays-fragid-invalid-error' - Then error MED-014 is reported 2 times - And no other errors or warnings are reported #### 9.2.2.8 The `audio` element @@ -153,7 +141,36 @@ Feature: EPUB 3 — Media Overlays When checking EPUB 'mediaoverlays-text-reading-order-error' Then usage MED-015 is reported And no other errors or warnings are reported + + ### 9.3.2.2 Referencing document fragments + + @spec @xref:sec-media-overlays-fragids + Scenario: Allow empty fragment identifiers + When checking EPUB 'mediaoverlays-textref-no-fragment-valid' + Then no errors or warnings are reported + @spec @xref:sec-media-overlays-fragids + Scenario: Report a fragment identifier that does not resolve to an element + When checking EPUB 'mediaoverlays-textref-fragment-unresolved-error' + Then error RSC-012 is reported + And no other errors or warnings are reported + + @spec @xref:sec-media-overlays-fragids + Scenario: Warn about XHTML scheme-based fragments + When checking EPUB 'mediaoverlays-textref-fragment-schemebased-warning' + Then warning MED-017 is reported + And no other errors or warnings are reported + + @spec @xref:sec-media-overlays-fragids + Scenario: Allow SVG fragment identifiers + When checking EPUB 'mediaoverlays-textref-svg-fragment-viewbox-valid' + Then no errors or warnings are reported + + @spec @xref:sec-media-overlays-fragids + Scenario: Warn about invalid SVG fragment identifiers + When checking EPUB 'mediaoverlays-textref-svg-fragment-invalid-warning' + Then warning MED-018 is reported + And no other errors or warnings are reported ### 9.3.3 Structural semantics