Merge pull request #6 from the-curve-consulting/mbarber/PWM-262-hotfix

PWM-262-V2: Specify portrait and landscape page orientations in the same document
the-curve-consulting · Feb 7, 2024 · 5198a25 · 5198a25
2 parents b7599e3 + 70b6d54
commit 5198a25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lib/caracal/renderers/document_renderer.rb b/lib/caracal/renderers/document_renderer.rb
@@ -331,6 +331,12 @@ def render_pageflip(xml, model)
         xml['w'].p paragraph_options do
           xml['w'].pPr do
             xml['w'].sectPr do
+              if rel = document.find_relationship('footer1.xml')
+                xml['w'].footerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
+              if rel = document.find_relationship('header1.xml')
+                xml['w'].headerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
               xml['w'].pgSz({
                 'w:w' => document.page_width,
                 'w:h' => document.page_height
@@ -345,6 +351,12 @@ def render_pageflip(xml, model)
         xml['w'].p paragraph_options do
           xml['w'].pPr do
             xml['w'].sectPr do
+              if rel = document.find_relationship('footer1.xml')
+                xml['w'].footerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
+              if rel = document.find_relationship('header1.xml')
+                xml['w'].headerReference({ 'r:id' => rel.formatted_id, 'w:type' => 'default' })
+              end
               xml['w'].pgSz({
                 'w:w' => document.page_height,
                 'w:h' => document.page_width

diff --git a/lib/caracal/version.rb b/lib/caracal/version.rb
@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 end