standard-procedure-consolidate 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cbb574bced054ba32f67038b7f91eed28836470eb0d40e7bbbbcaefdca41142
-  data.tar.gz: 64438e3b31ea879c4c10d42afa08873a44528ec89ba60d3e248c07baf1bd028b
+  metadata.gz: f54b1e9134c3e9ec1a9a87ba47dd0a0842e430f9bc2ad2801fdaaecb6d4784c1
+  data.tar.gz: 881e583371a1cc58b7742ea74cb90e47b934198d03a6d76d538a7c48330378cf
 SHA512:
-  metadata.gz: 947a488ad5d98514589cbaa9495cd7970e7821832a05f74719821d9423785fc9e04f2563b7c4c4c34e5c5c25c32c6a1fd175cbd862e247cdfc2e8612663412b4
-  data.tar.gz: cc6e12303d7abea0be365df9c443d868d18bc658f3696488a6826ce83b93cfd17e588aecc6f3af94a9ac46e9621bc483800effd44e37b550dc752767757fe9fc
+  metadata.gz: a48b68b17ba644b23b4bd81ff30a195260a00343aeba22cfcfd77151e1d22f4d13dff7b54409d87737b9610f888fd574b624a4aac5bcd3c114500be3626f9267
+  data.tar.gz: 14acf38a2067475f7a5cd25e2783aed5f2299d764b051906c833dba4d1ae4f515ab2929606990bdb87da74a139aa587ef23682d5297d896a6f9293d6c16dcdd1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# [0.4.3] - 2025-02-24
+
+Use wp:anchor tags instead of wp:inline tags for embedding images
+
 # [0.4.1] - 2024-12-18
 
 Replace image merge fields with blanks if the image data is not provided 

data/checksums/standard-procedure-consolidate-0.4.3.gem.sha512

@@ -0,0 +1 @@
+646e5a14ad25738c476cb587c9012fff12687fc7e26e555b6d17a61d69ae1477bdf1a55326b952bbc05dde988d945c3a9504ebeb58b2ff6598c10be5be26c6cb

data/checksums/standard-procedure-consolidate-0.4.4.gem.sha512

@@ -0,0 +1 @@
+c1a13d3d2b2c50741b839e2ca20c730b2689fac090e9c67660950a506ce83b3b9e07e31f3de205ec67dcbf4b1eff462f8fc507468fdb378e864e9a5952b9decf

data/lib/consolidate/docx/image.rb

@@ -18,15 +18,16 @@ module Consolidate
       # Convert height from pixels to EMU
       def height = super * emu_per_height_pixel
 
-      # Get the width of this image in EMU up to a maximum page width (also in EMU)
-      def clamped_width(maximum = 7_772_400) = [width, maximum].min
+      def emu_per_width_pixel = EMU_PER_PIXEL * 72 / dpi[:x]
 
-      # Get the height of this image in EMU adjusted for a maximum page width (also in EMU)
-      def clamped_height(maximum = 7_772_400) = (height * clamped_width(maximum).to_f / width.to_f).to_i
+      def emu_per_height_pixel = EMU_PER_PIXEL * 72 / dpi[:y]
 
-      def emu_per_width_pixel = 914_400 / dpi[:x]
-
-      def emu_per_height_pixel = 914_400 / dpi[:y]
+      DEFAULT_PAGE_WIDTH = 12_240
+      TWENTIETHS_OF_A_POINT_TO_EMU = 635
+      DEFAULT_PAGE_WIDTH_IN_EMU = DEFAULT_PAGE_WIDTH * TWENTIETHS_OF_A_POINT_TO_EMU
+      EMU_PER_PIXEL = 9525
+      DEFAULT_PAGE_HEIGHT = DEFAULT_PAGE_WIDTH * 11 / 8.5 # Assuming US Letter size
+      DEFAULT_PAGE_HEIGHT_IN_EMU = DEFAULT_PAGE_HEIGHT * TWENTIETHS_OF_A_POINT_TO_EMU
     end
   end
 end

data/lib/consolidate/docx/image_reference_node_builder.rb

@@ -12,27 +12,58 @@ module Consolidate
 
         Nokogiri::XML::Node.new("w:drawing", document).tap do |drawing|
           drawing["xmlns:a"] = "http://schemas.openxmlformats.org/drawingml/2006/main"
-          drawing << Nokogiri::XML::Node.new("wp:inline", document).tap do |inline|
-            inline["distT"] = "0"
-            inline["distB"] = "0"
-            inline["distL"] = "0"
-            inline["distR"] = "0"
-            inline << Nokogiri::XML::Node.new("wp:extent", document).tap do |extent|
+          drawing << Nokogiri::XML::Node.new("wp:anchor", document).tap do |anchor|
+            anchor["behindDoc"] = "0"
+            anchor["distT"] = "0"
+            anchor["distB"] = "0"
+            anchor["distL"] = "0"
+            anchor["distR"] = "0"
+            anchor["simplePos"] = "0"
+            anchor["locked"] = "0"
+            anchor["layoutInCell"] = "0"
+            anchor["allowOverlap"] = "1"
+            anchor["relativeHeight"] = "2"
+            anchor << Nokogiri::XML::Node.new("wp:simplePos", document).tap do |pos|
+              pos["x"] = "0"
+              pos["y"] = "0"
+            end
+            anchor << Nokogiri::XML::Node.new("wp:positionH", document).tap do |posh|
+              posh["relativeFrom"] = "column"
+              posh << Nokogiri::XML::Node.new("wp:align", document).tap do |align|
+                align.content = "center"
+              end
+            end
+            anchor << Nokogiri::XML::Node.new("wp:positionV", document).tap do |posv|
+              posv["relativeFrom"] = "paragraph"
+              posv << Nokogiri::XML::Node.new("wp:posOffset", document).tap do |offset|
+                offset.content = "635"
+              end
+            end
+            anchor << Nokogiri::XML::Node.new("wp:extent", document).tap do |extent|
               extent["cx"] = scaled_width
               extent["cy"] = scaled_height
             end
-            inline << Nokogiri::XML::Node.new("wp:effectExtent", document).tap do |effect_extent|
+            anchor << Nokogiri::XML::Node.new("wp:effectExtent", document).tap do |effect_extent|
               effect_extent["l"] = "0"
               effect_extent["t"] = "0"
               effect_extent["r"] = "0"
               effect_extent["b"] = "0"
             end
-            inline << Nokogiri::XML::Node.new("wp:cNvGraphicFramePr", document).tap do |c_nv_graphic_frame_pr|
+            anchor << Nokogiri::XML::Node.new("wp:wrapSquare", document).tap do |wrap_square|
+              wrap_square["wrapText"] = "largest"
+            end
+            anchor << Nokogiri::XML::Node.new("wp:docPr", document).tap do |doc_pr|
+              doc_pr["id"] = image_number
+              doc_pr["name"] = image.name
+              doc_pr["descr"] = ""
+              doc_pr["title"] = ""
+            end
+            anchor << Nokogiri::XML::Node.new("wp:cNvGraphicFramePr", document).tap do |c_nv_graphic_frame_pr|
               c_nv_graphic_frame_pr << Nokogiri::XML::Node.new("a:graphicFrameLocks", document).tap do |graphic_frame_locks|
                 graphic_frame_locks["noChangeAspect"] = true
               end
             end
-            inline << Nokogiri::XML::Node.new("a:graphic", document).tap do |graphic|
+            anchor << Nokogiri::XML::Node.new("a:graphic", document).tap do |graphic|
               graphic["xmlns:a"] = "http://schemas.openxmlformats.org/drawingml/2006/main"
               graphic << Nokogiri::XML::Node.new("a:graphicData", document).tap do |graphic_data|
                 graphic_data["uri"] = "http://schemas.openxmlformats.org/drawingml/2006/picture"
@@ -44,7 +75,12 @@ module Consolidate
                       c_nv_pr["name"] = image.name
                       c_nv_pr["descr"] = image.name
                       c_nv_pr["hidden"] = false
-                      c_nv_pr << Nokogiri::XML::Node.new("pic:cNvPicPr", document)
+                      c_nv_pr << Nokogiri::XML::Node.new("pic:cNvPicPr", document).tap do |c_nv_pic_pr|
+                        c_nv_pic_pr << Nokogiri::XML::Node.new("a:picLocks", document).tap do |pic_locks|
+                          pic_locks["noChangeAspect"] = "1"
+                          pic_locks["noChangeArrowheads"] = "1"
+                        end
+                      end
                     end
                   end
                   pic << Nokogiri::XML::Node.new("pic:blipFill", document).tap do |blip_fill|
@@ -56,6 +92,7 @@ module Consolidate
                     end
                   end
                   pic << Nokogiri::XML::Node.new("pic:spPr", document).tap do |sp_pr|
+                    sp_pr["bwMode"] = "auto"
                     sp_pr << Nokogiri::XML::Node.new("a:xfrm", document).tap do |xfrm|
                       xfrm << Nokogiri::XML::Node.new("a:off", document).tap do |off|
                         off["x"] = "0"
@@ -70,6 +107,7 @@ module Consolidate
                       prst_geom["prst"] = "rect"
                       prst_geom << Nokogiri::XML::Node.new("a:avLst", document)
                     end
+                    sp_pr << Nokogiri::XML::Node.new("a:noFill", document)
                   end
                 end
               end
@@ -78,24 +116,17 @@ module Consolidate
         end
       end
 
-      DEFAULT_PAGE_WIDTH = 12_240
-      TWENTIETHS_OF_A_POINT_TO_EMU = 635
-      DEFAULT_PAGE_WIDTH_IN_EMU = DEFAULT_PAGE_WIDTH * TWENTIETHS_OF_A_POINT_TO_EMU
-      EMU_PER_PIXEL = 9525
-      DEFAULT_PAGE_HEIGHT = DEFAULT_PAGE_WIDTH * 11 / 8.5 # Assuming standard page ratio
-      DEFAULT_PAGE_HEIGHT_IN_EMU = DEFAULT_PAGE_HEIGHT * TWENTIETHS_OF_A_POINT_TO_EMU
-
       private def max_width_from document
-        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || DEFAULT_PAGE_WIDTH).to_i
-        page_width * TWENTIETHS_OF_A_POINT_TO_EMU
+        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || Image::DEFAULT_PAGE_WIDTH).to_i
+        page_width * Image::TWENTIETHS_OF_A_POINT_TO_EMU
       end
 
       private def max_dimensions_from(document)
-        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || DEFAULT_PAGE_WIDTH).to_i
-        page_height = (document.at_xpath("//w:sectPr/w:pgSz/@w:h")&.value || DEFAULT_PAGE_HEIGHT).to_i
+        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || Image::DEFAULT_PAGE_WIDTH).to_i
+        page_height = (document.at_xpath("//w:sectPr/w:pgSz/@w:h")&.value || Image::DEFAULT_PAGE_HEIGHT).to_i
 
-        width_emu = page_width * TWENTIETHS_OF_A_POINT_TO_EMU
-        height_emu = page_height * TWENTIETHS_OF_A_POINT_TO_EMU
+        width_emu = page_width * Image::TWENTIETHS_OF_A_POINT_TO_EMU
+        height_emu = page_height * Image::TWENTIETHS_OF_A_POINT_TO_EMU
 
         [width_emu, height_emu]
       end

data/lib/consolidate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Consolidate
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: standard-procedure-consolidate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Rahoul Baruah
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -66,6 +66,8 @@ files:
 - checksums/standard-procedure-consolidate-0.4.0.gem.sha512
 - checksums/standard-procedure-consolidate-0.4.1.gem.sha512
 - checksums/standard-procedure-consolidate-0.4.2.gem.sha512
+- checksums/standard-procedure-consolidate-0.4.3.gem.sha512
+- checksums/standard-procedure-consolidate-0.4.4.gem.sha512
 - exe/consolidate
 - exe/examine
 - lib/consolidate.rb