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

If a blank paragraph is followed by a large table and both will not fit on a page, but the table will fit by itself, move the break directl in front of the table.

Browse Source
This commit is contained in:
Rich 2015-02-27 10:51:13 +00:00
parent 6d94bfb5f4
commit 0477c09d03
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,25 +171,25 @@ namespace Volian.Print.Library
if (KeepStepsOnPage && firstSubstepExceedsSpaceAvailable && !isFirstChild) if (KeepStepsOnPage && firstSubstepExceedsSpaceAvailable && !isFirstChild)
KeepStepsOnPage = false; KeepStepsOnPage = false;
if (ySizeIncludingFirst == YSize) KeepStepsOnPage = false; if (ySizeIncludingFirst == YSize) KeepStepsOnPage = false;
float ySectionEndMsg = !_skipEndMessage && MyItemInfo.IsSection && MyItemInfo.Steps != null && MyItemInfo.Steps.Count == 1 && (MyItemInfo.MyDocStyle.End.Message ?? "") != "" ? 2 * SixLinesPerInch : 0; float ySectionEndMsg = !_skipEndMessage && MyItemInfo.IsSection && MyItemInfo.Steps != null && MyItemInfo.Steps.Count == 1 && (MyItemInfo.MyDocStyle.End.Message ?? "") != "" ? 2 * SixLinesPerInch : 0;
if (ySizeIncludingFirstStep < yWithinMargins && ySizeIncludingFirst > yWithinMargins && yWithinMargins > (yPageSize / 2)) if (ySizeIncludingFirstStep < yWithinMargins && ySizeIncludingFirst > yWithinMargins && yWithinMargins > (yPageSize/2))
ySizeIncludingFirst = ySizeIncludingFirstStep; ySizeIncludingFirst = ySizeIncludingFirstStep;
if (!KeepStepsOnPage && (ySizeIncludingFirst + ySectionEndMsg) > (yLocation - yBottomMargin) && !nearTheTop) if (!KeepStepsOnPage && (ySizeIncludingFirst + ySectionEndMsg) > (yLocation - yBottomMargin) && !nearTheTop)
{ {
if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || if (!MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert ||
(ySizeIncludingFirst < yPageSize || yWithinMargins < (yPageSize - (2 * 72)))) (ySizeIncludingFirst < yPageSize || yWithinMargins < (yPageSize - (2 * 72))))
{ {
ShowPageBreak(4, "Page Break Before Continuous Step Section", "Yes", YSize, yPageSize, yWithinMargins, ManualPageBreak); ShowPageBreak(4, "Page Break Before Continuous Step Section", "Yes", YSize, yPageSize, yWithinMargins, ManualPageBreak);
return 1; return 1;
}
}
if (ChildrenBelow.Count > 0)
{
vlnParagraph firstHLS = ChildrenBelow[0];
if (firstHLS.MyItemInfo.IsHigh)
firstHLS.BreakHighLevelStepWithSection = true;
} }
} }
if (ChildrenBelow.Count > 0)
{
vlnParagraph firstHLS = ChildrenBelow[0];
if (firstHLS.MyItemInfo.IsHigh)
firstHLS.BreakHighLevelStepWithSection = true;
}
}
return 0; // Don't Paginate (page break) on a Step Section if it's first thing on page return 0; // Don't Paginate (page break) on a Step Section if it's first thing on page
} }
if (!MyItemInfo.IsHigh) return 0; // Don't Paginate on a Substep level if (!MyItemInfo.IsHigh) return 0; // Don't Paginate on a Substep level
@ -816,6 +816,8 @@ namespace Volian.Print.Library
// yTopNew is y Location of this page break. YTopMost is top of HLS, including any Cautions/Notes/Boxes/etc // yTopNew is y Location of this page break. YTopMost is top of HLS, including any Cautions/Notes/Boxes/etc
//float yTopNew = paraBreak.YVeryTop - YTopMost; //float yTopNew = paraBreak.YVeryTop - YTopMost;
//float yTopNew = paraBreak.YTopMost - YTopMost; //float yTopNew = paraBreak.YTopMost - YTopMost;
if (JustATableThatWillFit(paraBreak, yPageSize - (myTopMsgSpace + yEndMsg)))
paraBreak = paraBreak.ChildrenBelow[0];
float yTopNew = Math.Min(paraBreak.YTopMost, paraBreak.YVeryTop) - YTopMost; float yTopNew = Math.Min(paraBreak.YTopMost, paraBreak.YVeryTop) - YTopMost;
// This is for formats that break on all HLS, Cautions & Notes (often backgrounds): // This is for formats that break on all HLS, Cautions & Notes (often backgrounds):
@ -857,6 +859,21 @@ namespace Volian.Print.Library
} }
ProfileTimer.Pop(profileDepth); ProfileTimer.Pop(profileDepth);
} }
private bool JustATableThatWillFit(vlnParagraph paraBreak, float ypagesize)
{
if (paraBreak.MyItemInfo.MyContent.Text.Replace(" ", "").Replace(@"\u160?", "").Replace(@"\'A0", "") != "") return false;
if (paraBreak.YSize < ypagesize) return false;
if (paraBreak.ChildrenAbove.Count > 0) return false;
if (paraBreak.ChildrenLeft.Count > 0) return false;
if (paraBreak.ChildrenRight.Count > 0) return false;
if (paraBreak.ChildrenBelow.Count != 1) return false;
if (!paraBreak.ChildrenBelow[0].MyItemInfo.IsTable) return false;
vlnParagraph paraTable = paraBreak.ChildrenBelow[0];
if (paraTable.YSize < ypagesize)
return true;
return false;
}
/// <summary> /// <summary>
/// Finds the highest StepLevel (lowest StepLevel number, 0 = HLS, 1 = first substep) that /// Finds the highest StepLevel (lowest StepLevel number, 0 = HLS, 1 = first substep) that
/// fills the page sufficiently (more than half-full) /// fills the page sufficiently (more than half-full)