diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 56c4d463..a7d1d915 100644 Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ 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 _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);