asciidoctor-epub3 1.5.0.alpha.4 → 1.5.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4c3e250ddf7c643c44a7aa9940d17cd24706d0f
-  data.tar.gz: 0d8e25c7b95f0f43f0b35f7bff7f29b9118dab3d
+  metadata.gz: 53cfac0ce0da69c5ac8b1b2a207ab0ff89cfd187
+  data.tar.gz: 069bcd8227164ddc01bc2cd161b65ae7b3fe0c2e
 SHA512:
-  metadata.gz: ce25c7aefb5de19aa8ee2d720581c92ca9ecbb0949538adcc05f92a6cd6f969c3290ffc884e3be60710e89200d3933e461d9aefdbc0577b61e00ec5e19896e48
-  data.tar.gz: 17d675e8e9d17999242251385a24b5e8dfab0b10981e3ddd0c23638f1ac9ab84383fdc67e98024214be50dbbd7e5dcccd2d9a2cf783404907cb04c65fc20cf68
+  metadata.gz: 0d6f85f5787589c0015ff134ad61ec92ae70fff3d2a4a3ec14f7298e76b6ef198eda072e638d86373569a8b725578afaddba2505e491d3b4a7b647fe496dfbdc
+  data.tar.gz: 6c3f1e30f7aef5b2d858834eb36c215681ef6f9a1feb48c5f108ba05c439eae4ee06665208f5780dc8f409d98dd6ba3b7b47d446255dfdf3efcb9d60d22e1305

data/LICENSE.adoc

@@ -1,6 +1,6 @@
 .The MIT License
 ....
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NOTICE.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor EPUB3
 
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project.
 
 Please visit the Asciidoctor project site for more information:
 

data/README.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor EPUB3: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v1.5.0.alpha.5, 2015-11-01
 :project-name: Asciidoctor EPUB3
 :project-handle: asciidoctor-epub3
 :project-uri: https://github.com/asciidoctor/{project-handle}
@@ -188,7 +189,7 @@ The build will report that it built the Gem into the [path]_pkg_ directory.
 
 Finally, install the Gem.
 
- $ gem install pkg/asciidoctor-epub3-1.0.0.dev.gem
+ $ gem install pkg/asciidoctor-epub3-1.5.0.dev.gem
 
 You're now ready to use {project-name}!
 Let's get an AsciiDoc document ready to convert to EPUB3.
@@ -727,7 +728,7 @@ Feel free to use the {project-issues-uri}[issue tracker] or http://discuss.ascii
 
 == Copyright
 
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
 For the full text of the license, see the {license-uri}[LICENSE.adoc] file.

data/bin/asciidoctor-epub3

@@ -1,12 +1,27 @@
 #!/usr/bin/env ruby
 
-require File.join File.dirname(__FILE__), '../lib/asciidoctor-epub3'
+require_relative '../lib/asciidoctor-epub3'
 require 'asciidoctor/cli'
 
 options = Asciidoctor::Cli::Options.new backend: 'epub3'
-# FIXME This is a really bizarre API. Please make me simpler.
-if (options.parse! ARGV) == 0
+
+# FIXME provide an API in Asciidoctor for sub-components to print version information
+unless ARGV != ['-v'] && (ARGV & ['-V', '--version']).empty?
+  require_relative '../lib/asciidoctor-epub3/version'
+  $stdout.write %(Asciidoctor EPUB3 #{Asciidoctor::Epub3::VERSION} using )
+  # NOTE the print_version method was added in Asciidoctor 1.5.2
+  if options.respond_to? :print_version
+    options.print_version
+  else
+    puts %(Asciidoctor #{::Asciidoctor::VERSION} [http://asciidoctor.org])
+  end
   exit 0
+end
+
+# FIXME This is a really bizarre API. Please make me simpler.
+case (result = options.parse! ARGV)
+when Integer
+  exit result
 else
   invoker = Asciidoctor::Cli::Invoker.new options
   GC.start

data/data/samples/asciidoctor-epub3-readme.adoc

@@ -1,5 +1,6 @@
 = Asciidoctor EPUB3: A _native_ EPUB3 converter for AsciiDoc
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
+v1.5.0.alpha.5, 2015-11-01
 :project-name: Asciidoctor EPUB3
 :project-handle: asciidoctor-epub3
 :project-uri: https://github.com/asciidoctor/{project-handle}
@@ -188,7 +189,7 @@ The build will report that it built the Gem into the [path]_pkg_ directory.
 
 Finally, install the Gem.
 
- $ gem install pkg/asciidoctor-epub3-1.0.0.dev.gem
+ $ gem install pkg/asciidoctor-epub3-1.5.0.dev.gem
 
 You're now ready to use {project-name}!
 Let's get an AsciiDoc document ready to convert to EPUB3.
@@ -727,7 +728,7 @@ Feel free to use the {project-issues-uri}[issue tracker] or http://discuss.ascii
 
 == Copyright
 
-Copyright (C) 2014 OpenDevise Inc. and the Asciidoctor Project.
+Copyright (C) 2014-2015 OpenDevise Inc. and the Asciidoctor Project.
 Free use of this software is granted under the terms of the MIT License.
 
 For the full text of the license, see the {license-uri}[LICENSE.adoc] file.

data/lib/asciidoctor-epub3/converter.rb

@@ -33,8 +33,7 @@ class Converter
 
   # FIXME we have to package in write because we don't have access to target before this point
   def write packager, target
-    # NOTE we use dirname of target since filename is calculated automatically
-    packager.package validate: @validate, extract: @extract, to_dir: (::File.dirname target)
+    packager.package validate: @validate, extract: @extract, target: target
     nil
   end
 end
@@ -315,6 +314,12 @@ document.addEventListener('DOMContentLoaded', function(event) {
 </div>)
   end
 
+  def floating_title node
+    tag_name = %(h#{node.level + 1})
+    id_attribute = node.id ? %( id="#{node.id}") : nil
+    %(<#{tag_name}#{id_attribute} class="#{['discrete', node.role].compact * ' '}">#{node.title}</#{tag_name}>)
+  end
+
   def listing node
     figure_classes = ['listing']
     figure_classes << 'coalesce' if node.option? 'unbreakable'

data/lib/asciidoctor-epub3/packager.rb

@@ -313,8 +313,7 @@ end
 class Packager
   KINDLEGEN = ENV['KINDLEGEN'] || 'kindlegen'
   EPUBCHECK = ENV['EPUBCHECK'] || %(epubcheck#{::Gem.win_platform? ? '.bat' : '.sh'})
-  EpubExtensionRx = /\.epub$/
-  Kf8ExtensionRx = /-kf8\.epub$/
+  EpubExtensionRx = /\.epub$/i
 
   def initialize spine_doc, spine, format = :epub3, options = {}
     @document = spine_doc
@@ -326,7 +325,8 @@ class Packager
     doc = @document
     spine = @spine
     fmt = @format
-    dest = @dest_dir = options[:to_dir] || (File.expand_path ::Dir.pwd)
+    target = options[:target]
+    dest = File.dirname target
 
     images = spine.map {|item| (item.find_by context: :image) || [] }.flatten
     usernames = spine.map {|item| item.attr 'username' }.compact.uniq
@@ -424,9 +424,9 @@ class Packager
 
     ::FileUtils.mkdir_p dest unless ::File.directory? dest
 
-    epub_file = ::File.expand_path %(#{doc.attr 'docname'}#{fmt == :kf8 ? '-kf8' : nil}.epub), dest
+    epub_file = fmt == :kf8 ? %(#{::Asciidoctor::Helpers.rootname target}-kf8.epub) : target
     builder.generate_epub epub_file
-    puts %(Wrote #{fmt.upcase} to #{epub_file})
+    puts %(Wrote #{fmt.upcase} to #{epub_file}) if $VERBOSE
     if options[:extract]
       extract_dir = epub_file.sub EpubExtensionRx, ''
       ::FileUtils.remove_dir extract_dir if ::File.directory? extract_dir
@@ -442,28 +442,28 @@ class Packager
           end
         end
       end
-      puts %(Extracted #{fmt.upcase} to #{extract_dir})
+      puts %(Extracted #{fmt.upcase} to #{extract_dir}) if $VERBOSE
     end
 
     if fmt == :kf8
-      distill_epub_to_mobi epub_file
+      distill_epub_to_mobi epub_file, target
     elsif options[:validate]
       validate_epub epub_file
     end
   end
 
   # QUESTION how to enable the -c2 flag? (enables ~3-5% compression)
-  def distill_epub_to_mobi epub_file
+  def distill_epub_to_mobi epub_file, target
     kindlegen_cmd = KINDLEGEN
     unless ::File.executable? kindlegen_cmd
       require 'kindlegen' unless defined? ::Kindlegen
       kindlegen_cmd = ::Kindlegen.command
     end
-    mobi_file = ::File.basename(epub_file).sub Kf8ExtensionRx, '.mobi'
+    mobi_file = ::File.basename(target.sub EpubExtensionRx, '.mobi')
     ::Open3.popen2e(::Shellwords.join [kindlegen_cmd, '-o', mobi_file, epub_file]) {|input, output, wait_thr|
-      output.each {|line| puts line }
+      output.each {|line| puts line } unless $VERBOSE.nil?
     }
-    puts %(Wrote MOBI to #{::File.join ::File.dirname(epub_file), mobi_file})
+    puts %(Wrote MOBI to #{::File.join ::File.dirname(epub_file), mobi_file}) if $VERBOSE
   end
 
   def validate_epub epub_file
@@ -473,7 +473,7 @@ class Packager
     end
     # NOTE epubcheck gem doesn't support epubcheck command options; enable -quiet once supported
     ::Open3.popen2e(::Shellwords.join [epubcheck_cmd, epub_file]) {|input, output, wait_thr|
-      output.each {|line| puts line }
+      output.each {|line| puts line } unless $VERBOSE.nil?
     }
   end
 end

data/lib/asciidoctor-epub3/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
 module Epub3
-  VERSION = '1.5.0.alpha.4'
+  VERSION = '1.5.0.alpha.5'
 end
 end

data/scripts/generate-font-subsets.pe

@@ -27,7 +27,7 @@
 # FIXME: need to generate cjk font
 
 genflags = 0x08
-#genflags = 0x18
+#genflags = 0x10 + 0x08
 copy_fonts = ["NotoSerif-Regular.ttf", "NotoSerif-Bold.ttf", "NotoSerif-Italic.ttf", "NotoSerif-BoldItalic.ttf", "mplus-1p-regular.ttf", "mplus-1p-bold.ttf", "mplus-1p-light.ttf"]
 #copy_fonts = ["NotoSerif-Regular.ttf", "NotoSerif-Bold.ttf", "NotoSerif-Italic.ttf", "NotoSerif-BoldItalic.ttf"]
 #copy_fonts = ["LiberationMono-Regular.ttf", "LiberationMono-Bold.ttf", "LiberationMono-Italic.ttf", "LiberationMono-BoldItalic.ttf"]
@@ -40,6 +40,8 @@ num_copy_scripts = SizeOf(copy_scripts)
 code_fonts = ["mplus-1mn-light.ttf", "mplus-1mn-regular.ttf", "mplus-1mn-medium.ttf", "mplus-1mn-bold.ttf"]
 #code_fonts = []
 num_code_fonts = SizeOf(code_fonts)
+code_script = "ascii"
+#code_script = "multilingual"
 if ($argc == 2)
   output_dir = $argv[1]
 else
@@ -155,26 +157,28 @@ while (fi < num_code_fonts)
   new_basename = code_fonts[fi]:r
   # remove hyphen from mplus-1
   new_basename = "mplus1" + StrJoin(StrSplit(new_basename, "mplus-1"), "")
-  new_suffix = "-ascii.ttf"
+  new_suffix = "-" + code_script + ".ttf"
   Open(code_fonts[fi])
   SelectAll()
   # NOTE: M+ fonts don't have hinting, so technically this is redundant
   ClearInstrs()
   SelectNone()
-  # Basic Latin (e.g., Code)
-  SelectMore(0u0020,0u007e)
-  # No-break space
-  SelectMore(0u00a0)
-  # Box drawing symbols for unix `tree` output
-  SelectMore(0u2500,0u257f)
-  if (new_basename == "mplus1mn-regular")
-    # Enclosed numbers (1-20)
-    SelectMore(0u2460,0u2473)
-    new_suffix = "-ascii-conums.ttf"
+  if (code_script == "ascii")
+    # Basic Latin (e.g., Code)
+    SelectMore(0u0020,0u007e)
+    # No-break space
+    SelectMore(0u00a0)
+    # Box drawing symbols for unix `tree` output
+    SelectMore(0u2500,0u257f)
+    if (new_basename == "mplus1mn-regular")
+      # Enclosed numbers (1-20)
+      SelectMore(0u2460,0u2473)
+      new_suffix = "-ascii-conums.ttf"
+    endif
+    SelectInvert()
+    Clear()
+    SelectNone()
   endif
-  SelectInvert()
-  Clear()
-  SelectNone()
   SetFontNames(new_basename, "M+ 1mn")
   # repurpose light as italic
   if (new_basename == "mplus1mn-light")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-epub3
 version: !ruby/object:Gem::Version
-  version: 1.5.0.alpha.4
+  version: 1.5.0.alpha.5
 platform: ruby
 authors:
 - Dan Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 description: |
   An extension for Asciidoctor that converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book archives.
 email: dan@opendevise.io
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Converts AsciiDoc documents to EPUB3 and KF8/MOBI (Kindle) e-book formats