From 8b95adaf572bac3cc380b07e965725c4b769b3d1 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sun, 12 Mar 2023 10:21:05 +0800 Subject: [PATCH] =?UTF-8?q?rename=20epublib=20to=20book,=E5=BA=93=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=90=ABumd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- {epublib => book}/.gitignore | 0 {epublib => book}/build.gradle | 2 +- {epublib => book}/consumer-rules.pro | 0 {epublib => book}/proguard-rules.pro | 0 {epublib => book}/src/main/AndroidManifest.xml | 0 .../src/main/java/me/ag2s/base/PfdHelper.java | 0 .../src/main/java/me/ag2s/base/ThrowableUtils.java | 0 .../src/main/java/me/ag2s/epublib/Constants.java | 0 .../ag2s/epublib/browsersupport/NavigationEvent.java | 0 .../browsersupport/NavigationEventListener.java | 0 .../ag2s/epublib/browsersupport/NavigationHistory.java | 0 .../java/me/ag2s/epublib/browsersupport/Navigator.java | 0 .../me/ag2s/epublib/browsersupport/package-info.java | 0 .../src/main/java/me/ag2s/epublib/domain/Author.java | 3 +-- .../src/main/java/me/ag2s/epublib/domain/Date.java | 0 .../src/main/java/me/ag2s/epublib/domain/EpubBook.java | 0 .../me/ag2s/epublib/domain/EpubResourceProvider.java | 0 .../me/ag2s/epublib/domain/FileResourceProvider.java | 0 .../src/main/java/me/ag2s/epublib/domain/Guide.java | 0 .../java/me/ag2s/epublib/domain/GuideReference.java | 3 ++- .../main/java/me/ag2s/epublib/domain/Identifier.java | 3 ++- .../main/java/me/ag2s/epublib/domain/LazyResource.java | 3 ++- .../me/ag2s/epublib/domain/LazyResourceProvider.java | 0 .../me/ag2s/epublib/domain/ManifestItemProperties.java | 0 .../ag2s/epublib/domain/ManifestItemRefProperties.java | 0 .../me/ag2s/epublib/domain/ManifestProperties.java | 0 .../main/java/me/ag2s/epublib/domain/MediaType.java | 0 .../main/java/me/ag2s/epublib/domain/MediaTypes.java | 3 ++- .../src/main/java/me/ag2s/epublib/domain/Metadata.java | 4 ++-- .../src/main/java/me/ag2s/epublib/domain/Relator.java | 0 .../src/main/java/me/ag2s/epublib/domain/Resource.java | 9 +++++---- .../me/ag2s/epublib/domain/ResourceInputStream.java | 0 .../java/me/ag2s/epublib/domain/ResourceReference.java | 0 .../main/java/me/ag2s/epublib/domain/Resources.java | 7 ++++--- .../src/main/java/me/ag2s/epublib/domain/Spine.java | 3 ++- .../java/me/ag2s/epublib/domain/SpineReference.java | 0 .../main/java/me/ag2s/epublib/domain/TOCReference.java | 0 .../java/me/ag2s/epublib/domain/TableOfContents.java | 0 .../ag2s/epublib/domain/TitledResourceReference.java | 0 .../main/java/me/ag2s/epublib/epub/BookProcessor.java | 0 .../me/ag2s/epublib/epub/BookProcessorPipeline.java | 0 .../src/main/java/me/ag2s/epublib/epub/DOMUtil.java | 0 .../me/ag2s/epublib/epub/EpubProcessorSupport.java | 10 +++++----- .../src/main/java/me/ag2s/epublib/epub/EpubReader.java | 0 .../src/main/java/me/ag2s/epublib/epub/EpubWriter.java | 0 .../main/java/me/ag2s/epublib/epub/HtmlProcessor.java | 3 ++- .../main/java/me/ag2s/epublib/epub/NCXDocumentV2.java | 0 .../main/java/me/ag2s/epublib/epub/NCXDocumentV3.java | 0 .../java/me/ag2s/epublib/epub/PackageDocumentBase.java | 0 .../epublib/epub/PackageDocumentMetadataReader.java | 0 .../epublib/epub/PackageDocumentMetadataWriter.java | 0 .../me/ag2s/epublib/epub/PackageDocumentReader.java | 0 .../me/ag2s/epublib/epub/PackageDocumentWriter.java | 0 .../java/me/ag2s/epublib/epub/ResourcesLoader.java | 0 .../main/java/me/ag2s/epublib/util/CollectionUtil.java | 0 .../src/main/java/me/ag2s/epublib/util/IOUtil.java | 3 --- .../java/me/ag2s/epublib/util/NoCloseOutputStream.java | 0 .../main/java/me/ag2s/epublib/util/NoCloseWriter.java | 0 .../main/java/me/ag2s/epublib/util/ResourceUtil.java | 0 .../src/main/java/me/ag2s/epublib/util/StringUtil.java | 0 .../ag2s/epublib/util/commons/io/BOMInputStream.java | 3 +-- .../me/ag2s/epublib/util/commons/io/ByteOrderMark.java | 0 .../me/ag2s/epublib/util/commons/io/IOConsumer.java | 0 .../ag2s/epublib/util/commons/io/ProxyInputStream.java | 4 ++-- .../ag2s/epublib/util/commons/io/XmlStreamReader.java | 0 .../util/commons/io/XmlStreamReaderException.java | 0 .../java/me/ag2s/epublib/util/zip/AndroidZipEntry.java | 0 .../java/me/ag2s/epublib/util/zip/AndroidZipFile.java | 0 .../java/me/ag2s/epublib/util/zip/ZipConstants.java | 0 .../java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java | 0 .../java/me/ag2s/epublib/util/zip/ZipException.java | 0 .../java/me/ag2s/epublib/util/zip/ZipFileWrapper.java | 0 .../src/main/java/me/ag2s/umdlib/domain/UmdBook.java | 0 .../main/java/me/ag2s/umdlib/domain/UmdChapters.java | 0 .../src/main/java/me/ag2s/umdlib/domain/UmdCover.java | 0 .../src/main/java/me/ag2s/umdlib/domain/UmdEnd.java | 0 .../src/main/java/me/ag2s/umdlib/domain/UmdHeader.java | 0 .../main/java/me/ag2s/umdlib/tool/StreamReader.java | 0 .../src/main/java/me/ag2s/umdlib/tool/UmdUtils.java | 0 .../java/me/ag2s/umdlib/tool/WrapOutputStream.java | 0 .../src/main/java/me/ag2s/umdlib/umd/UmdReader.java | 1 - .../resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent | 0 .../dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd | 0 .../dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd | 0 .../resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-arch-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-attribs-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-base-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-bdo-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-charent-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-csismap-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod | 0 .../xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 | 0 .../TR/xhtml-modularization/DTD/xhtml-edit-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-events-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-form-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-framework-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-image-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-lat1.ent | 0 .../TR/xhtml-modularization/DTD/xhtml-link-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-list-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-meta-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-notations-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-object-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-param-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-pres-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-qname-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-script-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-special.ent | 0 .../TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-struct-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-style-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-symbol.ent | 0 .../TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 | 0 .../TR/xhtml-modularization/DTD/xhtml-table-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml-text-1.mod | 0 .../TR/xhtml-modularization/DTD/xhtml11-model-1.mod | 0 .../dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent | 0 .../dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent | 0 .../dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent | 0 .../dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd | 0 .../www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd | 0 .../dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd | 0 {epublib => book}/src/main/resources/log4j.properties | 0 settings.gradle | 2 +- 134 files changed, 35 insertions(+), 33 deletions(-) rename {epublib => book}/.gitignore (100%) rename {epublib => book}/build.gradle (96%) rename {epublib => book}/consumer-rules.pro (100%) rename {epublib => book}/proguard-rules.pro (100%) rename {epublib => book}/src/main/AndroidManifest.xml (100%) rename {epublib => book}/src/main/java/me/ag2s/base/PfdHelper.java (100%) rename {epublib => book}/src/main/java/me/ag2s/base/ThrowableUtils.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/Constants.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/browsersupport/NavigationEvent.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/browsersupport/NavigationEventListener.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/browsersupport/NavigationHistory.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/browsersupport/Navigator.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/browsersupport/package-info.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Author.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Date.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/EpubBook.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/EpubResourceProvider.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Guide.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/GuideReference.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Identifier.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/LazyResource.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/LazyResourceProvider.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/ManifestItemProperties.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/ManifestItemRefProperties.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/ManifestProperties.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/MediaType.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/MediaTypes.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Metadata.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Relator.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Resource.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/ResourceInputStream.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/ResourceReference.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Resources.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/Spine.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/SpineReference.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/TOCReference.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/TableOfContents.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/BookProcessor.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/BookProcessorPipeline.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/DOMUtil.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/EpubReader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/EpubWriter.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/NCXDocumentV2.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/NCXDocumentV3.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/PackageDocumentBase.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataReader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataWriter.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/PackageDocumentWriter.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/CollectionUtil.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/IOUtil.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/NoCloseOutputStream.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/NoCloseWriter.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/ResourceUtil.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/StringUtil.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java (99%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/ByteOrderMark.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/IOConsumer.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReaderException.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/AndroidZipEntry.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/AndroidZipFile.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/ZipConstants.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/ZipException.java (100%) rename {epublib => book}/src/main/java/me/ag2s/epublib/util/zip/ZipFileWrapper.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/domain/UmdBook.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/domain/UmdChapters.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/domain/UmdCover.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/domain/UmdEnd.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/domain/UmdHeader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/tool/StreamReader.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/tool/UmdUtils.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/tool/WrapOutputStream.java (100%) rename {epublib => book}/src/main/java/me/ag2s/umdlib/umd/UmdReader.java (99%) rename {epublib => book}/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent (100%) rename {epublib => book}/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd (100%) rename {epublib => book}/src/main/resources/dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml11-model-1.mod (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd (100%) rename {epublib => book}/src/main/resources/dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd (100%) rename {epublib => book}/src/main/resources/log4j.properties (100%) diff --git a/app/build.gradle b/app/build.gradle index 7e90d9ff5..8ab5ef776 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -197,7 +197,7 @@ dependencies { implementation('org.jsoup:jsoup:1.15.4') implementation('com.jayway.jsonpath:json-path:2.7.0') implementation('cn.wanghaomiao:JsoupXpath:2.5.3') - implementation(project(path: ':epublib')) + implementation implementation(project(path: ':book')) //JS rhino //implementation('com.github.gedoor:rhino-android:1.8') diff --git a/epublib/.gitignore b/book/.gitignore similarity index 100% rename from epublib/.gitignore rename to book/.gitignore diff --git a/epublib/build.gradle b/book/build.gradle similarity index 96% rename from epublib/build.gradle rename to book/build.gradle index ce85d1d53..0b075fdda 100644 --- a/epublib/build.gradle +++ b/book/build.gradle @@ -5,7 +5,7 @@ plugins { android { compileSdk = compile_sdk_version buildToolsVersion = build_tool_version - namespace 'me.ag2s.epublib' + namespace 'me.ag2s' defaultConfig { minSdk 21 targetSdk 33 diff --git a/epublib/consumer-rules.pro b/book/consumer-rules.pro similarity index 100% rename from epublib/consumer-rules.pro rename to book/consumer-rules.pro diff --git a/epublib/proguard-rules.pro b/book/proguard-rules.pro similarity index 100% rename from epublib/proguard-rules.pro rename to book/proguard-rules.pro diff --git a/epublib/src/main/AndroidManifest.xml b/book/src/main/AndroidManifest.xml similarity index 100% rename from epublib/src/main/AndroidManifest.xml rename to book/src/main/AndroidManifest.xml diff --git a/epublib/src/main/java/me/ag2s/base/PfdHelper.java b/book/src/main/java/me/ag2s/base/PfdHelper.java similarity index 100% rename from epublib/src/main/java/me/ag2s/base/PfdHelper.java rename to book/src/main/java/me/ag2s/base/PfdHelper.java diff --git a/epublib/src/main/java/me/ag2s/base/ThrowableUtils.java b/book/src/main/java/me/ag2s/base/ThrowableUtils.java similarity index 100% rename from epublib/src/main/java/me/ag2s/base/ThrowableUtils.java rename to book/src/main/java/me/ag2s/base/ThrowableUtils.java diff --git a/epublib/src/main/java/me/ag2s/epublib/Constants.java b/book/src/main/java/me/ag2s/epublib/Constants.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/Constants.java rename to book/src/main/java/me/ag2s/epublib/Constants.java diff --git a/epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationEvent.java b/book/src/main/java/me/ag2s/epublib/browsersupport/NavigationEvent.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationEvent.java rename to book/src/main/java/me/ag2s/epublib/browsersupport/NavigationEvent.java diff --git a/epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationEventListener.java b/book/src/main/java/me/ag2s/epublib/browsersupport/NavigationEventListener.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationEventListener.java rename to book/src/main/java/me/ag2s/epublib/browsersupport/NavigationEventListener.java diff --git a/epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationHistory.java b/book/src/main/java/me/ag2s/epublib/browsersupport/NavigationHistory.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/browsersupport/NavigationHistory.java rename to book/src/main/java/me/ag2s/epublib/browsersupport/NavigationHistory.java diff --git a/epublib/src/main/java/me/ag2s/epublib/browsersupport/Navigator.java b/book/src/main/java/me/ag2s/epublib/browsersupport/Navigator.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/browsersupport/Navigator.java rename to book/src/main/java/me/ag2s/epublib/browsersupport/Navigator.java diff --git a/epublib/src/main/java/me/ag2s/epublib/browsersupport/package-info.java b/book/src/main/java/me/ag2s/epublib/browsersupport/package-info.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/browsersupport/package-info.java rename to book/src/main/java/me/ag2s/epublib/browsersupport/package-info.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Author.java b/book/src/main/java/me/ag2s/epublib/domain/Author.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/Author.java rename to book/src/main/java/me/ag2s/epublib/domain/Author.java index a604a5d08..11ee8e78d 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Author.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Author.java @@ -1,11 +1,10 @@ package me.ag2s.epublib.domain; +import java.io.Serializable; import me.ag2s.epublib.util.StringUtil; -import java.io.Serializable; - /** * Represents one of the authors of the book * diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Date.java b/book/src/main/java/me/ag2s/epublib/domain/Date.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/Date.java rename to book/src/main/java/me/ag2s/epublib/domain/Date.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/EpubBook.java b/book/src/main/java/me/ag2s/epublib/domain/EpubBook.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/EpubBook.java rename to book/src/main/java/me/ag2s/epublib/domain/EpubBook.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/EpubResourceProvider.java b/book/src/main/java/me/ag2s/epublib/domain/EpubResourceProvider.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/EpubResourceProvider.java rename to book/src/main/java/me/ag2s/epublib/domain/EpubResourceProvider.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java b/book/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java rename to book/src/main/java/me/ag2s/epublib/domain/FileResourceProvider.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Guide.java b/book/src/main/java/me/ag2s/epublib/domain/Guide.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/Guide.java rename to book/src/main/java/me/ag2s/epublib/domain/Guide.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/GuideReference.java b/book/src/main/java/me/ag2s/epublib/domain/GuideReference.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/GuideReference.java rename to book/src/main/java/me/ag2s/epublib/domain/GuideReference.java index 89bd3ff12..770f4c003 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/GuideReference.java +++ b/book/src/main/java/me/ag2s/epublib/domain/GuideReference.java @@ -1,8 +1,9 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.util.StringUtil; import java.io.Serializable; +import me.ag2s.epublib.util.StringUtil; + /** * These are references to elements of the book's guide. diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Identifier.java b/book/src/main/java/me/ag2s/epublib/domain/Identifier.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/Identifier.java rename to book/src/main/java/me/ag2s/epublib/domain/Identifier.java index ccb46186f..341c1da73 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Identifier.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Identifier.java @@ -1,10 +1,11 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.util.StringUtil; import java.io.Serializable; import java.util.List; import java.util.UUID; +import me.ag2s.epublib.util.StringUtil; + /** * A Book's identifier. * diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/LazyResource.java b/book/src/main/java/me/ag2s/epublib/domain/LazyResource.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/LazyResource.java rename to book/src/main/java/me/ag2s/epublib/domain/LazyResource.java index a0faf070e..b4fd1522d 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/LazyResource.java +++ b/book/src/main/java/me/ag2s/epublib/domain/LazyResource.java @@ -2,11 +2,12 @@ package me.ag2s.epublib.domain; import android.util.Log; -import me.ag2s.epublib.util.IOUtil; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; +import me.ag2s.epublib.util.IOUtil; + /** * A Resource that loads its data only on-demand from a EPUB book file. * This way larger books can fit into memory and can be opened faster. diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/LazyResourceProvider.java b/book/src/main/java/me/ag2s/epublib/domain/LazyResourceProvider.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/LazyResourceProvider.java rename to book/src/main/java/me/ag2s/epublib/domain/LazyResourceProvider.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/ManifestItemProperties.java b/book/src/main/java/me/ag2s/epublib/domain/ManifestItemProperties.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/ManifestItemProperties.java rename to book/src/main/java/me/ag2s/epublib/domain/ManifestItemProperties.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/ManifestItemRefProperties.java b/book/src/main/java/me/ag2s/epublib/domain/ManifestItemRefProperties.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/ManifestItemRefProperties.java rename to book/src/main/java/me/ag2s/epublib/domain/ManifestItemRefProperties.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/ManifestProperties.java b/book/src/main/java/me/ag2s/epublib/domain/ManifestProperties.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/ManifestProperties.java rename to book/src/main/java/me/ag2s/epublib/domain/ManifestProperties.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/MediaType.java b/book/src/main/java/me/ag2s/epublib/domain/MediaType.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/MediaType.java rename to book/src/main/java/me/ag2s/epublib/domain/MediaType.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/MediaTypes.java b/book/src/main/java/me/ag2s/epublib/domain/MediaTypes.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/MediaTypes.java rename to book/src/main/java/me/ag2s/epublib/domain/MediaTypes.java index 61d51ad64..bba77ccc6 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/MediaTypes.java +++ b/book/src/main/java/me/ag2s/epublib/domain/MediaTypes.java @@ -1,9 +1,10 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.util.StringUtil; import java.util.HashMap; import java.util.Map; +import me.ag2s.epublib.util.StringUtil; + /** * Manages mediatypes that are used by epubs diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Metadata.java b/book/src/main/java/me/ag2s/epublib/domain/Metadata.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/Metadata.java rename to book/src/main/java/me/ag2s/epublib/domain/Metadata.java index 71c995dbe..cdf2d4346 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Metadata.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Metadata.java @@ -1,7 +1,5 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.util.StringUtil; - import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -10,6 +8,8 @@ import java.util.Map; import javax.xml.namespace.QName; +import me.ag2s.epublib.util.StringUtil; + /** * A Book's collection of Metadata. * In the future it should contain all Dublin Core attributes, for now diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Relator.java b/book/src/main/java/me/ag2s/epublib/domain/Relator.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/Relator.java rename to book/src/main/java/me/ag2s/epublib/domain/Relator.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Resource.java b/book/src/main/java/me/ag2s/epublib/domain/Resource.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/Resource.java rename to book/src/main/java/me/ag2s/epublib/domain/Resource.java index 2349c9e91..c5876e9f2 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Resource.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Resource.java @@ -1,15 +1,16 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.Constants; -import me.ag2s.epublib.util.IOUtil; -import me.ag2s.epublib.util.StringUtil; -import me.ag2s.epublib.util.commons.io.XmlStreamReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.Serializable; +import me.ag2s.epublib.Constants; +import me.ag2s.epublib.util.IOUtil; +import me.ag2s.epublib.util.StringUtil; +import me.ag2s.epublib.util.commons.io.XmlStreamReader; + /** * Represents a resource that is part of the epub. * A resource can be a html file, image, xml, etc. diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/ResourceInputStream.java b/book/src/main/java/me/ag2s/epublib/domain/ResourceInputStream.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/ResourceInputStream.java rename to book/src/main/java/me/ag2s/epublib/domain/ResourceInputStream.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/ResourceReference.java b/book/src/main/java/me/ag2s/epublib/domain/ResourceReference.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/ResourceReference.java rename to book/src/main/java/me/ag2s/epublib/domain/ResourceReference.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Resources.java b/book/src/main/java/me/ag2s/epublib/domain/Resources.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/Resources.java rename to book/src/main/java/me/ag2s/epublib/domain/Resources.java index 1a57c6a9c..81c643e6f 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Resources.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Resources.java @@ -1,7 +1,6 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.Constants; -import me.ag2s.epublib.util.StringUtil; +import android.util.Base64; import java.io.Serializable; import java.util.ArrayList; @@ -12,7 +11,9 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import android.util.Base64; + +import me.ag2s.epublib.Constants; +import me.ag2s.epublib.util.StringUtil; /** * All the resources that make up the book. diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/Spine.java b/book/src/main/java/me/ag2s/epublib/domain/Spine.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/domain/Spine.java rename to book/src/main/java/me/ag2s/epublib/domain/Spine.java index 293837086..626304592 100644 --- a/epublib/src/main/java/me/ag2s/epublib/domain/Spine.java +++ b/book/src/main/java/me/ag2s/epublib/domain/Spine.java @@ -1,11 +1,12 @@ package me.ag2s.epublib.domain; -import me.ag2s.epublib.util.StringUtil; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import me.ag2s.epublib.util.StringUtil; + /** * The spine sections are the sections of the book in the order in which the book should be read. * diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/SpineReference.java b/book/src/main/java/me/ag2s/epublib/domain/SpineReference.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/SpineReference.java rename to book/src/main/java/me/ag2s/epublib/domain/SpineReference.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/TOCReference.java b/book/src/main/java/me/ag2s/epublib/domain/TOCReference.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/TOCReference.java rename to book/src/main/java/me/ag2s/epublib/domain/TOCReference.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/TableOfContents.java b/book/src/main/java/me/ag2s/epublib/domain/TableOfContents.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/TableOfContents.java rename to book/src/main/java/me/ag2s/epublib/domain/TableOfContents.java diff --git a/epublib/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java b/book/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java rename to book/src/main/java/me/ag2s/epublib/domain/TitledResourceReference.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/BookProcessor.java b/book/src/main/java/me/ag2s/epublib/epub/BookProcessor.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/BookProcessor.java rename to book/src/main/java/me/ag2s/epublib/epub/BookProcessor.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/BookProcessorPipeline.java b/book/src/main/java/me/ag2s/epublib/epub/BookProcessorPipeline.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/BookProcessorPipeline.java rename to book/src/main/java/me/ag2s/epublib/epub/BookProcessorPipeline.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/DOMUtil.java b/book/src/main/java/me/ag2s/epublib/epub/DOMUtil.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/DOMUtil.java rename to book/src/main/java/me/ag2s/epublib/epub/DOMUtil.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java b/book/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java rename to book/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java index dd741cc4c..14157e19d 100644 --- a/epublib/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java +++ b/book/src/main/java/me/ag2s/epublib/epub/EpubProcessorSupport.java @@ -2,7 +2,10 @@ package me.ag2s.epublib.epub; import android.util.Log; -import me.ag2s.epublib.Constants; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xmlpull.v1.XmlPullParserFactory; +import org.xmlpull.v1.XmlSerializer; import java.io.IOException; import java.io.InputStream; @@ -17,10 +20,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xmlpull.v1.XmlPullParserFactory; -import org.xmlpull.v1.XmlSerializer; +import me.ag2s.epublib.Constants; /** * Various low-level support methods for reading/writing epubs. diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java b/book/src/main/java/me/ag2s/epublib/epub/EpubReader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java rename to book/src/main/java/me/ag2s/epublib/epub/EpubReader.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/EpubWriter.java b/book/src/main/java/me/ag2s/epublib/epub/EpubWriter.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/EpubWriter.java rename to book/src/main/java/me/ag2s/epublib/epub/EpubWriter.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java b/book/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java rename to book/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java index 7780f6b47..afd5801b7 100644 --- a/epublib/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java +++ b/book/src/main/java/me/ag2s/epublib/epub/HtmlProcessor.java @@ -1,7 +1,8 @@ package me.ag2s.epublib.epub; -import me.ag2s.epublib.domain.Resource; import java.io.OutputStream; + +import me.ag2s.epublib.domain.Resource; @SuppressWarnings("unused") public interface HtmlProcessor { diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/NCXDocumentV2.java b/book/src/main/java/me/ag2s/epublib/epub/NCXDocumentV2.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/NCXDocumentV2.java rename to book/src/main/java/me/ag2s/epublib/epub/NCXDocumentV2.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/NCXDocumentV3.java b/book/src/main/java/me/ag2s/epublib/epub/NCXDocumentV3.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/NCXDocumentV3.java rename to book/src/main/java/me/ag2s/epublib/epub/NCXDocumentV3.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentBase.java b/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentBase.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentBase.java rename to book/src/main/java/me/ag2s/epublib/epub/PackageDocumentBase.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataReader.java b/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataReader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataReader.java rename to book/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataReader.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataWriter.java b/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataWriter.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataWriter.java rename to book/src/main/java/me/ag2s/epublib/epub/PackageDocumentMetadataWriter.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java b/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java rename to book/src/main/java/me/ag2s/epublib/epub/PackageDocumentReader.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentWriter.java b/book/src/main/java/me/ag2s/epublib/epub/PackageDocumentWriter.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/PackageDocumentWriter.java rename to book/src/main/java/me/ag2s/epublib/epub/PackageDocumentWriter.java diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java b/book/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java rename to book/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/CollectionUtil.java b/book/src/main/java/me/ag2s/epublib/util/CollectionUtil.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/CollectionUtil.java rename to book/src/main/java/me/ag2s/epublib/util/CollectionUtil.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/IOUtil.java b/book/src/main/java/me/ag2s/epublib/util/IOUtil.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/util/IOUtil.java rename to book/src/main/java/me/ag2s/epublib/util/IOUtil.java index dcbda6830..c1a980ce7 100644 --- a/epublib/src/main/java/me/ag2s/epublib/util/IOUtil.java +++ b/book/src/main/java/me/ag2s/epublib/util/IOUtil.java @@ -1,7 +1,5 @@ package me.ag2s.epublib.util; -import android.util.Log; - import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.EOFException; @@ -20,7 +18,6 @@ import java.nio.CharBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.charset.Charset; -import me.ag2s.epublib.epub.PackageDocumentReader; import me.ag2s.epublib.util.commons.io.IOConsumer; /** diff --git a/epublib/src/main/java/me/ag2s/epublib/util/NoCloseOutputStream.java b/book/src/main/java/me/ag2s/epublib/util/NoCloseOutputStream.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/NoCloseOutputStream.java rename to book/src/main/java/me/ag2s/epublib/util/NoCloseOutputStream.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/NoCloseWriter.java b/book/src/main/java/me/ag2s/epublib/util/NoCloseWriter.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/NoCloseWriter.java rename to book/src/main/java/me/ag2s/epublib/util/NoCloseWriter.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java b/book/src/main/java/me/ag2s/epublib/util/ResourceUtil.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java rename to book/src/main/java/me/ag2s/epublib/util/ResourceUtil.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java b/book/src/main/java/me/ag2s/epublib/util/StringUtil.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/StringUtil.java rename to book/src/main/java/me/ag2s/epublib/util/StringUtil.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java similarity index 99% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java index ed299f591..4e7c3ce5a 100644 --- a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java +++ b/book/src/main/java/me/ag2s/epublib/util/commons/io/BOMInputStream.java @@ -17,6 +17,7 @@ package me.ag2s.epublib.util.commons.io; +import static me.ag2s.epublib.util.IOUtil.EOF; import android.os.Build; @@ -28,8 +29,6 @@ import java.util.List; import me.ag2s.epublib.util.IOUtil; -import static me.ag2s.epublib.util.IOUtil.EOF; - /** * This class is used to wrap a stream that includes an encoded {@link ByteOrderMark} as its first bytes. diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/ByteOrderMark.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/ByteOrderMark.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/ByteOrderMark.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/ByteOrderMark.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/IOConsumer.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/IOConsumer.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/IOConsumer.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/IOConsumer.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java index 3fe2415ab..fba5c4776 100644 --- a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java +++ b/book/src/main/java/me/ag2s/epublib/util/commons/io/ProxyInputStream.java @@ -18,14 +18,14 @@ package me.ag2s.epublib.util.commons.io; */ +import static me.ag2s.epublib.util.IOUtil.EOF; + import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import me.ag2s.epublib.util.IOUtil; -import static me.ag2s.epublib.util.IOUtil.EOF; - /** * A Proxy stream which acts as expected, that is it passes the method diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReader.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReader.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReader.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReaderException.java b/book/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReaderException.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReaderException.java rename to book/src/main/java/me/ag2s/epublib/util/commons/io/XmlStreamReaderException.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/AndroidZipEntry.java b/book/src/main/java/me/ag2s/epublib/util/zip/AndroidZipEntry.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/AndroidZipEntry.java rename to book/src/main/java/me/ag2s/epublib/util/zip/AndroidZipEntry.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/AndroidZipFile.java b/book/src/main/java/me/ag2s/epublib/util/zip/AndroidZipFile.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/AndroidZipFile.java rename to book/src/main/java/me/ag2s/epublib/util/zip/AndroidZipFile.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/ZipConstants.java b/book/src/main/java/me/ag2s/epublib/util/zip/ZipConstants.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/ZipConstants.java rename to book/src/main/java/me/ag2s/epublib/util/zip/ZipConstants.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java b/book/src/main/java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java rename to book/src/main/java/me/ag2s/epublib/util/zip/ZipEntryWrapper.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/ZipException.java b/book/src/main/java/me/ag2s/epublib/util/zip/ZipException.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/ZipException.java rename to book/src/main/java/me/ag2s/epublib/util/zip/ZipException.java diff --git a/epublib/src/main/java/me/ag2s/epublib/util/zip/ZipFileWrapper.java b/book/src/main/java/me/ag2s/epublib/util/zip/ZipFileWrapper.java similarity index 100% rename from epublib/src/main/java/me/ag2s/epublib/util/zip/ZipFileWrapper.java rename to book/src/main/java/me/ag2s/epublib/util/zip/ZipFileWrapper.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/domain/UmdBook.java b/book/src/main/java/me/ag2s/umdlib/domain/UmdBook.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/domain/UmdBook.java rename to book/src/main/java/me/ag2s/umdlib/domain/UmdBook.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/domain/UmdChapters.java b/book/src/main/java/me/ag2s/umdlib/domain/UmdChapters.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/domain/UmdChapters.java rename to book/src/main/java/me/ag2s/umdlib/domain/UmdChapters.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/domain/UmdCover.java b/book/src/main/java/me/ag2s/umdlib/domain/UmdCover.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/domain/UmdCover.java rename to book/src/main/java/me/ag2s/umdlib/domain/UmdCover.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/domain/UmdEnd.java b/book/src/main/java/me/ag2s/umdlib/domain/UmdEnd.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/domain/UmdEnd.java rename to book/src/main/java/me/ag2s/umdlib/domain/UmdEnd.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/domain/UmdHeader.java b/book/src/main/java/me/ag2s/umdlib/domain/UmdHeader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/domain/UmdHeader.java rename to book/src/main/java/me/ag2s/umdlib/domain/UmdHeader.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/tool/StreamReader.java b/book/src/main/java/me/ag2s/umdlib/tool/StreamReader.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/tool/StreamReader.java rename to book/src/main/java/me/ag2s/umdlib/tool/StreamReader.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/tool/UmdUtils.java b/book/src/main/java/me/ag2s/umdlib/tool/UmdUtils.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/tool/UmdUtils.java rename to book/src/main/java/me/ag2s/umdlib/tool/UmdUtils.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/tool/WrapOutputStream.java b/book/src/main/java/me/ag2s/umdlib/tool/WrapOutputStream.java similarity index 100% rename from epublib/src/main/java/me/ag2s/umdlib/tool/WrapOutputStream.java rename to book/src/main/java/me/ag2s/umdlib/tool/WrapOutputStream.java diff --git a/epublib/src/main/java/me/ag2s/umdlib/umd/UmdReader.java b/book/src/main/java/me/ag2s/umdlib/umd/UmdReader.java similarity index 99% rename from epublib/src/main/java/me/ag2s/umdlib/umd/UmdReader.java rename to book/src/main/java/me/ag2s/umdlib/umd/UmdReader.java index 5bb92bb41..287dfa8cb 100644 --- a/epublib/src/main/java/me/ag2s/umdlib/umd/UmdReader.java +++ b/book/src/main/java/me/ag2s/umdlib/umd/UmdReader.java @@ -6,7 +6,6 @@ import androidx.annotation.NonNull; import java.io.IOException; import java.io.InputStream; - import me.ag2s.umdlib.domain.UmdBook; import me.ag2s.umdlib.domain.UmdCover; import me.ag2s.umdlib.domain.UmdHeader; diff --git a/epublib/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent b/book/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent similarity index 100% rename from epublib/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent rename to book/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oeb12.ent diff --git a/epublib/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd b/book/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd similarity index 100% rename from epublib/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd rename to book/src/main/resources/dtd/openebook.org/dtds/oeb-1.2/oebpkg12.dtd diff --git a/epublib/src/main/resources/dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd b/book/src/main/resources/dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd similarity index 100% rename from epublib/src/main/resources/dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd rename to book/src/main/resources/dtd/www.daisy.org/z3986/2005/ncx-2005-1.dtd diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/ruby/xhtml-ruby-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-arch-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod.1 diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent.1 diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml11-model-1.mod b/book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml11-model-1.mod similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml11-model-1.mod rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml-modularization/DTD/xhtml11-model-1.mod diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-special.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent b/book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd b/book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd b/book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd diff --git a/epublib/src/main/resources/dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd b/book/src/main/resources/dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd similarity index 100% rename from epublib/src/main/resources/dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd rename to book/src/main/resources/dtd/www.w3.org/TR/xhtml11/DTD/xhtml11.dtd diff --git a/epublib/src/main/resources/log4j.properties b/book/src/main/resources/log4j.properties similarity index 100% rename from epublib/src/main/resources/log4j.properties rename to book/src/main/resources/log4j.properties diff --git a/settings.gradle b/settings.gradle index 78925de6f..c3ec3019f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,4 +28,4 @@ dependencyResolutionManagement { } rootProject.name = 'legado' -include ':app',':rhino',':epublib' +include ':app',':rhino', ':book'