diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index cdceccc7..0e1aeaf9 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -72,6 +72,7 @@ namespace Volian.Print.Library float xoffBase = xoff; foreach (ItemInfo iChildItemInfo in itemInfoList) { + if (iChildItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.DiffContActBox && iChildItemInfo.IsHigh) bxIndex = null; if (iChildItemInfo.IsSection && (iChildItemInfo as SectionInfo).ColumnMode != maxRNO) maxRNO = (iChildItemInfo as SectionInfo).ColumnMode; ItemInfo childItemInfo = iChildItemInfo; @@ -238,8 +239,13 @@ namespace Volian.Print.Library } if (boxHLS) { - box.YOffset = para.YTop - (2 * vlnPrintObject.SixLinesPerInch); - box.Height = para.YBottomMost - box.YOffset; // para.YTop - (1.1F * vlnPrintObject.SixLinesPerInch); + // the following line controls whether there is 1 line or 2 lines between + // the box line & the starting/ending yoffset of the HLS. WEP2 had no extra line between + // box & top/bottom of step. The DiffContActBox was added for WEP2. + int boxLnAdjust = iChildItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.DiffContActBox ? 1 : 2; + box.YOffset = para.YTop - (boxLnAdjust * vlnPrintObject.SixLinesPerInch); + boxLnAdjust = iChildItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.DiffContActBox ? 1 : 0; + box.Height = para.YBottomMost - box.YOffset - (boxLnAdjust * vlnPrintObject.SixLinesPerInch); // para.YTop - (1.1F * vlnPrintObject.SixLinesPerInch); box = null; } } @@ -1042,11 +1048,13 @@ namespace Volian.Print.Library doSectionTitleContinued = (sch == null || sch.Section_PrintHdr == "Y"); } } - if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.IsStepSection && + // if printing the section title, we already have the y location (note that only do this for the + // first step in the section. + if (MyItemInfo.MyPrevious == null && MyItemInfo.MyParent != null && MyItemInfo.MyParent.IsStepSection && ShowSectionTitles && !MyItemInfo.MyDocStyle.CancelSectTitle && !MyItemInfo.MyDocStyle.SpecialStepsFoldout) - yPageStart = yPageStart; // if printing the section title, we already have the y location + yPageStart = yPageStart; else yPageStart = yTopMargin + YTopMost; MyPageHelper.YMultiplier = _SevenLinesPerInch / SixLinesPerInch; @@ -1598,7 +1606,11 @@ namespace Volian.Print.Library // than in the vlnparagraphs.add code because the yoff in that code will position the box, but // this code positions the hls (in y direction), without this, the hls starts on the box line. int bxIndx = itemInfo.IsSection ? 0 : itemInfo.FormatStepData.StepLayoutData.STBoxindex ?? 0; - if (itemInfo.IsHigh && bxIndx > 0) yoff += (2 * SixLinesPerInch); + if (itemInfo.IsHigh && bxIndx > 0) + { + int boxLnAdjust = itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.DiffContActBox ? 1 : 2; + yoff += (boxLnAdjust * SixLinesPerInch); // this yoff is where the BOX starts (boxLnAdjust was added for WEP2) + } // If the format has that extra space should be put out before the step, then // handle this by using the 'PartsAbove' structure. By using the parts above, the extra