standard-procedure-consolidate 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cbb574bced054ba32f67038b7f91eed28836470eb0d40e7bbbbcaefdca41142
-  data.tar.gz: 64438e3b31ea879c4c10d42afa08873a44528ec89ba60d3e248c07baf1bd028b
+  metadata.gz: c3a7f02d5159a44a47af30100fe1743b2b5bff5ab845a0da2170ffaf44302f03
+  data.tar.gz: b041806b3d682a4c5ccc0011025a1d3d5b25a7c1a65fda56e9b3fcce34b364a9
 SHA512:
-  metadata.gz: 947a488ad5d98514589cbaa9495cd7970e7821832a05f74719821d9423785fc9e04f2563b7c4c4c34e5c5c25c32c6a1fd175cbd862e247cdfc2e8612663412b4
-  data.tar.gz: cc6e12303d7abea0be365df9c443d868d18bc658f3696488a6826ce83b93cfd17e588aecc6f3af94a9ac46e9621bc483800effd44e37b550dc752767757fe9fc
+  metadata.gz: 2bc84355758ef68cd525c684fe1ef6973858eb3ba360f4a37a026cc54a11c9eb143cc364bd034cdd4452bec75a91a768b7f96ccbb727039da5e6ba727fb643bd
+  data.tar.gz: b8061eb3ff1a61deb3c1b153be11d9c5b416be6a576d559c0846236a1e8dabdf9dcf339f33479e39589d3c247930cb28d437a360becbe5e498e90b99eb26ffea

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/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

data/lib/consolidate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Consolidate
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 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.3
 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,7 @@ 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
 - exe/consolidate
 - exe/examine
 - lib/consolidate.rb