From 0a6c398aff991c129701c4903abd23e8ced038da Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 25 Mar 2020 10:59:48 +0000 Subject: [PATCH] =?UTF-8?q?B2020-027:=20Farley=20pagination=20for=20sectio?= =?UTF-8?q?n=20with=20title=20on=20first=20page=20only=20in=207lpi=20B2020?= =?UTF-8?q?-038:=20Farley=20pagination=20=E2=80=93=20no=20code=20change=20?= =?UTF-8?q?added=20a=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/Pagination.cs | 5 ++--- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/Pagination.cs b/PROMS/Volian.Print.Library/Pagination.cs index faf8ab99..37335725 100644 --- a/PROMS/Volian.Print.Library/Pagination.cs +++ b/PROMS/Volian.Print.Library/Pagination.cs @@ -615,7 +615,8 @@ namespace Volian.Print.Library //else // ShowPageBreak(6, CheckForCompression("HLS will have to split on current page"), "Special", YSize, yPageSizeNextPage, yWithinMargins, ManualPageBreak); //BuildPageBreakList(yWithinMargins + SixLinesPerInch, yPageSizeNextPage + yExtra2, KeepStepsOnPage); // Case 5 - Determine items where page break(s) occur - BuildPageBreakList(ySpaceOnFirstPage, yPageSize + yExtra2, KeepStepsOnPage, yEndMsg, doSectionTitleContinued & SectionShowTitles, false); // Case 5 - Determine items where page break(s) occur + // B2020-027: adjust for lines that may print on first page of section only, added MyPageHelper.PrintedSectionPage + BuildPageBreakList(ySpaceOnFirstPage, yPageSize + yExtra2 + MyPageHelper.PrintedSectionPage, KeepStepsOnPage, yEndMsg, doSectionTitleContinued & SectionShowTitles, false); // Case 5 - Determine items where page break(s) occur // ooooo ooooo ooooo .oooooo..o .oooooo..o oooo o8o . .oooooo. . // `888' `888' `888' d8P' `Y8 d8P' `Y8 `888 `"' .o8 d8P' `Y8b .o8 // 888 888 888 Y88bo. Y88bo. oo.ooooo. 888 oooo .o888oo 888 oooo oooo oooo d8b oooo d8b .ooooo. ooo. .oo. .o888oo @@ -1246,8 +1247,6 @@ namespace Volian.Print.Library vlnParagraph paraBreak7 = FindPageBreak(yStart, ySpaceAt7LPI, yLowerLimit, myList, lastBreak, yPageSize - (myTopMsgSpace + SixLinesPerInch) - myBottomMsgSpace, myBottomMsgSpace, MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList[40].ContinueOnly); - //if (paraBreak7 != null && paraBreak7.MyItemInfo.InList(181056)) // to debug Farley bug B2020-027 - // Console.WriteLine("X"); if (paraBreak7 != null && paraBreak7.YOffset > paraBreak.YOffset && paraBreak.MyItemInfo.StepLevel >= paraBreak7.MyItemInfo.StepLevel) { paraBreak = paraBreak7; diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 72789e44..ac3122d0 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1763,6 +1763,7 @@ i = 0; case "[SECTIONLEVELTITLE]": case "{ATTACHTITLECONT}": case "[ATTACHTITLECONT]": + // B2020-038: incorrect pagination: Note that if PSOnlyFirst is active and pagination is set to continuous, pagination may be incorrect in printed output (no code change-just info here in case happens again) bool printsectlevel = ((pageItem.Justify & VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) != VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) || (((pageItem.Justify & VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) == VEPROMS.CSLA.Library.E_Justify.PSOnlyFirst) && PrintedSectionPage==0); // if there is 'no title' for the section, only print it if a format flag says to print it.