asciidoctor-epub3 2.0.1 → 2.1.2.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f20a42a377b9277de98224e2b6d8d5ac7ff356b46a02ba8ca481a80935d59eba
-  data.tar.gz: 35306c465c033aca6377d510b8b3ce55133a48ae79aed950e6cf3029c48e9186
+  metadata.gz: 5c0dd509a02dd2ac44d14dd78593ca9a70430a7ad851d753af2588b12758c436
+  data.tar.gz: f361b23eb0cd3b3ceeefa2884d8fd5a3eb2833ed53d3a5d735b4b328bc836e0a
 SHA512:
-  metadata.gz: 2d0c281acdc88326415f1e308a8ee6c6f6dae93868d04af0381fa80f11836fcecf7e20e7ff5b1894711f72538bf5fc8fe599b98441f517197c87890b826ad3a3
-  data.tar.gz: ba7e9532b6df5dbdf09dd87e4c96bb0fffe0485b0113d62970fd980b12e209c435084ebd0d0e1c38b7da340dc5e63a59dbd3d025a4cefd6aaf5f6946501ad8fc
+  metadata.gz: ee3d61e1dfbff0cd7930477bfd88ec68c5e15afcc3c854fb003f9e75cd46ced07db5f3cdc97f052446d776782df68e36d7fcbad8f4381e2b5253ed00ae4d3715
+  data.tar.gz: 195f1ac17a1203f131a78ff98bde9fc1f519cf51eaff8fdc6e2af3b4417718378a37a4085481e1353e4cac2547cbbf3186052d24bbb5eabdad1bd6b859a13137

data/CHANGELOG.adoc

@@ -5,6 +5,18 @@
 This document provides a high-level view of the changes to the {project-name} by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
+== 2.1.1 (2024-05-12) - @slonopotamus
+
+* fix crash when section title contains inline anchor (#472)
+* fix crash on an SVG image inside table cell (#470)
+* lock gepub to 1.0.15 to workaround file descriptor leak (#474)
+
+== 2.1.0 (2024-02-04) - @slonopotamus
+
+* drop MOBI support
+* add support for blocks in callouts (#463)
+* stop packaging samples into gem (#462)
+
 == 2.0.1 (2024-01-13) - @slonopotamus
 
 * restore styling of `<strong>` and `<em>` (#461)

data/Gemfile

@@ -9,8 +9,4 @@ group :optional do
   # epubcheck-ruby might be safe to be converted into runtime dependency,
   # but could have issues when packaged into asciidoctorj-epub3
   gem 'epubcheck-ruby', '~> 5.1.0.0'
-
-  # Kindlegen is unavailable neither for 64-bit x86 macOS nor for ARM
-  # Also, skip JRuby on Windows for now. See https://github.com/jruby/jruby/issues/7171
-  gem 'kindlegen', '~> 3.1.0' unless RUBY_PLATFORM =~ /darwin/ || (Gem.win_platform? && RUBY_ENGINE == 'jruby')
 end

data/README.adoc

@@ -1,6 +1,5 @@
 = {project-name}: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.1, 2024-01-13
 :project-name: Asciidoctor EPUB3
 :project-handle: asciidoctor-epub3
 :uri-project: https://github.com/asciidoctor/{project-handle}
@@ -13,7 +12,7 @@ image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg[project chat,
 image:https://img.shields.io/gem/v/asciidoctor-epub3.svg[Latest Release,link={uri-gem}]
 image:{uri-project}/workflows/CI/badge.svg?branch=main[GitHub Actions,link={uri-ci}]
 
-{project-name} is a set of Asciidoctor extensions for converting AsciiDoc documents directly to the EPUB3 and KF8/MOBI e-book formats.
+{project-name} is a set of Asciidoctor extensions for converting AsciiDoc documents directly to the EPUB3 e-book format.
 
 == Documentation
 
@@ -54,15 +53,6 @@ $ asciidoctor-epub3 -D output path/to/book.adoc
 When the script completes, you'll see the file [file]_book.epub_ appear in the [path]_output_ directory.
 Open that file with an EPUB3 reader to view the result.
 
-You may also produce KF8/MOBI file by setting `ebook-format` attribute to `kf8`.
-
-[source,shell script]
-----
-$ asciidoctor-epub3 -D output -a ebook-format=kf8 path/to/book.adoc
-----
-
-When the script completes, the file [file]_book.mobi_ will appear in [path]_output_ directory.
-
 == Contributing
 
 In the spirit of free software, _everyone_ is encouraged to help improve this project.

data/asciidoctor-epub3.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.name = 'asciidoctor-epub3'
   s.version = Asciidoctor::Epub3::VERSION
 
-  s.summary = 'Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats'
+  s.summary = 'Converts AsciiDoc documents to EPUB3 e-book format'
   s.description = <<~EOS
-    An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book archives.
+    An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 e-book format.
   EOS
 
   s.authors = ['Dan Allen', 'Sarah White']
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
     Dir['**/*']
   end
   s.files = files.grep %r{^(?:(?:data/(?:fonts|images|styles)|lib)/.+|Gemfile|Rakefile|LICENSE|(?:CHANGELOG|NOTICE|README)\.adoc|\.yardopts|#{s.name}\.gemspec)$}
-  s.executables = %w[asciidoctor-epub3 adb-push-ebook]
+  s.executables = %w[asciidoctor-epub3]
 
   s.require_paths = ['lib']
 
@@ -33,15 +33,21 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'asciimath', '~> 2.0'
   s.add_development_dependency 'coderay', '~> 1.1.0'
   s.add_development_dependency 'pygments.rb', '~> 2.4.0'
-  s.add_development_dependency 'rake', '~> 13.1.0'
+  s.add_development_dependency 'rake', '~> 13.2.0'
   s.add_development_dependency 'rouge', '~> 3.0'
-  s.add_development_dependency 'rspec', '~> 3.12.0'
+  s.add_development_dependency 'rspec', '~> 3.13.0'
   s.add_development_dependency 'rubocop', '~> 1.50.2'
   s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   s.add_development_dependency 'rubocop-rspec', '~> 2.20.0'
 
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
-  s.add_runtime_dependency 'gepub', '~> 1.0.0'
+
+  # Temporarily ban gepub 1.0.16
+  # Looks like it stopped properly closing files after writing
+  # See https://github.com/skoji/gepub/pull/140#issuecomment-2106238457
+  s.add_runtime_dependency 'gepub', '>= 1.0.0', '<= 1.0.15'
+  # s.add_runtime_dependency 'gepub', '~> 1.0.0'
+
   s.add_runtime_dependency 'mime-types', '~> 3.0'
 
   # TODO: switch to 'sass-embedded' when we drop Ruby 2.5 support

data/data/styles/epub3-css3-only.scss

@@ -32,6 +32,7 @@ body code, body kbd, body :not(.verse) > pre, :not(.verse) > pre :not(code) {
   font-family: "M+ 1mn", monospace !important;
 }
 
+/* TODO: DO we still need this? */
 @media amzn-kf8 {
   /* Kindle does its own margin management, so don't use an explicit margin */
   /*body {

data/data/styles/epub3.scss

@@ -841,7 +841,7 @@ div.verse {
   page-break-inside: avoid;
 }
 
-/* TODO we may want to reenable hyphens here, but not for kf8 */
+/* TODO we may want to reenable hyphens here */
 div.verse > pre {
   font-family: "M+ 1p", sans-serif;
   background-color: transparent;
@@ -1160,7 +1160,10 @@ nav[hidden~="hidden"] {
 }
 
 @media amzn-mobi {
-  /* NOTE mobi7 doesn't support custom fonts, so revert to generic ones */
+  /*
+    NOTE mobi7 doesn't support custom fonts, so revert to generic ones.
+    See https://github.com/asciidoctor/asciidoctor-epub3/issues/56.
+   */
   body p, ul, ol, li, dl, dt, dd, figcaption, caption, footer,
   table.table th, table.table td, div.verse .attribution {
     font-family: serif;

data/lib/asciidoctor-epub3/converter.rb

@@ -7,8 +7,7 @@ require_relative 'font_icon_map'
 
 module Asciidoctor
   module Epub3
-    # Public: The main converter for the epub3 backend that handles packaging the
-    # EPUB3 or KF8 publication file.
+    # Public: The main converter for the epub3 backend that handles packaging the EPUB3 publication file.
     class Converter
       include ::Asciidoctor::Converter
       include ::Asciidoctor::Logging
@@ -17,15 +16,14 @@ module Asciidoctor
       register_for 'epub3'
 
       def write(output, target)
-        epub_file = @format == :kf8 ? %(#{::Asciidoctor::Helpers.rootname target}-kf8.epub) : target
-        output.generate_epub epub_file
-        logger.debug %(Wrote #{@format.upcase} to #{epub_file})
+        output.generate_epub target
+        logger.debug %(Wrote to #{target})
         if @extract
-          extract_dir = epub_file.sub EPUB_EXTENSION_RX, ''
+          extract_dir = target.sub EPUB_EXTENSION_RX, ''
           ::FileUtils.remove_dir extract_dir if ::File.directory? extract_dir
           ::Dir.mkdir extract_dir
           ::Dir.chdir extract_dir do
-            ::Zip::File.open epub_file do |entries|
+            ::Zip::File.open target do |entries|
               entries.each do |entry|
                 next unless entry.file?
 
@@ -36,15 +34,12 @@ module Asciidoctor
               end
             end
           end
-          logger.debug %(Extracted #{@format.upcase} to #{extract_dir})
+          logger.debug %(Extracted to #{extract_dir})
         end
 
-        if @format == :kf8
-          # QUESTION: shouldn't we validate this epub file too?
-          distill_epub_to_mobi epub_file, target, @compress
-        elsif @validate
-          validate_epub epub_file
-        end
+        return unless @validate
+
+        validate_epub target
       end
 
       CSV_DELIMITED_RX = /\s*,\s*/.freeze
@@ -80,14 +75,10 @@ module Asciidoctor
       TO_HTML_SPECIAL_CHARS_RX = /[#{TO_HTML_SPECIAL_CHARS_MAP.keys.join}]/.freeze
 
       EPUB_EXTENSION_RX = /\.epub$/i.freeze
-      KINDLEGEN_COMPRESSION = {
-        '0' => '-c0',
-        '1' => '-c1',
-        '2' => '-c2',
-        'none' => '-c0',
-        'standard' => '-c1',
-        'huffdic' => '-c2'
-      }.freeze
+
+      # This is a workaround for https://github.com/asciidoctor/asciidoctor/issues/4380
+      # Currently, there is no access to parent cell from inner document
+      PARENT_CELL_FIELD_NAME = :@epub3_parent_cell
 
       QUOTE_TAGS = begin
         tags = {
@@ -108,8 +99,13 @@ module Asciidoctor
 
       def initialize(backend, opts = {})
         super
+
+        @xrefs_seen = Set.new
+        @media_files = {}
+        @footnotes = []
+
         basebackend 'html'
-        outfilesuffix '.epub' # dummy outfilesuffix since it may be .mobi
+        outfilesuffix '.epub'
         htmlsyntax 'xml'
       end
 
@@ -158,19 +154,13 @@ module Asciidoctor
       end
 
       def convert_document(node)
-        @format = node.attr('ebook-format').to_sym
-
         @validate = node.attr? 'ebook-validate'
         @extract = node.attr? 'ebook-extract'
         @compress = node.attr 'ebook-compress'
-        @kindlegen_path = node.attr 'ebook-kindlegen-path'
         @epubcheck_path = node.attr 'ebook-epubcheck-path'
-        @xrefs_seen = ::Set.new
-        @media_files = {}
-        @footnotes = []
 
         @book = GEPUB::Book.new 'EPUB/package.opf'
-        @book.epub_backward_compat = @format != :kf8
+        @book.epub_backward_compat = true
         @book.language node.attr('lang', 'en'), id: 'pub-language'
 
         if node.attr? 'uuid'
@@ -239,7 +229,7 @@ module Asciidoctor
         landmarks = []
 
         front_cover = add_cover_page node, 'front-cover'
-        if front_cover.nil? && @format != :kf8 && node.doctype == 'book'
+        if front_cover.nil? && node.doctype == 'book'
           # TODO(#352): add textual front cover similar to PDF
         end
 
@@ -289,9 +279,9 @@ module Asciidoctor
           }
         end
 
-        nav_item.add_content postprocess_xhtml(nav_doc(node, toc_items, landmarks, outlinelevels))
+        nav_item.add_content nav_doc(node, toc_items, landmarks, outlinelevels).to_ios
         # User is not supposed to see landmarks, so pass empty array here
-        toc_item&.add_content postprocess_xhtml(nav_doc(node, toc_items, [], toclevels))
+        toc_item&.add_content nav_doc(node, toc_items, [], toclevels).to_ios
 
         # NOTE: gepub doesn't support building a ncx TOC with depth > 1, so do it ourselves
         toc_ncx = ncx_doc node, toc_items, outlinelevels
@@ -406,10 +396,8 @@ module Asciidoctor
         end
 
         header = if title || subtitle
-                   %(<header>
-<div class="chapter-header">
+                   %(<header class="chapter-header">
 #{byline}<h1 class="chapter-title">#{title}#{subtitle ? %(<small class="subtitle">#{subtitle}</small>) : ''}</h1>
-</div>
 </header>)
                  else
                    ''
@@ -419,7 +407,6 @@ module Asciidoctor
         # in order to avoid style duplication across chapter files
         linkcss = true
 
-        # NOTE: kindlegen seems to mangle the <header> element, so we wrap its content in a div
         lines = [%(<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:mml="http://www.w3.org/1998/Math/MathML" xml:lang="#{lang = node.document.attr 'lang',
@@ -455,9 +442,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         unless (fns = node.document.footnotes - @footnotes).empty?
           @footnotes += fns
 
-          # NOTE: kindlegen seems to mangle the <footer> element, so we wrap its content in a div
-          lines << '<footer>
-<div class="chapter-footer">
+          lines << '<footer class="chapter-footer">
 <div class="footnotes">'
           fns.each do |footnote|
             lines << %(<aside id="note-#{footnote.index}" epub:type="footnote">
@@ -465,7 +450,6 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 </aside>)
           end
           lines << '</div>
-</div>
 </footer>'
         end
 
@@ -479,7 +463,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         lines << '</body>
 </html>'
 
-        chapter_item.add_content postprocess_xhtml lines * LF
+        chapter_item.add_content((lines * LF).to_ios)
         epub_properties = node.attr 'epub-properties'
         chapter_item.add_property 'svg' if epub_properties&.include? 'svg'
 
@@ -816,6 +800,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
                 else
                   case cell.style
                   when :asciidoc
+                    cell.inner_document.instance_variable_set(PARENT_CELL_FIELD_NAME, cell)
                     cell_content = %(<div class="embed">#{cell.content}</div>)
                   when :verse
                     cell_content = %(<div class="verse">#{cell.text}</div>)
@@ -856,7 +841,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
 <ol>']
         num = CALLOUT_START_NUM
         node.items.each_with_index do |item, i|
-          lines << %(<li><i class="conum" data-value="#{i + 1}">#{num}</i> #{item.text}</li>)
+          lines << %(<li><i class="conum" data-value="#{i + 1}">#{num}</i> #{item.text}#{item.content if item.blocks?}</li>)
           num = num.next
         end
         lines << '</ol>
@@ -974,7 +959,9 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
         lines << %(<ol#{ol_class_attr}#{ol_start_attr}#{node.option?('reversed') ? ' reversed="reversed"' : ''}>)
         node.items.each do |item|
-          lines << %(<li>
+          li_classes = [item.role].compact
+          li_class_attr = li_classes.empty? ? '' : %( class="#{li_classes * ' '}")
+          lines << %(<li#{li_class_attr}>
 <span class="principal">#{item.text}</span>)
           if item.blocks?
             lines << item.content
@@ -1001,7 +988,9 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         lines << %(<h3 class="list-heading">#{node.title}</h3>) if node.title?
         lines << %(<ul#{ul_class_attr}>)
         node.items.each do |item|
-          lines << %(<li>
+          li_classes = [item.role].compact
+          li_class_attr = li_classes.empty? ? '' : %( class="#{li_classes * ' '}")
+          lines << %(<li#{li_class_attr}>
 <span class="principal">#{item.text}</span>)
           if item.blocks?
             lines << item.content
@@ -1172,7 +1161,11 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           return nil if node.nil?
           return node unless get_chapter_filename(node).nil?
 
-          node = node.parent
+          node = if node.instance_variable_defined?(PARENT_CELL_FIELD_NAME)
+                   node.instance_variable_get(PARENT_CELL_FIELD_NAME)
+                 else
+                   node.parent
+                 end
         end
       end
 
@@ -1386,7 +1379,6 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
       end
 
       def add_theme_assets(doc)
-        format = @format
         workdir = if doc.attr? 'epub3-stylesdir'
                     stylesdir = doc.attr 'epub3-stylesdir'
                     # FIXME: make this work for Windows paths!!
@@ -1404,13 +1396,7 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         # TODO: improve design/UX of custom theme functionality, including custom fonts
         %w[epub3 epub3-css3-only].each do |f|
           css = load_css_file File.join(workdir, %(#{f}.scss))
-          if format == :kf8
-            # NOTE: add layer of indirection so Kindle Direct Publishing (KDP) doesn't strip font-related CSS rules
-            @book.add_item %(styles/#{f}.css), content: %(@import url("#{f}-proxied.css");).to_ios
-            @book.add_item %(styles/#{f}-proxied.css), content: css.to_ios
-          else
-            @book.add_item %(styles/#{f}.css), content: css.to_ios
-          end
+          @book.add_item %(styles/#{f}.css), content: css.to_ios
         end
 
         syntax_hl = doc.syntax_highlighter
@@ -1433,15 +1419,12 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
         @book.add_item 'styles/epub3-fonts.css', content: font_css.to_ios
         unless font_files.empty?
           # NOTE: metadata property in oepbs package manifest doesn't work; must use proprietary iBooks file instead
-          # (@book.metadata.add_metadata 'meta', 'true')['property'] = 'ibooks:specified-fonts' unless format == :kf8
-          unless format == :kf8
-            @book.add_optional_file 'META-INF/com.apple.ibooks.display-options.xml', '<?xml version="1.0" encoding="UTF-8"?>
+          @book.add_optional_file 'META-INF/com.apple.ibooks.display-options.xml', '<?xml version="1.0" encoding="UTF-8"?>
 <display_options>
 <platform name="*">
 <option name="specified-fonts">true</option>
 </platform>
 </display_options>'.to_ios
-          end
 
           font_files.each do |font_file|
             @book.add_item font_file, content: File.join(DATA_DIR, font_file)
@@ -1486,8 +1469,6 @@ document.addEventListener('DOMContentLoaded', function(event, reader) {
           return nil
         end
 
-        return nil if @format == :kf8
-
         unless !image_attrs.empty? && (width = image_attrs['width']) && (height = image_attrs['height'])
           width = 1050
           height = 1600
@@ -1522,9 +1503,9 @@ body > svg {
   width="100%" height="100%" viewBox="0 0 #{width} #{height}" preserveAspectRatio="xMidYMid meet">
 <image width="#{width}" height="#{height}" xlink:href="#{image_href}"/>
 </svg></body>
-</html>).to_ios
+</html>)
 
-        @book.add_ordered_item %(#{name}.xhtml), content: content, id: name
+        @book.add_ordered_item %(#{name}.xhtml), content: content.to_ios, id: name
       end
 
       def get_frontmatter_files(doc, workdir)
@@ -1559,7 +1540,7 @@ body > svg {
           front_matter_content = ::File.read front_matter
 
           front_matter_file = File.basename front_matter, '.html'
-          item = @book.add_ordered_item "#{front_matter_file}.xhtml", content: (postprocess_xhtml front_matter_content)
+          item = @book.add_ordered_item "#{front_matter_file}.xhtml", content: front_matter_content.to_ios
           item.add_property 'svg' if SVG_IMG_SNIFF_RX =~ front_matter_content
           # Store link to first frontmatter page
           result = item if result.nil?
@@ -1615,8 +1596,8 @@ body > svg {
 </head>
 <body>
 <section class="chapter">
-<header>
-<div class="chapter-header"><h1 class="chapter-title"><small class="subtitle">#{doc.attr 'toc-title'}</small></h1></div>
+<header class="chapter-header">
+<h1 class="chapter-title"><small class="subtitle">#{doc.attr 'toc-title'}</small></h1>
 </header>
 <nav epub:type="toc" id="toc">)]
         lines << (nav_level items, [depth, 0].max)
@@ -1738,72 +1719,6 @@ body > svg {
         sass_engine.render
       end
 
-      def postprocess_xhtml(content)
-        return content.to_ios unless @format == :kf8
-
-        # TODO: convert regular expressions to constants
-        content
-          .gsub(/<img([^>]+) style="width: (\d\d)%;"/, '<img\1 style="width: \2%; height: \2%;"')
-          .gsub(%r{<script type="text/javascript">.*?</script>\n?}m, '')
-          .to_ios
-      end
-
-      def build_kindlegen_command
-        unless @kindlegen_path.nil?
-          logger.debug %(Using ebook-kindlegen-path attribute: #{@kindlegen_path})
-          return [@kindlegen_path]
-        end
-
-        unless (result = ENV.fetch('KINDLEGEN', nil)).nil?
-          logger.debug %(Using KINDLEGEN env variable: #{result})
-          return [result]
-        end
-
-        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)
-        mobi_file = ::File.basename target.sub(EPUB_EXTENSION_RX, '.mobi')
-        compress_flag = KINDLEGEN_COMPRESSION[if compress
-                                                compress.empty? ? '1' : compress.to_s
-                                              else
-                                                '0'
-                                              end]
-
-        argv = build_kindlegen_command + ['-dont_append_source', compress_flag, '-o', mobi_file, epub_file].compact
-        begin
-          # This duplicates Kindlegen.run, but we want to override executable
-          out, err, res = Open3.capture3(*argv) do |r|
-            r.force_encoding 'UTF-8' if ::Gem.win_platform? && r.respond_to?(:force_encoding)
-          end
-        rescue Errno::ENOENT => e
-          raise 'Unable to run KindleGen. Either install the kindlegen gem or place `kindlegen` executable on PATH or set KINDLEGEN environment variable with path to it',
-                cause: e
-        end
-
-        out.each_line do |line|
-          log_line line
-        end
-        err.each_line do |line|
-          log_line line
-        end
-
-        output_file = ::File.join ::File.dirname(epub_file), mobi_file
-        if res.success?
-          logger.debug %(Wrote MOBI to #{output_file})
-        else
-          logger.error %(KindleGen failed to write MOBI to #{output_file})
-        end
-      end
-
       def build_epubcheck_command
         unless @epubcheck_path.nil?
           logger.debug %(Using ebook-epubcheck-path attribute: #{@epubcheck_path})
@@ -1875,27 +1790,6 @@ body > svg {
       end
     end
 
-    class NumericIdGenerator
-      def initialize
-        @counter = 1
-      end
-
-      # @param node [Asciidoctor::AbstractNode]
-      # @return [void]
-      def generate_id(node)
-        if node.chapter? || node.is_a?(Asciidoctor::Document)
-          node.id = %(_generated_id_#{@counter})
-          @counter += 1
-        end
-
-        # Recurse
-        node.blocks.each do |subnode|
-          # dlist contains array of *arrays* of blocks, so just skip them
-          generate_id subnode if subnode.is_a?(Asciidoctor::AbstractBlock)
-        end
-      end
-    end
-
     Extensions.register do
       if (document = @document).backend == 'epub3'
         document.set_attribute 'listing-caption', 'Listing'
@@ -1904,33 +1798,22 @@ body > svg {
         document.set_attribute 'pygments-style', 'bw' unless document.attr? 'pygments-style'
         document.set_attribute 'rouge-style', 'bw' unless document.attr? 'rouge-style'
 
-        case (ebook_format = document.attributes['ebook-format'])
-        when 'epub3', 'kf8'
-          # all good
-        when 'mobi'
-          ebook_format = document.attributes['ebook-format'] = 'kf8'
-        else
-          # QUESTION: should we display a warning?
-          ebook_format = document.attributes['ebook-format'] = 'epub3'
-        end
-        document.attributes[%(ebook-format-#{ebook_format})] = ''
+        # Backward compatibility for documents that were created before we dropped MOBI support
+        document.set_attribute 'ebook-format', 'epub3'
+        document.set_attribute 'ebook-format-epub3', ''
 
         # Enable generation of section ids because we use them for chapter filenames
         document.set_attribute 'sectids'
         treeprocessor do
           process do |doc|
-            if ebook_format == 'kf8'
-              # Kindlegen doesn't support unicode ids
-              NumericIdGenerator.new.generate_id doc
-            else
-              # :sectids: doesn't generate id for top-level section (why?), do it manually
-              doc.id = Section.generate_id(doc.first_section&.title || doc.attr('docname') || 'document', doc) if doc.id.nil_or_empty?
+            # :sectids: doesn't generate id for top-level section (why?), do it manually
+            doc.id = Section.generate_id(doc.first_section&.title || doc.attr('docname') || 'document', doc) if doc.id.nil_or_empty?
 
-              if (preamble = doc.blocks[0]) && preamble.context == :preamble && preamble.id.nil_or_empty?
-                # :sectids: doesn't generate id for preamble (because it is not a section), do it manually
-                preamble.id = Section.generate_id(preamble.title || 'preamble', doc)
-              end
+            if (preamble = doc.blocks[0]) && preamble.context == :preamble && preamble.id.nil_or_empty?
+              # :sectids: doesn't generate id for preamble (because it is not a section), do it manually
+              preamble.id = Section.generate_id(preamble.title || 'preamble', doc)
             end
+
             nil
           end
         end

data/lib/asciidoctor-epub3/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Epub3
-    VERSION = '2.0.1'
+    VERSION = '2.1.2.dev'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.2.dev
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor-diagram
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 13.2.0
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.12.0
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -169,16 +169,22 @@ dependencies:
   name: gepub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.0.15
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -208,13 +214,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 'An extension for Asciidoctor that converts AsciiDoc documents to EPUB3
-  and KF8/MOBI (Kindle) e-book archives.
+  e-book format.
 
   '
 email: dan@opendevise.com
 executables:
 - asciidoctor-epub3
-- adb-push-ebook
 extensions: []
 extra_rdoc_files: []
 files:
@@ -225,7 +230,6 @@ files:
 - README.adoc
 - Rakefile
 - asciidoctor-epub3.gemspec
-- bin/adb-push-ebook
 - bin/asciidoctor-epub3
 - data/fonts/assorted-icons.ttf
 - data/fonts/awesome/LICENSE.txt
@@ -304,8 +308,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
-summary: Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats
+summary: Converts AsciiDoc documents to EPUB3 e-book format
 test_files: []

data/bin/adb-push-ebook

@@ -1,37 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-ADB = ENV['ADB'] || 'adb'
-TARGETS = {
-  '.epub' => '/sdcard/',
-  '.mobi' => '/sdcard/Android/data/com.amazon.kindle/files/'
-}.freeze
-
-unless File.executable? ADB
-  warn %(adb-push-ebook: `adb` not found.\nPlease set the ADB environment variable or add `adb` to your PATH.)
-  exit 1
-end
-
-require 'open3'
-require 'shellwords'
-
-payload_file = ARGV[0] || '_output/sample-book'
-
-transfers = if (payload_file_ext = File.extname payload_file).empty?
-              TARGETS.map do |(ext, target_dir)|
-                {
-                  src: %(#{payload_file}#{ext}),
-                  dest: target_dir
-                }
-              end
-            else
-              [{ src: payload_file, dest: TARGETS[payload_file_ext] }]
-            end
-
-transfers.each do |transfer|
-  next unless File.file? transfer[:src]
-
-  Open3.popen2e Shellwords.join([ADB, 'push', transfer[:src], transfer[:dest]]) do |_input, output, _wait_thr|
-    output.each { |line| puts line }
-  end
-end