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

B2016-262 & B2016-263: for search results & report, print ‘Equation’ for Document text rather than rtf

Browse Source 
Additional functionality for Equation Editor, bring up equation editor tool (from registry setting) on Equation button click
B2016-265, print proper size of change bar
B2016-261: don’t print extra blank lines for a table/equation/figure after caution/note off many lined step in single column mode
This commit is contained in:
Kathy Ruffing
2016-11-22 14:16:04 +00:00
parent 99aa1ac9c5
commit 1ff60597c3
4 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PROMS/Volian.Print.Library/vlnChangeBar.cs
View File

@@ -105,14 +105,15 @@ namespace Volian.Print.Library
_MsgAtTop = msgAtTop;
Messages = new SortedDictionary<float, vlnChangeBarMessage>();
// if there is an RNO separator, add the separator's height in too.
Height = parent.Height * MyPageHelper.YMultiplier + (parent.MyItemInfo.IsFigure?SixLinesPerInch:0);
float scale = parent.MyItemInfo.IsRtfRaw ? 0.6f : 1; // use scale for equations (B2016-265)
Height = (scale * parent.Height) * MyPageHelper.YMultiplier + (parent.MyItemInfo.IsFigure?SixLinesPerInch:0);
foreach (vlnPrintObject vpo in parent.PartsBelow)
{
if (vpo is vlnRNOSeparator)
{
// see if any of children don't have changebar
if ((vpo as vlnRNOSeparator).ExtendChangeBar)
_YExtendLine = (vpo.Height + vpo.YOffset - (parent.Height + parent.YOffset)) * MyPageHelper.YMultiplier;
_YExtendLine = (vpo.Height + vpo.YOffset - ((scale * parent.Height) + parent.YOffset)) * MyPageHelper.YMultiplier;
}
}
foreach (vlnPrintObject vph in parent.PartsAbove)

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

@@ -3723,14 +3723,16 @@ namespace Volian.Print.Library
}
if (yOffRight < yoffRightParent) yOffRight = yoffRightParent;
// find the very bottom Yoffset
// find the very bottom Yoffset (don't do this is in single column mode for cautions/notes: B2016-261)
vlnParagraph parentPar = parent;
while (parentPar != null && parentPar.MyItemInfo.IsStep)
if (!((MyItemInfo.IsCaution || MyItemInfo.IsNote) && itemInfo.RNOLevel == 0))
{
float vb = parentPar.YVeryBottom;
if (yOffRight < vb)
yOffRight = vb;
parentPar = parentPar.MyParent;
while (parentPar != null && parentPar.MyItemInfo.IsStep)
{
float vb = parentPar.YVeryBottom;
if (yOffRight < vb) yOffRight = vb;
parentPar = parentPar.MyParent;
}
}
bool rightLonger = yOffRight > yoff;
if (!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table