Limit Partial Step Compression to formats that use it.

This commit is contained in:
Rich 2015-03-19 12:01:41 +00:00
parent f3a7fb527e
commit 4508324826

View File

@ -947,7 +947,7 @@ namespace Volian.Print.Library
paraBreak = paraBreak.ChildrenBelow[0];
float ySpaceOnNextPage1 = yPageSize - (myTopMsgSpace + (yEndMsg == 0 ? SixLinesPerInch : 0)); // Allow for continue message and blank line.
ySpaceOnNextPage1 -= accountForSmartTemplateHeader;
if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps && ySpaceOnNextPage1 == ySpaceOnCurPage+myBottomMsgSpace)
if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PartialStepCompression && ySpaceOnNextPage1 == ySpaceOnCurPage+myBottomMsgSpace)
{
float ySpaceAt7LPI = ((ySpaceOnCurPage - accountForCalvertAlarmConditionResponseFooter) * SixLinesPerInch / _SevenLinesPerInch) - _SevenLinesPerInch;
vlnParagraph paraBreak7 = FindPageBreak(yStart, ySpaceAt7LPI, yLowerLimit,
@ -1013,7 +1013,7 @@ namespace Volian.Print.Library
yLowerLimit = ySpaceOnCurPage / 2;
if (_Match16BitPagination) yLowerLimit -= 1.5F * SixLinesPerInch; // 276 for HLP
yStart = 0;
if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CompressSteps)
if (MyItemInfo.ActiveFormat.MyStepSectionLayoutData.PartialStepCompression)
{
float ySpaceAt7LPI = (ySpaceOnCurPage - (accountForCalvertAlarmConditionResponseFooter + yEndMsg)) * SixLinesPerInch / _SevenLinesPerInch;
if ((YSize - yTop) > (ySpaceOnCurPage - (accountForCalvertAlarmConditionResponseFooter + yEndMsg))