Fix RWP conforming to EPUB (#642)

Author: ddfreiling

CHANGELOG.md

@@ -30,6 +30,10 @@ All notable changes to this project will be documented in this file. Take a look
 
 * [go-toolkit#92](https://github.com/readium/go-toolkit/issues/92) The accessibility feature `printPageNumbers` is deprecated in favor of `pageNavigation`.
 
+### Fixed
+
+* Fixed support of Readium Web Publication packages conforming to the EPUB profile (contributed by [@ddfreiling](https://github.com/readium/kotlin-toolkit/pull/642)).
+
 
 ## [3.0.3]
 

readium/navigator/src/main/java/org/readium/r2/navigator/epub/HtmlInjector.kt

@@ -42,7 +42,11 @@ internal fun Resource.injectHtml(
         var content = bytes.toString(mediaType.charset ?: Charsets.UTF_8).trim()
         val injectables = mutableListOf<String>()
 
-        if (publication.metadata.presentation.layout == EpubLayout.REFLOWABLE) {
+        if (publication.metadata.presentation.layout == EpubLayout.FIXED) {
+            injectables.add(
+                script(baseHref.resolve(Url("readium/scripts/readium-fixed.js")!!))
+            )
+        } else {
             content = try {
                 css.injectHtml(content)
             } catch (e: Exception) {
@@ -54,10 +58,6 @@ internal fun Resource.injectHtml(
                     baseHref.resolve(Url("readium/scripts/readium-reflowable.js")!!)
                 )
             )
-        } else {
-            injectables.add(
-                script(baseHref.resolve(Url("readium/scripts/readium-fixed.js")!!))
-            )
         }
 
         // Disable the text selection if the publication is protected.

readium/streamer/src/main/java/org/readium/r2/streamer/parser/readium/ReadiumWebPubParser.kt

@@ -42,15 +42,21 @@ import org.readium.r2.shared.util.resource.Resource
 import org.readium.r2.shared.util.resource.SingleResourceContainer
 import org.readium.r2.streamer.parser.PublicationParser
 import org.readium.r2.streamer.parser.audio.AudioLocatorService
+import org.readium.r2.streamer.parser.epub.EpubPositionsService
 import timber.log.Timber
 
 /**
  * Parses any Readium Web Publication package or manifest, e.g. WebPub, Audiobook, DiViNa, LCPDF...
+ *
+ * @param epubReflowablePositionsStrategy Strategy used to calculate the number
+ * of positions in a reflowable resource of a web publication conforming to the
+ * EPUB profile.
  */
 public class ReadiumWebPubParser(
     private val context: Context? = null,
     private val httpClient: HttpClient,
     private val pdfFactory: PdfDocumentFactory<*>?,
+    private val epubReflowablePositionsStrategy: EpubPositionsService.ReflowableStrategy = EpubPositionsService.ReflowableStrategy.recommended,
 ) : PublicationParser {
 
     override suspend fun parse(
@@ -97,6 +103,8 @@ public class ReadiumWebPubParser(
                     pdfFactory?.let { LcpdfPositionsService.create(it) }
                 manifest.conformsTo(Publication.Profile.DIVINA) ->
                     PerResourcePositionsService.createFactory(MediaType("image/*")!!)
+                manifest.conformsTo(Publication.Profile.EPUB) ->
+                    EpubPositionsService.createFactory(epubReflowablePositionsStrategy)
                 else ->
                     WebPositionsService.createFactory(httpClient)
             }