softcover 1.5.11 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9271b77de55b41ba59269be86695d5f07b8d680e9e563d29a0a616559c7905e9
-  data.tar.gz: caf61a0d47c3fe3bfbe90496529cc30457b95fa8b40961afc125ccffbc071131
+  metadata.gz: 886ab5a917abf3257be857060db1093474d3c7f44f8beecc1efbf06aed972862
+  data.tar.gz: aff32e009c3e4ca5098394186602116b6c6fc63c87cadd73c9ab5bd96f2cae95
 SHA512:
-  metadata.gz: a2c9a933f1262b686c43dc6babd675996fc17ce7e620f0b9e8308001e770b931af34189ef6af51a3e619a5440dc6529ee026b226a8d9e542749cbacc9ee9f771
-  data.tar.gz: 53a6989b47ff4ad782a6c796f25e2c59863bdf2694b2696ede22064182fb674c91d5a8dc29722e6740a8b747e9b8cba35452321be9e3809eb2a0093808238c55
+  metadata.gz: cdce663475b349497cdb1aa53f472d26ccf8f9043fcdde5590ff46ea73c33692dd54b766810e3c31b1386876f2f71a1fd2e445a8063d0bd403fb1105955b5c9a
+  data.tar.gz: 20c08b57bb53e0e0189096b60f8fe33a665129b4ea7980d51d899c184cead1ec7b262f9044bdd8ac7989e5ac7ec90cbe4c3c24476f94028c9936b244ebda7c1f

data/.circleci/config.yml

@@ -20,10 +20,8 @@ jobs:
               sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh
               echo 'export PATH=$PATH:`echo ~`' >> $BASH_ENV
               curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip && unzip epubcheck-4.0.2.zip -d ~
-              curl -o ~/kindlegen http://softcover-binaries.s3.amazonaws.com/kindlegen && chmod +x ~/kindlegen
-              wget https://softcover-static.s3.amazonaws.com/Bodoni%2072%20Smallcaps%20Book.ttf && sudo cp 'Bodoni 72 Smallcaps Book.ttf' /usr/share/fonts/truetype/bodoni-classic
               sudo fc-cache -fsv
-          # gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, kindlegen issus
+          # gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, issus
       - ruby/bundle-install
       - run:
           name: specs

data/.travis.yml

@@ -12,9 +12,8 @@ before_install:
   - sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh
   - export PATH=$PATH:`echo ~`
   - curl -O -L https://github.com/IDPF/epubcheck/releases/download/v4.0.2/epubcheck-4.0.2.zip && unzip epubcheck-4.0.2.zip -d ~
-  - curl -o ~/kindlegen http://softcover-binaries.s3.amazonaws.com/kindlegen && chmod +x ~/kindlegen
   - wget https://softcover-static.s3.amazonaws.com/Bodoni%2072%20Smallcaps%20Book.ttf && sudo cp 'Bodoni 72 Smallcaps Book.ttf' /usr/share/fonts/truetype/bodoni-classic
   - sudo fc-cache -fsv
-  #  - gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, kindlegen issus
+  #  - gem i softcover && softcover check # NOTE: enable to troubleshoot tex, gs, calibre, epubcheck, issus
 
-script: "bundle exec rspec -f d"
+script: "bundle exec rspec -f d"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    softcover (1.5.11)
+    softcover (1.6.0)
       activesupport (~> 4.2.3)
       async_sinatra (~> 1.1.0)
       coffee-script (>= 2.2.0)
@@ -82,7 +82,7 @@ GEM
     msgpack (1.2.10)
     multi_json (1.14.1)
     netrc (0.11.0)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri

data/lib/softcover/builders/epub.rb

@@ -229,8 +229,9 @@ module Softcover
         texmath_dir = File.join(images_dir, 'texmath')
         mkdir images_dir
         mkdir texmath_dir
-
-        File.write(path("epub/OEBPS/#{cover_filename}"), cover_page) if cover?(options)
+        if cover?(options)
+          File.write(path("epub/OEBPS/#{cover_filename}"), cover_page)
+        end
 
         pngs = []
         chapters.each_with_index do |chapter, i|
@@ -314,7 +315,7 @@ module Softcover
           # Workaround for bug in Inkscape 0.91 on MacOS X:
           # extract height/width from svg attributes and move them to style attr
           svg_height = svg['height']  # in ex
-          svg_width = svg['width']    # in ex
+          svg_width  = svg['width']   # in ex
           svg['style'] += ' height:'+svg_height+';' + ' width:'+svg_width+';'
           svg.remove_attribute('height')
           svg.remove_attribute('width')
@@ -323,25 +324,26 @@ module Softcover
           first_child.replace(svg) unless svg == first_child
           output = svg.to_xhtml
           svg_filename = File.join(texmath_dir, "#{digest(output)}.svg")
-          svg_abspath = File.join("#{Dir.pwd}", svg_filename)
+          svg_abspath  = File.join("#{Dir.pwd}", svg_filename)
           File.write(svg_filename, output)
           # Convert to PNG named:
           png_filename = svg_filename.sub('.svg', '.png')
-          png_abspath = svg_abspath.sub('.svg', '.png')
+          png_abspath  = svg_abspath.sub('.svg', '.png')
           pngs << png_filename
           #
           # Settings for texmath images in ePub / mobi
           ex2em_height_scaling = 0.51     # =1ex/1em for math png height
           ex2em_valign_scaling = 0.481482 # =1ex/1em for math png vertical-align
-          ex2pt_scale_factor = 15         # =1ex/1pt scaling for SVG-->PNG conv.
+          ex2px_scale_factor   = 20       # =1ex/1px scaling for SVG-->PNG conv.
           # These are used a three-step process below: Compute, Convert, Replace
-          # STEP1: compute height and vertical-align in `em` units
+          # STEP1: compute height and vertical-align in `ex` units
           svg_height_in_ex = Float(svg_height.gsub('ex',''))
           # MathJax sets SVG height in `ex` units but we want `em` units for PNG
           png_height = (svg_height_in_ex * ex2em_height_scaling).to_s + 'em'
           # Extract vertical-align css proprty for inline math equations:
           if svg.parent.parent.attr('class') == "inline_math"
-            vertical_align = svg['style'].scan(/vertical-align: (.*?);/).flatten.first
+            vertical_align = svg['style'].scan(/vertical-align: (.*?);/)
+            vertical_align = vertical_align.flatten.first
             if vertical_align
               valign_in_ex = Float(vertical_align.gsub('ex',''))
               png_valign = (valign_in_ex * ex2em_valign_scaling).to_s + 'em'
@@ -353,24 +355,27 @@ module Softcover
           end
           # STEP2: Generate PNG from each SVG (unless PNG exists already).
           unless File.exist?(png_filename)
-            h = ex2pt_scale_factor * svg_height_in_ex       # = PNG height in pt
             unless options[:silent] || options[:quiet]
               puts "Creating #{png_filename}"
             end
-            # generate png from the MathJax_SVG using inkscape
-            cmd = "#{inkscape} -f #{svg_abspath} -e #{png_abspath} -h #{h}pt"
+            # Generate png from the MathJax_SVG using Inkscape
+            # Use the -d option to get a sensible size:
+            #   Resolution for bitmaps and rasterized filters
+            cmd = "#{inkscape} #{svg_abspath} -o #{png_abspath} -d 2"
             if options[:silent]
               silence { silence_stream(STDERR) { system cmd } }
             else
+              puts cmd
               silence_stream(STDERR) { system cmd }
             end
           end
           rm svg_filename
           # STEP 3: Replace svg element with an equivalent png.
           png = Nokogiri::XML::Node.new('img', source)
-          png['src']    = File.join('images', 'texmath', File.basename(png_filename))
-          png['alt']    = png_filename.sub('.png', '')
-          png['style']  = 'height:' + png_height + ';'
+          png['src']   = File.join('images', 'texmath',
+                                   File.basename(png_filename))
+          png['alt']   = png_filename.sub('.png', '')
+          png['style'] = 'height:' + png_height + ';'
           if png_valign
             png['style'] += ' vertical-align:' + png_valign + ';'
           end

data/lib/softcover/builders/mobi.rb

@@ -24,12 +24,8 @@ module Softcover
       # Returns the command for making a MOBI, based on the options.
       def mobi_command(filename, options={})
         silent = options[:silent] || Softcover.test?
-        if options[:kindlegen] || options[:amazon]
-          cmd = "#{kindlegen} ebooks/#{filename}.epub"
-        else
-          cmd = "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.mobi" +
-                " #{calibre_options}"
-        end
+        cmd = "#{calibre} ebooks/#{filename}.epub ebooks/#{filename}.mobi" +
+              " #{calibre_options}"
         puts cmd unless (options[:quiet] || silent)
         cmd
       end
@@ -57,10 +53,6 @@ module Softcover
           end
           opts.join(" ")
         end
-
-        def kindlegen
-          @kindlegen ||= executable(dependency_filename(:kindlegen))
-        end
     end
   end
-end
+end

data/lib/softcover/cli.rb

@@ -45,9 +45,6 @@ module Softcover
                                 desc: "Run PDF generator in nonstopmode",
                                 type: :boolean
       elsif format == 'mobi'
-        method_option :kindlegen, aliases: '-k',
-                                  desc: "Use KindleGen to build the MOBI",
-                                  type: :boolean
         method_option :amazon, aliases: '-a',
                                desc: "Build for Amazon KDP", type: :boolean
       end

data/lib/softcover/commands/check.rb

@@ -40,7 +40,6 @@ module Softcover
          [:phantomjs,   'PhantomJS'],
          [:inkscape,    'Inkscape'],
          [:calibre,     'Calibre'],
-         [:kindlegen,   'KindleGen'],
          [:java,        'Java'],
          [:zip,         'zip'],
          [:epubcheck,   'EpubCheck'],
@@ -71,11 +70,6 @@ module Softcover
           message = "PhantomJS (https://phantomjs.org/download.html)\n"
           message += "      ∟ Put bin/phantomjs version 2 somewhere on your path,"
           message += " e.g., in /usr/local/bin"
-        when :kindlegen
-          url = 'https://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211'
-          message = "KindleGen (#{url})\n"
-          message += "      ∟ Put the kindlegen executable on your path,"
-          message += " e.g., in /usr/local/bin"
         when :calibre
           url = 'https://calibre-ebook.com/'
           message  = "Calibre (#{url})\n"

data/lib/softcover/utils.rb

@@ -263,7 +263,7 @@ module Softcover::Utils
       version_4 = path('epubcheck-4.0.2/epubcheck.jar')
       first_path(version_4) || get_filename(:'epubcheck') || ""
     when :inkscape
-      default = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape'
+      default = '/Applications/Inkscape.app/Contents/MacOS/inkscape'
       filename_or_default(:inkscape, default)
     when :phantomjs
       phantomjs = get_filename(label)

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.5.11"
+  VERSION = "1.6.0"
 end

data/spec/builders/mobi_spec.rb

@@ -37,24 +37,6 @@ describe Softcover::Builders::Mobi do
         end
       end
 
-      context "kindlegen" do
-        let(:command) do
-          @builder.mobi_command(@builder.mobi_filename, kindlegen: true)
-        end
-        it "should use Amazon.com's kindlegen" do
-          expect(command).to include 'kindlegen'
-        end
-      end
-
-      context "amazon" do
-        let(:command) do
-          @builder.mobi_command(@builder.mobi_filename, amazon: true)
-        end
-        it "should use Amazon.com's kindlegen" do
-          expect(command).to include 'kindlegen'
-        end
-      end
-
       context "preview" do
         let(:filename) do
           @builder.mobi_filename(preview: true)

data/spec/cli_spec.rb

@@ -43,7 +43,6 @@ describe Softcover::CLI do
     subject { `softcover help build:mobi` }
     it { should include '-q, [--quiet]' }
     it { should include '-s, [--silent]' }
-    it { should include '-k, [--kindlegen]' }
     it { should include '-a, [--amazon]' }
   end
 
@@ -139,7 +138,6 @@ describe Softcover::CLI do
       context "command-line options" do
         subject(:options) { `softcover help build:mobi` }
         it { should_not include 'calibre' }
-        it { should     include 'kindlegen' }
       end
     end
   end

data/spec/commands/check_spec.rb

@@ -35,7 +35,6 @@ describe Softcover::Commands::Check do
     it { should match /Checking for PhantomJS.*Missing/ }
     it { should match /Checking for Inkscape.*Missing/ }
     it { should match /Checking for Calibre.*Missing/ }
-    it { should match /Checking for KindleGen.*Missing/ }
     it { should match /Checking for Java.*Missing/ }
     it { should match /Checking for EpubCheck.*Missing/ }
     it { should match /Checking for ImageMagick.*Missing/ }
@@ -46,7 +45,6 @@ describe Softcover::Commands::Check do
     it { should match /PhantomJS/ }
     it { should match /Inkscape/ }
     it { should match /Calibre/ }
-    it { should match /KindleGen/ }
     it { should match /Java/ }
     it { should match /EpubCheck/ }
     it { should match /ImageMagick/ }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.6.0
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic