From 0f35d403d2e8e88f2e9b4c4d6d2bc26fe54eda0e Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 13 Apr 2023 14:51:06 +0000
Subject: [PATCH] =?UTF-8?q?B2023-040:=20WCN=20=E2=80=93=20And=20sub-steps?=
 =?UTF-8?q?=20pagination?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BNPP1Newall.xml          | Bin 230132 -> 230180 bytes
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |  17 +++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml
index 56c4d46398d1b4c94ec7070d2dfbf079c49db35f..a7d1d915c07ad995e0724c1d64edb1631264125d 100644
GIT binary patch
delta 70
zcmey;%D1GAZ-bPuwgQ7ALkdF{Ln%WsLkWWqLn1>FLpnn$gC|2SkPTwlGAIFMiWo|p
TMTOf%g&BdEX}hQ}^Zk4PR#*@h

delta 26
gcmZ3|#`mR_Z-bO@vzKtYmoOs`Gi~=0X1<jV0Db8Qr~m)}

diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 5552ed1e..44a708e2 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -1440,6 +1440,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AdjFirstSecDocStylesInPagination, "@AdjFirstSecDocStylesInPagination");
 			}
 		}
+		private LazyLoad<bool> _AdjustLargeImage;
+		public bool AdjustLargeImage
+		{
+			get
+			{
+				return LazyLoad(ref _AdjustLargeImage, "@AdjustLargeImage");
+			}
+		}
 	}
 	#endregion
 	#region VersionIdText
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index b1cbc26d..e2b1124d 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -4181,13 +4181,18 @@ namespace Volian.Print.Library
 							Height = ic.Image_Height;
 
 							// B2022-041: extra whitespace after resized image.  Make same adjustment here that gets made in ParagrphToPdf
-							float mult = 1.0F;
-							if (Width > (vlnParagraph.wMax - 12)) mult = (vlnParagraph.wMax - 24) / Width;
-							if (Height > (vlnParagraph.hMax - 36)) mult = Math.Min(mult, (vlnParagraph.hMax - 36) / Height);
-							if (mult < 1.0F)
+							// B2023-040: WCN pagination changed for And steps with large image after - add format flag for
+							//	Barakah
+							if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.AdjustLargeImage)
 							{
-								Width = Width * mult;
-								Height = Height * mult;
+								float mult = 1.0F;
+								if (Width > (vlnParagraph.wMax - 12)) mult = (vlnParagraph.wMax - 24) / Width;
+								if (Height > (vlnParagraph.hMax - 36)) mult = Math.Min(mult, (vlnParagraph.hMax - 36) / Height);
+								if (mult < 1.0F)
+								{
+									Width = Width * mult;
+									Height = Height * mult;
+								}
 							}
 						}
 						yoff = AdjustLocIfLongerRNO(itemInfo, yoff, yoffRightParent);