w3c
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/main/java/com/adobe/epubcheck/messages/MessageId.java
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
Copy file name to clipboard
+24-3Lines changed: 24 additions & 3 deletions b/‎src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java
Copy file name to clipboard
+24-3Lines changed: 24 additions & 3 deletions
diff --git a/‎src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎src/main/resources/com/adobe/epubcheck/messages/MessageBundle.properties
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/test/resources/epub-edupub/edupub-publication.feature
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/test/resources/epub-edupub/edupub-publication.feature
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/test/resources/epub-edupub/files/epub/edupub-non-linear-valid/EPUB/nav.xhtml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/test/resources/epub-edupub/files/epub/edupub-non-linear-valid/EPUB/nav.xhtml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/test/resources/epub-edupub/files/epub/edupub-non-linear-valid/EPUB/package.opf
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/test/resources/epub-edupub/files/epub/edupub-non-linear-valid/EPUB/package.opf
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/test/resources/epub-region-nav/files/epub/data-nav-in-spine-warning/EPUB/nav.xhtml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/test/resources/epub-region-nav/files/epub/data-nav-in-spine-warning/EPUB/nav.xhtml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/test/resources/epub3/05-package-document/files/spine-empty-error.opf
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions b/‎src/test/resources/epub3/05-package-document/files/spine-empty-error.opf
Copy file name to clipboard
+16Lines changed: 16 additions & 0 deletions
diff --git a/‎src/test/resources/epub3/05-package-document/files/package-spine-missing-error/EPUB/package.opf renamed to ‎src/test/resources/epub3/05-package-document/files/spine-missing-error.opf
Copy file name to clipboard b/‎src/test/resources/epub3/05-package-document/files/package-spine-missing-error/EPUB/package.opf renamed to ‎src/test/resources/epub3/05-package-document/files/spine-missing-error.opf
Copy file name to clipboard
@@ -289,6 +289,8 @@ private void initialize()
     severities.put(MessageId.OPF_093, Severity.ERROR);
     severities.put(MessageId.OPF_094, Severity.ERROR);
     severities.put(MessageId.OPF_095, Severity.ERROR);
+    severities.put(MessageId.OPF_096, Severity.ERROR);
+    severities.put(MessageId.OPF_096b, Severity.USAGE);
 
     // PKG
     severities.put(MessageId.PKG_001, Severity.WARNING);
 
@@ -283,6 +283,8 @@ public enum MessageId implements Comparable<MessageId>
   OPF_093("OPF-093"),
   OPF_094("OPF-094"),
   OPF_095("OPF-095"),
+  OPF_096("OPF-096"),
+  OPF_096b("OPF-096b"),
 
   // Messages relating to the entire package
   PKG_001("PKG-001"),
 
@@ -24,6 +24,7 @@
 
 import java.util.Set;
 
+import org.w3c.epubcheck.core.references.Reference;
 import org.w3c.epubcheck.util.url.URLFragment;
 
 import com.adobe.epubcheck.api.EPUBLocation;
@@ -183,6 +184,26 @@ else if (!overlayTextChecker.isCorrectOverlay(docURL, mo))
         }
       }
     }
+
+    // check that non-linear content documents are reachable
+    if (item.isInSpine() && !item.isLinear() && context.referenceRegistry.isPresent()
+    // search the reference registry for any hyperlink pointing to this item
+        && !context.referenceRegistry.get().asList().stream()
+            .anyMatch(ref -> ref.type == Reference.Type.HYPERLINK
+                && ref.targetResource.equals(item.getURL())))
+    {
+      // if content is scripted, references can be added by scripting
+      // se we only report a usage
+      if (context.featureReport.hasFeature(FeatureEnum.HAS_SCRIPTS))
+      {
+        report.message(MessageId.OPF_096b, item.getLocation(), item.getPath());
+      }
+      // else, report an error if no hyperlink were found
+      else
+      {
+        report.message(MessageId.OPF_096, item.getLocation(), item.getPath());
+      }
+    }
   }
 
   @Override
@@ -194,14 +215,15 @@ protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)
       return;
     }
 
-    String mimeType = item.getMimeType();
-
+    // check properties
     if (item.getProperties()
         .contains(PackageVocabs.ITEM_VOCAB.get(PackageVocabs.ITEM_PROPERTIES.DATA_NAV)))
     {
       report.message(MessageId.OPF_077, item.getLocation());
     }
 
+    // check that spine items have content document fallback
+    String mimeType = item.getMimeType();
     if (!isBlessedItemType(mimeType, version))
     {
       if (!item.hasFallback())
@@ -213,7 +235,6 @@ else if (!item.hasContentDocumentFallback())
         report.message(MessageId.OPF_044, item.getLocation(), mimeType);
       }
     }
-
   }
 
   private void checkCollections()
 
@@ -210,7 +210,9 @@ OPF_091=The item href URL must not have a fragment identifier.
 OPF_092=Language tag "%1$s" is not well-formed: %2$s
 OPF_093=The "media-type" attribute is required for linked resources located in the EPUB container
 OPF_094=The "media-type" attribute is required for "%1$s" links.
-OPF_095=The "media-type" attribute of "voicing" links must be an audio MIME type, but found "%1$s". 
+OPF_095=The "media-type" attribute of "voicing" links must be an audio MIME type, but found "%1$s".
+OPF_096=Non-linear content must be reachable, but found no hyperlink to "%1$s".
+OPF_096b=No hyperlink was found to non-linear document "%1$s", please check that it can be reached from scripted content.  
 
 #Package
 PKG_001=Validating the EPUB against version %1$s but detected version %2$s.
 
@@ -51,7 +51,7 @@ Feature: EPUB for Education ▸ Full Publication Checks
 
   ##  4.2 Sectioning
 
-  Scenario: Verify an non-linear content does not have to follow the sectioning rules
+  Scenario: Verify that non-linear content does not have to follow the sectioning rules
     When checking EPUB 'edupub-non-linear-valid'
     Then no errors or warnings are reported
 
 
@@ -8,6 +8,7 @@
 		<nav epub:type="toc">
 			<ol>
 				<li><a href="content_001.xhtml">content 001</a></li>
+				<li><a href="nonlinear.xhtml">non-linear</a></li>
 			</ol>
 		</nav>
 	</body>
 
@@ -11,10 +11,10 @@
 <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="non" href="nonlinear.xhtml" media-type="application/xhtml+xml" />
+  <item id="nonlinear" href="nonlinear.xhtml" media-type="application/xhtml+xml" />
 </manifest>
 <spine>
   <itemref idref="content_001" />
-  <itemref idref="non" linear="no" />
+  <itemref idref="nonlinear" linear="no" />
 </spine>
 </package>
@@ -8,6 +8,7 @@
 		<nav epub:type="toc">
 			<ol>
 				<li><a href="content_001.xhtml">content 001</a></li>
+				<li><a href="data-nav.xhtml">data nav</a></li>
 			</ol>
 		</nav>
 	</body>
 
@@ -0,0 +1,16 @@
+<?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"/>
+</manifest>
+<spine>
+<!--  <itemref idref="content_001" />-->
+</spine>
+</package>
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`import java.util.Set;`
`26`	`26`
	`27`	`+import org.w3c.epubcheck.core.references.Reference;`
`27`	`28`	`import org.w3c.epubcheck.util.url.URLFragment;`
`28`	`29`
`29`	`30`	`import com.adobe.epubcheck.api.EPUBLocation;`
`@@ -183,6 +184,26 @@ else if (!overlayTextChecker.isCorrectOverlay(docURL, mo))`
`183`	`184`	`}`
`184`	`185`	`}`
`185`	`186`	`}`
	`187`	`+`
	`188`	`+ // check that non-linear content documents are reachable`
	`189`	`+ if (item.isInSpine() && !item.isLinear() && context.referenceRegistry.isPresent()`
	`190`	`+ // search the reference registry for any hyperlink pointing to this item`
	`191`	`+ && !context.referenceRegistry.get().asList().stream()`
	`192`	`+ .anyMatch(ref -> ref.type == Reference.Type.HYPERLINK`
	`193`	`+ && ref.targetResource.equals(item.getURL())))`
	`194`	`+ {`
	`195`	`+ // if content is scripted, references can be added by scripting`
	`196`	`+ // se we only report a usage`
	`197`	`+ if (context.featureReport.hasFeature(FeatureEnum.HAS_SCRIPTS))`
	`198`	`+ {`
	`199`	`+ report.message(MessageId.OPF_096b, item.getLocation(), item.getPath());`
	`200`	`+ }`
	`201`	`+ // else, report an error if no hyperlink were found`
	`202`	`+ else`
	`203`	`+ {`
	`204`	`+ report.message(MessageId.OPF_096, item.getLocation(), item.getPath());`
	`205`	`+ }`
	`206`	`+ }`
`186`	`207`	`}`
`187`	`208`
`188`	`209`	`@Override`
`@@ -194,14 +215,15 @@ protected void checkSpineItem(OPFItem item, OPFHandler opfHandler)`
`194`	`215`	`return;`
`195`	`216`	`}`
`196`	`217`
`197`		`- String mimeType = item.getMimeType();`
`198`		`-`
	`218`	`+ // check properties`
`199`	`219`	`if (item.getProperties()`
`200`	`220`	`.contains(PackageVocabs.ITEM_VOCAB.get(PackageVocabs.ITEM_PROPERTIES.DATA_NAV)))`
`201`	`221`	`{`
`202`	`222`	`report.message(MessageId.OPF_077, item.getLocation());`
`203`	`223`	`}`
`204`	`224`
	`225`	`+ // check that spine items have content document fallback`
	`226`	`+ String mimeType = item.getMimeType();`
`205`	`227`	`if (!isBlessedItemType(mimeType, version))`
`206`	`228`	`{`
`207`	`229`	`if (!item.hasFallback())`
`@@ -213,7 +235,6 @@ else if (!item.hasContentDocumentFallback())`
`213`	`235`	`report.message(MessageId.OPF_044, item.getLocation(), mimeType);`
`214`	`236`	`}`
`215`	`237`	`}`
`216`		`-`
`217`	`238`	`}`
`218`	`239`
`219`	`240`	`private void checkCollections()`