asciidoctor-epub3 1.5.0.alpha.19 → 1.5.0

data/lib/asciidoctor-epub3/converter.rb

@@ -227,8 +227,8 @@ module Asciidoctor
         # https://idpf.github.io/epub-vocabs/structure/
         landmarks = []
 
-        cover_page = add_cover_page node
-        landmarks << { type: 'cover', href: cover_page.href, title: 'Cover' } unless cover_page.nil?
+        front_cover = add_cover_page node, 'front-cover'
+        landmarks << { type: 'cover', href: front_cover.href, title: 'Front Cover' } unless front_cover.nil?
 
         front_matter_page = add_front_matter_page node
         landmarks << { type: 'frontmatter', href: front_matter_page.href, title: 'Front Matter' } unless front_matter_page.nil?
@@ -253,6 +253,9 @@ module Asciidoctor
           add_chapter node
         end
 
+        _back_cover = add_cover_page node, 'back-cover'
+        # TODO: add landmark for back cover? But what epub:type?
+
         landmarks << { type: 'bodymatter', href: %(#{get_chapter_name toc_items[0]}.xhtml), title: 'Start of Content' } unless toc_items.empty?
 
         toc_items.each do |item|
@@ -992,12 +995,21 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         img_attrs = []
         img_attrs << %(alt="#{node.attr 'alt'}") if node.attr? 'alt'
 
-        width = node.attr 'scaledwidth'
-        width = node.attr 'width' if width.nil?
-
         # Unlike browsers, Calibre/Kindle *do* scale image if only height is specified
         # So, in order to match browser behavior, we just always omit height
-        img_attrs << %(width="#{width}") unless width.nil?
+
+        if (scaledwidth = node.attr 'scaledwidth')
+          img_attrs << %(style="width: #{scaledwidth}")
+        elsif (width = node.attr 'width')
+          # HTML5 spec (and EPUBCheck) only allows pixels in width, but browsers also accept percents
+          # and there are multiple AsciiDoc files in the wild that have width=percents%
+          # So, for compatibility reasons, output percentage width as a CSS style
+          if width[/^\d+%$/]
+            img_attrs << %(style="width: #{width}")
+          else
+            img_attrs << %(width="#{width}")
+          end
+        end
 
         img_attrs
       end
@@ -1338,20 +1350,22 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         nil
       end
 
-      def add_cover_page doc
-        return nil if (image_path = doc.attr 'front-cover-image').nil?
+      def add_cover_page doc, name
+        image_attr_name = %(#{name}-image)
+
+        return nil if (image_path = doc.attr image_attr_name).nil?
 
         imagesdir = (doc.attr 'imagesdir', '.').chomp '/'
         imagesdir = (imagesdir == '.' ? '' : %(#{imagesdir}/))
 
         image_attrs = {}
         if (image_path.include? ':') && image_path =~ ImageMacroRx
-          logger.warn %(deprecated block macro syntax detected in front-cover-image attribute) if image_path.start_with? 'image::'
+          logger.warn %(deprecated block macro syntax detected in :#{image_attr_name}: attribute) if image_path.start_with? 'image::'
           image_path = %(#{imagesdir}#{$1})
           (::Asciidoctor::AttributeList.new $2).parse_into image_attrs, %w(alt width height) unless $2.empty?
         end
 
-        image_href = %(#{imagesdir}jacket/cover#{::File.extname image_path})
+        image_href = %(#{imagesdir}jacket/#{name}#{::File.extname image_path})
 
         workdir = doc.attr 'docdir'
         workdir = '.' if workdir.nil_or_empty?
@@ -1359,7 +1373,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         begin
           @book.add_item(image_href, content: File.join(workdir, image_path)).cover_image
         rescue => e
-          logger.error %(#{::File.basename doc.attr('docfile')}: error adding front cover image. Make sure that :front-cover-image: attribute points to a valid image file. #{e})
+          logger.error %(#{::File.basename doc.attr('docfile')}: error adding cover image. Make sure that :#{image_attr_name}: attribute points to a valid image file. #{e})
           return nil
         end
 
@@ -1400,7 +1414,7 @@ body > svg {
 </svg></body>
 </html>).to_ios
 
-        @book.add_ordered_item 'cover.xhtml', content: content, id: 'cover'
+        @book.add_ordered_item %(#{name}.xhtml), content: content, id: name
       end
 
       def get_frontmatter_files doc, workdir
@@ -1644,8 +1658,15 @@ body > svg {
           return [result]
         end
 
-        logger.debug 'Using KindleGen from PATH'
-        [%(kindlegen#{::Gem.win_platform? ? '.exe' : ''})]
+        begin
+          require 'kindlegen' unless defined? ::Kindlegen
+          result = ::Kindlegen.command.to_s
+          logger.debug %(Using KindleGen from gem: #{result})
+          [result]
+        rescue LoadError => e
+          logger.debug %(#{e}; Using KindleGen from PATH)
+          [%(kindlegen#{::Gem.win_platform? ? '.exe' : ''})]
+        end
       end
 
       def distill_epub_to_mobi epub_file, target, compress

data/lib/asciidoctor-epub3/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Epub3
-    VERSION = '1.5.0.alpha.19'
+    VERSION = '1.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.19
+  version: 1.5.0
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-21 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.38.0
+        version: 1.41.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.38.0
+        version: 1.41.0
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
 description: 'An extension for Asciidoctor that converts AsciiDoc documents to EPUB3
   and KF8/MOBI (Kindle) e-book archives.
 
-'
+  '
 email: dan@opendevise.com
 executables:
 - asciidoctor-epub3
@@ -280,14 +280,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats