feat: add new MO-only aside epub:type value

The new `aside` value was added as a result of w3c/epub-specs#1226
w3c · Feb 25, 2019 · 4404fff · 4404fff
1 parent ed6f1c4
commit 4404fff
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/com/adobe/epubcheck/vocab/StructureVocab.java b/src/main/java/com/adobe/epubcheck/vocab/StructureVocab.java
@@ -18,6 +18,7 @@ public static enum EPUB_TYPES implements PropertyStatus
  ANNOREF(DEPRECATED),
  ANNOTATION(DEPRECATED),
  APPENDIX,
+ ASIDE(DISALLOWED_ON_CONTENT_DOCS),
  ASSESSMENT,
  BACKMATTER,
  BIBLIOENTRY,

diff --git a/src/test/java/com/adobe/epubcheck/ops/OPSCheckerTest.java b/src/test/java/com/adobe/epubcheck/ops/OPSCheckerTest.java
@@ -488,7 +488,7 @@ public void testEPUBTypeDeprecated()
  @Test
  public void testEPUBTypeDisallowed()
  {
- expectedErrors.addAll(Collections.nCopies(6, MessageId.OPF_087));
+ expectedErrors.addAll(Collections.nCopies(7, MessageId.OPF_087));
  testValidateDocument("xhtml/invalid/epubtype-disallowed.xhtml", "application/xhtml+xml",
  EPUBVersion.VERSION_3);
  }

diff --git a/src/test/java/com/adobe/epubcheck/overlay/OverlayCheckerTest.java b/src/test/java/com/adobe/epubcheck/overlay/OverlayCheckerTest.java
@@ -179,4 +179,10 @@ public void testValidateDocumentInvalidOverlay008_Issue568()
  Collections.addAll(expectedErrors, MessageId.RSC_005);
  testValidateDocument("invalid/overlay-008.smil");
  }
+
+ @Test
+ public void testEPUBTypeAside()
+ {
+ testValidateDocument("valid/epubtype-aside.smil");
+ }
 }
diff --git a/src/test/resources/30/single/overlays/valid/epubtype-aside.smil b/src/test/resources/30/single/overlays/valid/epubtype-aside.smil
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<smil version="3.0" xmlns="http://www.w3.org/ns/SMIL" xmlns:epub="http://www.idpf.org/2007/ops">
+ <body epub:type="aside">
+ <par id="par1">
+ <text src="chapter1.xhtml#sentence1"/>
+ <audio src="chapter1_audio.mp3" clipBegin="0s" clipEnd="10s"/>
+ </par>
+ </body>
+</smil>
diff --git a/src/test/resources/30/single/xhtml/invalid/epubtype-disallowed.xhtml b/src/test/resources/30/single/xhtml/invalid/epubtype-disallowed.xhtml
@@ -17,5 +17,8 @@
  <li epub:type="list-item">item</li>
  </ul>
  <figure epub:type="figure"> Figure </figure>
+ <aside epub:type="aside">
+ <h2>Aside</h2>
+ </aside>
  </body>
 </html>