B2020-128: Pagination of a complicated AER/RNO may overwrite bottom continue message
This commit is contained in:
parent
1136071e14
commit
de8c535db9
@ -1951,8 +1951,8 @@ namespace Volian.Print.Library
|
|||||||
if (MyPageHelper.CreatingSupInfoPage) yPageStart -= (2 * SixLinesPerInch);
|
if (MyPageHelper.CreatingSupInfoPage) yPageStart -= (2 * SixLinesPerInch);
|
||||||
if (!addExtraLines && (!doSectionTitleContinued || !SectionShowTitles))
|
if (!addExtraLines && (!doSectionTitleContinued || !SectionShowTitles))
|
||||||
addExtraLines = DoTopContinueMsg(cb, ref yPageStart, yTopMargin, docstyle, doThreeContinues && MyItemInfo.MyParent != null && MyItemInfo.MyParent.MyTab != null ? MyItemInfo.MyParent.MyTab.CleanText : null);
|
addExtraLines = DoTopContinueMsg(cb, ref yPageStart, yTopMargin, docstyle, doThreeContinues && MyItemInfo.MyParent != null && MyItemInfo.MyParent.MyTab != null ? MyItemInfo.MyParent.MyTab.CleanText : null);
|
||||||
|
// B2020-128: If compression flag is on RNO, see if there is an AER to the left and do the 7lpi multiplier
|
||||||
if (CompressPartOfStep)
|
if (CompressPartOfStep || CompressRnoWithAerToTheLeft())
|
||||||
{
|
{
|
||||||
MyPageHelper.YMultiplier = _SevenLinesPerInch / SixLinesPerInch;
|
MyPageHelper.YMultiplier = _SevenLinesPerInch / SixLinesPerInch;
|
||||||
CompressPartOfStep = false;
|
CompressPartOfStep = false;
|
||||||
@ -2296,6 +2296,19 @@ namespace Volian.Print.Library
|
|||||||
ProfileTimer.Pop(profileDepth);
|
ProfileTimer.Pop(profileDepth);
|
||||||
return yPageStart;
|
return yPageStart;
|
||||||
}
|
}
|
||||||
|
// B2020-128: If compression flag is on RNO, see if there is an AER to the left and do the 7lpi multiplier
|
||||||
|
private bool CompressRnoWithAerToTheLeft()
|
||||||
|
{
|
||||||
|
if (!MyItemInfo.IsInRNO) return false;
|
||||||
|
foreach (vlnParagraph vPara in MyPageHelper.MyParagraphs.Values)
|
||||||
|
{
|
||||||
|
if (!vPara.Processed)
|
||||||
|
{
|
||||||
|
if (vPara.YOffset <= YOffset && vPara.CompressPartOfStep) return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
private bool IsPrintedStepItemForSupInfo()
|
private bool IsPrintedStepItemForSupInfo()
|
||||||
{
|
{
|
||||||
bool printedMySectTitle = true;
|
bool printedMySectTitle = true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user