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

pagination fixes for IP3 asterisk box & rno separator

Browse Source
This commit is contained in:
Kathy Ruffing
2015-03-17 15:01:56 +00:00
parent 9c464278f3
commit 77da149ce7
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@@ -328,7 +328,8 @@ namespace Volian.Print.Library
// increment the y offset if not doing the ComponentTableFormat
else if (!para.UseTemplateKeepOnCurLine(childItemInfo))
yoff = para.YBottomMost;
// para.YBottomMost += para.YBottomMostAdjust; // KBR for IP3 pagination: don't adjust YBottomost until after yoff is set.
// don't adjust YBottomost until after yoff is set for the RNO Separator
para.YBottomMost += para.YBottomMostAdjust;
if (box != null && childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt)
{
box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch);
@@ -3315,7 +3316,7 @@ namespace Volian.Print.Library
if (yadjSep > 0)
{
MyHighLevelParagraph.YBottomForBox = yoff; // if hlrno, box before sep
//YBottomMostAdjust = SixLinesPerInch; // KBR for IP3 pagination
YBottomMostAdjust = SixLinesPerInch; // added for IP3 pagination, the RNO separator is outside asterisk box
}
yoff += (myRnoSep.Height + SixLinesPerInch);
}
@@ -4031,12 +4032,12 @@ namespace Volian.Print.Library
get { return _YBottomMost; }
set { _YBottomMost = value; }
}
//protected float _YBottomMostAdjust = 0; // KBR for IP3 pagination
//public float YBottomMostAdjust
//{
// get { return _YBottomMostAdjust; }
// set { _YBottomMostAdjust = value; }
//}
protected float _YBottomMostAdjust = 0; // the RNO separator is outside asterisk box, account for additional Y space
public float YBottomMostAdjust
{
get { return _YBottomMostAdjust; }
set { _YBottomMostAdjust = value; }
}
protected float _YTopMost; // Top of the paragraph including the children
public float YTopMost
{