feat: add new Core Media Types (ECMAScript, OPUS, WebP)

rdeltour · rdeltour · commit 166256ad8bde · 2021-11-14T14:08:40.000+01:00
Added the following Core Media Types: - "audio/opus" - "image/webp" - "application/ecmascript" Also added some missing tests for some older core media types. Fix #1249, Fix #1189
diff --git a/src/main/java/com/adobe/epubcheck/opf/OPFChecker.java b/src/main/java/com/adobe/epubcheck/opf/OPFChecker.java
@@ -306,10 +306,10 @@ public static boolean isDeprecatedBlessedStyleType(String type)
     return type.equals("text/x-oeb1-css");
   }
 
-  public static boolean isBlessedImageType(String type)
+  public static boolean isBlessedImageType(String type, EPUBVersion version)
   {
     return type.equals("image/gif") || type.equals("image/png") || type.equals("image/jpeg")
-        || type.equals("image/svg+xml");
+        || type.equals("image/svg+xml") || version == EPUBVersion.VERSION_3 && type.equals("image/webp");
   }
 
   public static boolean isBlessedFontMimetype20(String mime)
@@ -447,7 +447,7 @@ protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)
     // [GC 11/15/09]
     String mimeType = item.getMimeType();
     if (isBlessedStyleType(mimeType) || isDeprecatedBlessedStyleType(mimeType)
-        || isBlessedImageType(mimeType))
+        || isBlessedImageType(mimeType, version))
     {
       report.message(MessageId.OPF_042,
           EPUBLocation.create(path, item.getLineNumber(), item.getColumnNumber()), mimeType);
@@ -542,7 +542,7 @@ boolean checkImageFallbacks(OPFItem item, OPFHandler opfHandler)
         if (fallbackItem.isPresent())
         {
           String mimeType = fallbackItem.get().getMimeType();
-          if (isBlessedImageType(mimeType))
+          if (isBlessedImageType(mimeType, opfHandler.context.version))
           {
             return true;
           }
diff --git a/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java b/src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
@@ -516,7 +516,7 @@ public static boolean isAudioType(String type)
 
   public static boolean isBlessedAudioType(String type)
   {
-    return type.equals("audio/mpeg") || type.equals("audio/mp4");
+    return type.equals("audio/mpeg") || type.equals("audio/mp4") || type.equals("audio/opus");
   }
   
   public static boolean isVideoType(String type)
@@ -555,13 +555,13 @@ public static boolean isBlessedFontType(String type)
   }
   
   public static boolean isBlessedScriptType(String type) {
-    return type.equals("text/javascript") || type.equals("application/javascript");
+    return type.equals("text/javascript") || type.equals("application/javascript") || type.equals("application/ecmascript");
   }
 
   public static boolean isCoreMediaType(String type)
   {
     return isBlessedAudioType(type) || isBlessedVideoType(type) || isBlessedFontType(type)
-        || isBlessedItemType(type, EPUBVersion.VERSION_3) || isBlessedImageType(type)
+        || isBlessedItemType(type, EPUBVersion.VERSION_3) || isBlessedImageType(type, EPUBVersion.VERSION_3)
         || isBlessedScriptType(type)
         || type.equals("application/pls+xml") || type.equals("application/smil+xml")
         || type.equals("image/svg+xml");
@@ -579,6 +579,7 @@ public static String getPreferredMediaType(String type, String path)
     case "application/font-woff":
       return "font/woff";
     case "text/javascript":
+    case "application/ecmascript":
       return "application/javascript";
     default:
       return null;
diff --git a/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java b/src/main/java/com/adobe/epubcheck/opf/XRefChecker.java
@@ -401,7 +401,7 @@ else if (!undeclared.contains(ref.refResource)
         return;
       }
       // if mimeType is null, we should have reported an error already
-      if (!OPFChecker.isBlessedImageType(res.item.getMimeType()))
+      if (!OPFChecker.isBlessedImageType(res.item.getMimeType(), version))
       {
         if (version == EPUBVersion.VERSION_3 && ref.type == Type.PICTURE_SOURCE) {
           report.message(MessageId.MED_007,
diff --git a/src/main/java/com/adobe/epubcheck/ops/OPSHandler30.java b/src/main/java/com/adobe/epubcheck/ops/OPSHandler30.java
@@ -17,6 +17,7 @@
 import com.adobe.epubcheck.opf.OPFChecker30;
 import com.adobe.epubcheck.opf.ValidationContext;
 import com.adobe.epubcheck.opf.XRefChecker;
+import com.adobe.epubcheck.util.EPUBVersion;
 import com.adobe.epubcheck.util.EpubConstants;
 import com.adobe.epubcheck.util.FeatureEnum;
 import com.adobe.epubcheck.util.PathUtil;
@@ -157,7 +158,7 @@ else if (xrefChecker.isPresent())
         String type = e.getAttribute("type");
         // if in a 'source' element specifying a foreign MIME type,
         // register as foreign picture source
-        if ("source".equals(e.getName()) && type != null && !OPFChecker.isBlessedImageType(type))
+        if ("source".equals(e.getName()) && type != null && !OPFChecker.isBlessedImageType(type, EPUBVersion.VERSION_3))
         {
           registerImageSources(src, srcset, XRefChecker.Type.PICTURE_SOURCE_FOREIGN);
         }
@@ -488,7 +489,7 @@ protected void processVideo(XMLElement e)
           posterSrc));
     }
 
-    if (posterMimeType != null && !OPFChecker.isBlessedImageType(posterMimeType))
+    if (posterMimeType != null && !OPFChecker.isBlessedImageType(posterMimeType, EPUBVersion.VERSION_3))
     {
       report.message(MessageId.MED_001,
           EPUBLocation.create(path, parser.getLineNumber(), parser.getColumnNumber()));
diff --git a/src/test/resources/epub3/content-publication.feature b/src/test/resources/epub3/content-publication.feature
@@ -198,6 +198,9 @@ Feature: EPUB 3 ▸ Content Documents ▸ Full Publication Checks
     Then error OPF-013 is reported
     And no other errors or warnings are reported
 
+  #####  script
+  
+  #//TODO verify script core media types
 
   #####  SVG
 
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/audio.foreign b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/audio.foreign
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/content_001.xhtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal EPUB</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<audio src="audio.foreign" />
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/nav.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/EPUB/package.opf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="https://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+<metadata xmlns:dc="https://purl.org/dc/elements/1.1/">
+  <dc:title id="title">Minimal EPUB 3.0</dc:title>
+  <dc:language>en</dc:language>
+  <dc:identifier id="q">NOID</dc:identifier>
+  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+</metadata>
+<manifest>
+  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+  <item id="audio" href="audio.foreign" media-type="audio/foreign"/>
+</manifest>
+<spine>
+  <itemref idref="content_001" />
+</spine>
+</package>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-audio-foreign-error/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/audio.mp3 b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/audio.mp3
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/content_001.xhtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal EPUB</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<audio src="audio.mp3" />
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/nav.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/EPUB/package.opf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="https://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+<metadata xmlns:dc="https://purl.org/dc/elements/1.1/">
+  <dc:title id="title">Minimal EPUB 3.0</dc:title>
+  <dc:language>en</dc:language>
+  <dc:identifier id="q">NOID</dc:identifier>
+  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+</metadata>
+<manifest>
+  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+  <item id="audio" href="audio.mp3" media-type="audio/mpeg"/>
+</manifest>
+<spine>
+  <itemref idref="content_001" />
+</spine>
+</package>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp3-valid/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/audio.mp4 b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/audio.mp4
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/content_001.xhtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal EPUB</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<audio src="audio.mp4" />
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/nav.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/EPUB/package.opf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="https://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+<metadata xmlns:dc="https://purl.org/dc/elements/1.1/">
+  <dc:title id="title">Minimal EPUB 3.0</dc:title>
+  <dc:language>en</dc:language>
+  <dc:identifier id="q">NOID</dc:identifier>
+  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+</metadata>
+<manifest>
+  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+  <item id="audio" href="audio.mp4" media-type="audio/mp4"/>
+</manifest>
+<spine>
+  <itemref idref="content_001" />
+</spine>
+</package>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-audio-mp4-valid/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/audio.opus b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/audio.opus
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/content_001.xhtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal EPUB</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<audio src="audio.opus" />
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/nav.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/EPUB/package.opf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="https://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+<metadata xmlns:dc="https://purl.org/dc/elements/1.1/">
+  <dc:title id="title">Minimal EPUB 3.0</dc:title>
+  <dc:language>en</dc:language>
+  <dc:identifier id="q">NOID</dc:identifier>
+  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+</metadata>
+<manifest>
+  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+  <item id="audio" href="audio.opus" media-type="audio/opus"/>
+</manifest>
+<spine>
+  <itemref idref="content_001" />
+</spine>
+</package>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-audio-opus-valid/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/content_001.xhtml
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal EPUB</title>
+	</head>
+	<body>
+		<h1>Loomings</h1>
+		<p>Call me Ishmael.</p>
+		<img src="image.gif" alt="" />
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/image.gif b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/image.gif
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/nav.xhtml
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns="https://www.w3.org/1999/xhtml" xmlns:epub="https://www.idpf.org/2007/ops" xml:lang="en" lang="en">
+	<head>
+		<meta charset="utf-8"/>
+		<title>Minimal Nav</title>
+	</head>
+	<body>
+		<nav epub:type="toc">
+			<ol>
+				<li><a href="content_001.xhtml">content 001</a></li>
+			</ol>
+		</nav>
+	</body>
+</html>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/EPUB/package.opf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="https://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
+<metadata xmlns:dc="https://purl.org/dc/elements/1.1/">
+  <dc:title id="title">Minimal EPUB 3.0</dc:title>
+  <dc:language>en</dc:language>
+  <dc:identifier id="q">NOID</dc:identifier>
+  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
+</metadata>
+<manifest>
+  <item id="content_001" href="content_001.xhtml" media-type="application/xhtml+xml"/>
+  <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
+  <item id="img" href="image.gif" media-type="image/gif"/>
+</manifest>
+<spine>
+  <itemref idref="content_001"/>
+</spine>
+</package>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/META-INF/container.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
+   <rootfiles>
+      <rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
+   </rootfiles>
+</container>
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-image-gif-valid/mimetype
@@ -0,0 +1 @@
+application/epub+zip
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/content_001.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/content_001.xhtml
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/image.webp b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/image.webp
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/nav.xhtml b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/nav.xhtml
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/package.opf b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/EPUB/package.opf
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/META-INF/container.xml b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/META-INF/container.xml
diff --git a/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/mimetype b/src/test/resources/epub3/files/epub/resources-cmt-image-webp-valid/mimetype
diff --git a/src/test/resources/epub3/files/package-document/resources-core-media-types-not-preferred-valid.opf b/src/test/resources/epub3/files/package-document/resources-core-media-types-not-preferred-valid.opf
diff --git a/src/test/resources/epub3/files/package-document/resources-core-media-types-valid.opf b/src/test/resources/epub3/files/package-document/resources-core-media-types-valid.opf
diff --git a/src/test/resources/epub3/resources-package-document.feature b/src/test/resources/epub3/resources-package-document.feature
diff --git a/src/test/resources/epub3/resources-publication.feature b/src/test/resources/epub3/resources-publication.feature

Original file line number	Diff line number	Diff line change
`@@ -306,10 +306,10 @@ public static boolean isDeprecatedBlessedStyleType(String type)`
`306`	`306`	`return type.equals("text/x-oeb1-css");`
`307`	`307`	`}`
`308`	`308`
`309`		`- public static boolean isBlessedImageType(String type)`
	`309`	`+ public static boolean isBlessedImageType(String type, EPUBVersion version)`
`310`	`310`	`{`
`311`	`311`	`return type.equals("image/gif") \|\| type.equals("image/png") \|\| type.equals("image/jpeg")`
`312`		`- \|\| type.equals("image/svg+xml");`
	`312`	`+ \|\| type.equals("image/svg+xml") \|\| version == EPUBVersion.VERSION_3 && type.equals("image/webp");`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`public static boolean isBlessedFontMimetype20(String mime)`
`@@ -447,7 +447,7 @@ protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)`
`447`	`447`	`// [GC 11/15/09]`
`448`	`448`	`String mimeType = item.getMimeType();`
`449`	`449`	`if (isBlessedStyleType(mimeType) \|\| isDeprecatedBlessedStyleType(mimeType)`
`450`		`- \|\| isBlessedImageType(mimeType))`
	`450`	`+ \|\| isBlessedImageType(mimeType, version))`
`451`	`451`	`{`
`452`	`452`	`report.message(MessageId.OPF_042,`
`453`	`453`	`EPUBLocation.create(path, item.getLineNumber(), item.getColumnNumber()), mimeType);`
`@@ -542,7 +542,7 @@ boolean checkImageFallbacks(OPFItem item, OPFHandler opfHandler)`
`542`	`542`	`if (fallbackItem.isPresent())`
`543`	`543`	`{`
`544`	`544`	`String mimeType = fallbackItem.get().getMimeType();`
`545`		`- if (isBlessedImageType(mimeType))`
	`545`	`+ if (isBlessedImageType(mimeType, opfHandler.context.version))`
`546`	`546`	`{`
`547`	`547`	`return true;`
`548`	`548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ public static boolean isAudioType(String type)`
`516`	`516`
`517`	`517`	`public static boolean isBlessedAudioType(String type)`
`518`	`518`	`{`
`519`		`- return type.equals("audio/mpeg") \|\| type.equals("audio/mp4");`
	`519`	`+ return type.equals("audio/mpeg") \|\| type.equals("audio/mp4") \|\| type.equals("audio/opus");`
`520`	`520`	`}`
`521`	`521`
`522`	`522`	`public static boolean isVideoType(String type)`
`@@ -555,13 +555,13 @@ public static boolean isBlessedFontType(String type)`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`public static boolean isBlessedScriptType(String type) {`
`558`		`- return type.equals("text/javascript") \|\| type.equals("application/javascript");`
	`558`	`+ return type.equals("text/javascript") \|\| type.equals("application/javascript") \|\| type.equals("application/ecmascript");`
`559`	`559`	`}`
`560`	`560`
`561`	`561`	`public static boolean isCoreMediaType(String type)`
`562`	`562`	`{`
`563`	`563`	`return isBlessedAudioType(type) \|\| isBlessedVideoType(type) \|\| isBlessedFontType(type)`
`564`		`- \|\| isBlessedItemType(type, EPUBVersion.VERSION_3) \|\| isBlessedImageType(type)`
	`564`	`+ \|\| isBlessedItemType(type, EPUBVersion.VERSION_3) \|\| isBlessedImageType(type, EPUBVersion.VERSION_3)`
`565`	`565`	`\|\| isBlessedScriptType(type)`
`566`	`566`	`\|\| type.equals("application/pls+xml") \|\| type.equals("application/smil+xml")`
`567`	`567`	`\|\| type.equals("image/svg+xml");`
`@@ -579,6 +579,7 @@ public static String getPreferredMediaType(String type, String path)`
`579`	`579`	`case "application/font-woff":`
`580`	`580`	`return "font/woff";`
`581`	`581`	`case "text/javascript":`
	`582`	`+ case "application/ecmascript":`
`582`	`583`	`return "application/javascript";`
`583`	`584`	`default:`
`584`	`585`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ else if (!undeclared.contains(ref.refResource)`
`401`	`401`	`return;`
`402`	`402`	`}`
`403`	`403`	`// if mimeType is null, we should have reported an error already`
`404`		`- if (!OPFChecker.isBlessedImageType(res.item.getMimeType()))`
	`404`	`+ if (!OPFChecker.isBlessedImageType(res.item.getMimeType(), version))`
`405`	`405`	`{`
`406`	`406`	`if (version == EPUBVersion.VERSION_3 && ref.type == Type.PICTURE_SOURCE) {`
`407`	`407`	`report.message(MessageId.MED_007,`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`import com.adobe.epubcheck.opf.OPFChecker30;`
`18`	`18`	`import com.adobe.epubcheck.opf.ValidationContext;`
`19`	`19`	`import com.adobe.epubcheck.opf.XRefChecker;`
	`20`	`+import com.adobe.epubcheck.util.EPUBVersion;`
`20`	`21`	`import com.adobe.epubcheck.util.EpubConstants;`
`21`	`22`	`import com.adobe.epubcheck.util.FeatureEnum;`
`22`	`23`	`import com.adobe.epubcheck.util.PathUtil;`
`@@ -157,7 +158,7 @@ else if (xrefChecker.isPresent())`
`157`	`158`	`String type = e.getAttribute("type");`
`158`	`159`	`// if in a 'source' element specifying a foreign MIME type,`
`159`	`160`	`// register as foreign picture source`
`160`		`- if ("source".equals(e.getName()) && type != null && !OPFChecker.isBlessedImageType(type))`
	`161`	`+ if ("source".equals(e.getName()) && type != null && !OPFChecker.isBlessedImageType(type, EPUBVersion.VERSION_3))`
`161`	`162`	`{`
`162`	`163`	`registerImageSources(src, srcset, XRefChecker.Type.PICTURE_SOURCE_FOREIGN);`
`163`	`164`	`}`
`@@ -488,7 +489,7 @@ protected void processVideo(XMLElement e)`
`488`	`489`	`posterSrc));`
`489`	`490`	`}`
`490`	`491`
`491`		`- if (posterMimeType != null && !OPFChecker.isBlessedImageType(posterMimeType))`
	`492`	`+ if (posterMimeType != null && !OPFChecker.isBlessedImageType(posterMimeType, EPUBVersion.VERSION_3))`
`492`	`493`	`{`
`493`	`494`	`report.message(MessageId.MED_001,`
`494`	`495`	`EPUBLocation.create(path, parser.getLineNumber(), parser.getColumnNumber()));`