Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

B2017-252 - Corrected pagination logic when the calculated paragraph break excedes the location of the next HLS, Caution or Note.

Browse Source
This commit is contained in:
Rich 2017-11-10 15:33:55 +00:00
parent 29b09fe6ce
commit 960debcd69
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -1173,10 +1173,15 @@ namespace Volian.Print.Library
if (PageBreakOnStepList[0].YTop <= paraBreak.YTop) if (PageBreakOnStepList[0].YTop <= paraBreak.YTop)
{ {
PageBreakOnStepList[0].CompressFirstPartOfStep = paraBreak.CompressFirstPartOfStep; PageBreakOnStepList[0].CompressFirstPartOfStep = paraBreak.CompressFirstPartOfStep;
// B2017-252 Robinson EOP Upgrade Basis Phase 1 Procedure set located in the Pre-Upgrade (Legacy) folder,
// EOP-FR-S.1-BD, WOG Step 13 no longer fits Deviations and References on the same page.
// Added the IF condition to fix the problem
// B2017-161: unnecessary PageBreak for background documents: use the 'usedPageBreakOnStepList' flag when using the PageBreakOnStepList, don't adjust space on page to account
// for continue message, if there is not one.
if (paraBreak != PageBreakOnStepList[0]) usedPageBreakOnStepList = true;
paraBreak = PageBreakOnStepList[0]; paraBreak = PageBreakOnStepList[0];
PageBreakOnStepList.RemoveAt(0); PageBreakOnStepList.RemoveAt(0);
yTopNew = paraBreak.YTop - YTopMost; yTopNew = paraBreak.YTop - YTopMost;
usedPageBreakOnStepList = true;
} }
// The following code caused forced pagination for Catawba EOP BG - EP/1/A/5000/FR-C.1.SC..S16..N2..S4..S1. // The following code caused forced pagination for Catawba EOP BG - EP/1/A/5000/FR-C.1.SC..S16..N2..S4..S1.
//else if(PageBreakOnStepList[0].YSize - yTop <= ySpaceOnCurPage) //else if(PageBreakOnStepList[0].YSize - yTop <= ySpaceOnCurPage)
@ -1201,6 +1206,8 @@ namespace Volian.Print.Library
doSectionTitleContinued1 = false; doSectionTitleContinued1 = false;
} }
if (doSectionTitleContinued1) ySpaceOnNextPage1 -= 2 * SixLinesPerInch; // B2016-195: Account for Section Continue Message if (doSectionTitleContinued1) ySpaceOnNextPage1 -= 2 * SixLinesPerInch; // B2016-195: Account for Section Continue Message
// B2017-161: unnecessary PageBreak for background documents: use the 'usedPageBreakOnStepList' flag when using the PageBreakOnStepList, don't adjust space on page to account
// for continue message, if there is not one.
if (!usedPageBreakOnStepList) ySpaceOnCurPage = ySpaceOnNextPage1; if (!usedPageBreakOnStepList) ySpaceOnCurPage = ySpaceOnNextPage1;
//ySpaceOnCurPage = yPageSize - (myTopMsgSpace + SixLinesPerInch); // Allow for continue message and blank line. //ySpaceOnCurPage = yPageSize - (myTopMsgSpace + SixLinesPerInch); // Allow for continue message and blank line.