ruby_docx_beta 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99ccdd54f179f199b1f41478c7b18506f19d71bb
-  data.tar.gz: 5c432614e8686204e10928e92561b95d3ebe8fbc
+  metadata.gz: a703b05a69c535820ab85d3ddda3d061581d0157
+  data.tar.gz: a1a0b4fbfa7bba150ca63852ac5be2ce7cc0eae4
 SHA512:
-  metadata.gz: df3ba0b3e0b12a9af5fba10a4e979d4cfa42b07a7b064863cbfd30bcf0431fd4c93c4eb648ea7093021e61942f78de98a3345789c665d53a5e06e75a2f6025ba
-  data.tar.gz: 13fc1175e4cf8b13245baee55bad10a95e83eec2a2946c43befe3a39d56d79f61421197f9e7785b042b3e19d13deec6e7393fe8e99659cd4805d12aa55f30475
+  metadata.gz: 7d3d433f41f4fe9e59ef36a864f13dc687f8f42b5033563336a62eba7730cdc921a175dd289c56f09cf4c0129739c40ab503895726572db7fa69b0a3a6571d0b
+  data.tar.gz: f159855b5215e38bf3e5685a627ca6933a2238e00a0e38e8cc5732cc44536e410ba7cc7f7ad6b63b05e51de823a6b615318995146a7ec527ac82d9a5ebf8a418

data/lib/ruby_docx/elements/equation.rb

@@ -1,5 +1,6 @@
 require 'texmath'
 require 'calculus'
+require "image_size"
 
 module RubyDocx::Elements
   class Equation < Element
@@ -31,6 +32,25 @@ module RubyDocx::Elements
       File.read(@path)
     end
 
+    def size
+      return @size if @size
+
+      sz = ImageSize.new(self.data)
+
+      @size = [sz.width/7.2, sz.height/7.2]
+    rescue
+      nil
+    end
+
+    def style
+      if self.size
+        "width: #{self.size[0]}px; height: #{self.size[0]}px;"
+      else
+        ""
+      end
+    end
+
+
     def data
       self.to_png
     end
@@ -51,9 +71,9 @@ module RubyDocx::Elements
 
     def to_html
       if @link
-        "<img src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='height: 13px;' />"
+        "<img class=\"Wirisformula\" role='math' src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='#{self.style}' />"
       else
-        "<img src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='height: 13px;' />"
+        "<img class=\"Wirisformula\" role='math' src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='#{self.style}' />"
       end
     end
 

data/lib/ruby_docx/elements/ole_object.rb

@@ -26,14 +26,14 @@ module RubyDocx::Elements
     attr_accessor :path, :zip, :link
     attr_accessor :image_path
 
-    def style
-      element = @node.xpath(".//v:shape").first
-      if element && element.attributes.keys.index("style")
-        element.attributes["style"].value
-      else
-        nil
-      end
-    end
+    # def style
+    #   element = @node.xpath(".//v:shape").first
+    #   if element && element.attributes.keys.index("style")
+    #     element.attributes["style"].value
+    #   else
+    #     nil
+    #   end
+    # end
 
     def relation_id
       element = @node.xpath(".//o:OLEObject").first
@@ -70,6 +70,24 @@ module RubyDocx::Elements
       "data:image/png;base64,#{Base64.strict_encode64(self.to_png)}"
     end
 
+    def size
+      return @size if @size
+
+      sz = ImageSize.new(self.data)
+
+      @size = [sz.width/7.2, sz.height/7.2]
+    rescue
+      nil
+    end
+
+    def style
+      if self.size
+        "width: #{self.size[0]}px; height: #{self.size[0]}px;"
+      else
+        nil
+      end
+    end
+
     def save(path)
       file = File.new(path, "wb")
       file.write(self.to_png)
@@ -83,16 +101,16 @@ module RubyDocx::Elements
     def to_html
       if self.style
         if @link
-          "<img src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='#{self.style}' />"
+          "<img class=\"Wirisformula\" role='math' src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='#{self.style}' />"
         else
-          "<img src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='#{self.style}' />"
+          "<img class=\"Wirisformula\" role='math' src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='#{self.style}' />"
         end
 
       else
         if @link
-          "<img src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='height: 13px;' />"
+          "<img class=\"Wirisformula\" role='math' src='#{@link}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='height: 13px;' />"
         else
-          "<img src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml}\" style='height: 13px;' />"
+          "<img class=\"Wirisformula\" role='math' src='#{self.base64_data}' data-latex=\"#{self.to_latex}\" data-mathml=\"#{self.to_mathml.gsub("\n", "").gsub("<", "«").gsub(">", "»").gsub("\"", "¨")}\" style='height: 13px;' />"
         end
       end
 

data/lib/ruby_docx/version.rb

@@ -1,3 +1,3 @@
 module RubyDocx
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/ruby_docx.gemspec

@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'calculus'
   spec.add_dependency 'mathtype'
   spec.add_dependency 'pry'
+  spec.add_dependency 'image_size'
   spec.add_dependency 'mathtype_to_mathml'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_docx_beta
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Joey Lin
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mathtype_to_mathml
   requirement: !ruby/object:Gem::Requirement