From b8e688c14a1747d232f2d489ca9f1a46e1afe768 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 4 May 2020 19:36:09 +0000 Subject: [PATCH] =?UTF-8?q?B2020-064=20=E2=80=93=20for=20Farley,=20take=20?= =?UTF-8?q?into=20account=20doc=20style=20flag=20DSS=5FPrintSectOnFirst=20?= =?UTF-8?q?when=20breaking=20a=20step=20onto=20pages=20other=20than=20the?= =?UTF-8?q?=20first=20page.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/Pagination.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index d4065b4c..22fa4b20 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -1352,8 +1352,11 @@ namespace Volian.Print.Library // code was not putting a page break on a step that needed to break, i.e. PageBreakOnStep = true. if ((MyItemInfo.IsStep && !MyItemInfo.FormatStepData.PageBreakOnStep) && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PartialStepCompression) { - float ySpaceAt7LPI = (ySpaceOnCurPage - (accountForCalvertAlarmConditionResponseFooter + yEndMsg)) * SixLinesPerInch / _SevenLinesPerInch; - if ((YSize - yTop) > (ySpaceOnCurPage - (accountForCalvertAlarmConditionResponseFooter + yEndMsg)) + float adjustedCurPageYSpace = ySpaceOnCurPage; + if (MyPageHelper.PrintedSectionPage > 0 && MyItemInfo.ActiveSection != null && (MyItemInfo.ActiveSection.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_PrintSectOnFirst) == E_DocStructStyle.DSS_PrintSectOnFirst) + adjustedCurPageYSpace -= MyPageHelper.PrintedSectionPage; //B2020-064 FNP-1-ECP-0.0 Attachment 6 not enough room for end message + float ySpaceAt7LPI = (adjustedCurPageYSpace - (accountForCalvertAlarmConditionResponseFooter + yEndMsg)) * SixLinesPerInch / _SevenLinesPerInch; + if ((YSize - yTop) > (adjustedCurPageYSpace - (accountForCalvertAlarmConditionResponseFooter + yEndMsg)) && (YSize - yTop) < ySpaceAt7LPI ) { // Compress Rest of Step