diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 5441b709..55481de4 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index df3f67c1..6a571033 100644 Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 1e3932b0..03920a20 100644 Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPcklall.xml b/PROMS/Formats/fmtall/BNPPcklall.xml index 1afcddf3..e89fd682 100644 Binary files a/PROMS/Formats/fmtall/BNPPcklall.xml and b/PROMS/Formats/fmtall/BNPPcklall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPdevall.xml b/PROMS/Formats/fmtall/BNPPdevall.xml index 8086d342..63b3cc44 100644 Binary files a/PROMS/Formats/fmtall/BNPPdevall.xml and b/PROMS/Formats/fmtall/BNPPdevall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index 110553bb..65e5c544 100644 Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ diff --git a/PROMS/Formats/genmacall/BNPP2.svg b/PROMS/Formats/genmacall/BNPP2.svg index ee6de79b..4eb210f1 100644 Binary files a/PROMS/Formats/genmacall/BNPP2.svg and b/PROMS/Formats/genmacall/BNPP2.svg differ diff --git a/PROMS/Formats/genmacall/BNPPbck.svg b/PROMS/Formats/genmacall/BNPPbck.svg index 6c067655..2d21179e 100644 Binary files a/PROMS/Formats/genmacall/BNPPbck.svg and b/PROMS/Formats/genmacall/BNPPbck.svg differ diff --git a/PROMS/Formats/genmacall/BNPPckl.svg b/PROMS/Formats/genmacall/BNPPckl.svg index ba4caea5..94a6deb6 100644 Binary files a/PROMS/Formats/genmacall/BNPPckl.svg and b/PROMS/Formats/genmacall/BNPPckl.svg differ diff --git a/PROMS/Formats/genmacall/BNPPsam.svg b/PROMS/Formats/genmacall/BNPPsam.svg index 1d5d94cf..b1c5e1d4 100644 Binary files a/PROMS/Formats/genmacall/BNPPsam.svg and b/PROMS/Formats/genmacall/BNPPsam.svg differ diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index bbc38365..74497f06 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -718,7 +718,7 @@ namespace Volian.Print.Library // just list the headers and the prefix can be 'empty'. if (ii.FormatStepData.Font.FontIsProportional()) { - float yLocVertLine = yLocation + (lpi / 2); + float yLocVertLine = yLocation + (lpi * 1.5F); // +(lpi / 2); // Prefix, i.e. Top line: Paragraph topLeftLine = new Paragraph(bx.BXULC, iSymblFont); Rtf2Pdf.TextAt(cb, topLeftLine, float.Parse(vertPos[0]) + (float)ii.MyDocStyle.Layout.LeftMargin - csize, yLocVertLine, lWidth, 100, null, yBottomMargin); @@ -734,7 +734,7 @@ namespace Volian.Print.Library // Vertical Lines around HLS //int countLine = (int)(this.Height / lpi); - yLocVertLine = yLocation - (lpi / 2); + yLocVertLine = yLocation + (lpi/2);// -(lpi / 2); for (int i = 0; i < 1; i++) { Rtf2Pdf.TextAt(cb, paraVertLine, float.Parse(vertPos[0]) + (float)ii.MyDocStyle.Layout.LeftMargin - csize, yLocVertLine, lWidth, 100, null, yBottomMargin); @@ -793,7 +793,7 @@ namespace Volian.Print.Library } } else - #region OriginalHLS + #region OriginalHLS { int hIndx = preSuf_Fix.IndexOf(@"{\par}"); while (preSuf_Fix != null && hIndx >= 0) @@ -2863,7 +2863,8 @@ namespace Volian.Print.Library case E_ContBottomLoc.EndOfText: // place continue string at end of text // msg_yLocation accounts for extra lines in message from docstyle; and BottomContent is the actual // location of the last line of text on page. - msg_yLocation = msg_yLocation + ((float)(MyPageHelper.BottomContent??0) - (SixLinesPerInch * MyPageHelper.YMultiplier)); // B2018-080 null reference check added + //msg_yLocation = ((float)(MyPageHelper.BottomContent??0) - (SixLinesPerInch * MyPageHelper.YMultiplier)); // B2018-080 null reference check added + msg_yLocation = yLocation - msg_yLocation - (SixLinesPerInch * MyPageHelper.YMultiplier); //B2019-021 yLocation accounts for checkoffs if (yBottomMargin + (docstyle.Layout.FooterLength ?? 0) > msg_yLocation) { // Adjusted Continue Message Y Offset //DebugPagination.WriteLine("====>> {0},'{1}'", msg_yLocation, MyItemInfo.ShortPath);