softcover 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422073d0447a4a4f67ca05c9c40212c00a95cab7
-  data.tar.gz: 0ab90e2e4ca705ec2ea76037f916a3c1de498405
+  metadata.gz: 1795e8080e63ce874821e57234085123e4781f2b
+  data.tar.gz: 6afb948de742c1c8533e4aaa1e7b0ffd86fcdb6c
 SHA512:
-  metadata.gz: 0c3f8a256a257cb73e693494385c9c8a2190e57c87f79c637cb0ba23cb992fe6157276cbe186ba50a59f10d588986e5ed15c43498e055e2e79cd1afe1c872d25
-  data.tar.gz: 8b6f23744c5868cb6408f9ac2c47fef76182ed43f9cbf35f26faf2587ed2d6819956bb15fae4de043518366de62224a75b88aca1e336fe2805522a9ef52c38f7
+  metadata.gz: 5b400bfba389dc46e7732d0ce0c50f4b3229bb0eb2d01bb95d2697b1bf1ac090bdd4db5bec4128364698629f559bee1a5a469b75dcde2c3cc500f7884253ef38
+  data.tar.gz: bb1aaaa43181f8f3a8a59cb2979cb4ac968b3323b6189cf235380a078bb9bb7bd8f2f95c3ca1356af69809d4922f03f1fe68aa695ead954e13d6374b9f2e6fb1

data/lib/softcover/builders/epub.rb

@@ -311,6 +311,14 @@ module Softcover
           # Save the SVG file.
           svg['viewBox'] = svg['viewbox']
           svg.remove_attribute('viewbox')
+          # 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['style'] += ' height:'+svg_height+';' + ' width:'+svg_width+';'
+          svg.remove_attribute('height')
+          svg.remove_attribute('width')
+          # /Workaround
           first_child = frame.children.first
           first_child.replace(svg) unless svg == first_child
           output = svg.to_xhtml
@@ -322,25 +330,20 @@ module Softcover
           png_abspath = svg_abspath.sub('.svg', '.png')
           pngs << png_filename
           #
-          # Settings for inline math in ePub / mobi
+          # 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.
-          # These are used a three-step process below: Extract, Convert, Replace
-          # STEP1: Extract information from svg tag.
-          svg_height = svg['height']
-          if svg_height
-            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'
-          end
-          # Extract vertical-align css proprty for for inline math.
+          # These are used a three-step process below: Compute, Convert, Replace
+          # STEP1: compute height and vertical-align in `em` 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
             if vertical_align
               valign_in_ex = Float(vertical_align.gsub('ex',''))
-              valign_in_ex += 0.1155  # correction factor for MathJax 1px margin
-              # png vertical-align in ems is the css equivalent of depth in TeX
               png_valign = (valign_in_ex * ex2em_valign_scaling).to_s + 'em'
             else
               png_valign = "0em"
@@ -348,7 +351,7 @@ module Softcover
           else # No vertical align for displayed math
             png_valign = nil
           end
-          # STEP2: Generate PNG from each SVG (if necessary).
+          # 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]

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/spec/builders/epub_spec.rb

@@ -14,7 +14,10 @@ describe Softcover::Builders::Epub do
 
   it "should be valid" do
     output = `softcover epub:validate`
-    expect(output).to match(/No errors or warnings/)
+    english = "No errors or warnings"
+    # I (mhartl) sometimes set my system language to Spanish.
+    spanish = "No se han detectado errores o advertencias"
+    expect(output).to match(/(#{english}|#{spanish})/)
   end
 
   describe "mimetype file" do
@@ -173,6 +176,12 @@ describe Softcover::Builders::Epub do
         expect(Dir[path("epub/OEBPS/images/texmath/*.png")]).not_to be_empty
       end
 
+      it "math PNGs shouldn't be too small (regression test for empty PNGs)" do
+        Dir[path("epub/OEBPS/images/texmath/*.png")].each do |pngfile|
+           expect(File.size(pngfile)).to be > 500
+        end
+      end
+
       it "should record vertical-align of inline math SVGs" do
         content = File.read(path("./epub/OEBPS/a_chapter_fragment.xhtml"))
         html = Nokogiri::HTML(content)
@@ -224,7 +233,11 @@ describe Softcover::Builders::Epub do
     subject(:builder) { @builder }
 
     it "should be valid" do
-      expect(`softcover epub:validate`).to match(/No errors or warnings/)
+      output = `softcover epub:validate`
+      english = "No errors or warnings"
+      # I (mhartl) sometimes set my system language to Spanish.
+      spanish = "No se han detectado errores o advertencias"
+      expect(output).to match(/(#{english}|#{spanish})/)
     end
 
     it "should not raise an error" do
@@ -307,7 +320,10 @@ describe "article validation" do
 
   it "should be valid" do
     output = `softcover epub:validate`
-    expect(output).to match(/No errors or warnings/)
+    english = "No errors or warnings"
+    # I (mhartl) sometimes set my system language to Spanish.
+    spanish = "No se han detectado errores o advertencias"
+    expect(output).to match(/(#{english}|#{spanish})/)
   end
 
   it "should description" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic
@@ -581,7 +581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: An ebook production system & sales and marketing platform for technical authors