diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 056359ea..d2079dca 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -887,7 +887,7 @@ namespace Volian.Print.Library public static void DoFoldoutPage(PdfContentByte cb, string str, PdfLayer textLayer) { - cb.Circle(400, 100, 50); + //cb.Circle(400, 100, 50); PrintTextMessage(cb, "Foldout for: " + str, textLayer); cb.PdfDocument.NewPage(); // Temporary for foldout/16bit-32bit page alignment //_MyLog.InfoFormat("NewPage 7 {0}", cb.PdfWriter.CurrentPageNumber); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 9d203ddf..98d2900e 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -185,21 +185,30 @@ namespace Volian.Print.Library } private void DrawCenterLine(PdfContentByte cb, float xLoc, float yTop, float yBottom) { + //iTextSharp.text.Color lineColor = new iTextSharp.text.Color(PrintOverride.OverrideTextColor(System.Drawing.Color.DarkOrange)); cb.SaveState(); if (PageListLayer != null) cb.BeginLayer(PageListLayer); cb.SetLineWidth(.95f); cb.SetColorStroke(new Color(PrintOverride.SvgColor)); + //cb.SetColorStroke(lineColor); cb.MoveTo(xLoc, yTop); + float ylast = yTop; if (_MyGaps != null) { foreach (Gap gap in MyGaps) { cb.LineTo(xLoc, gap.YTop); cb.MoveTo(xLoc, gap.YTop - (gap.YTop - gap.YBottom) * YMultiplier); + ylast = gap.YTop - (gap.YTop - gap.YBottom) * YMultiplier; } _MyGaps = null; } - cb.LineTo(xLoc, yBottom); + // put in for V.C. Summer + // the end message for EOP procedure 15.2 was at the very bottom of the page. + // the remaining center line was drawn past the page boarder. there was no need + // to print it for cases like that + if (ylast > yBottom) + cb.LineTo(xLoc, yBottom); cb.Stroke(); if (PageListLayer != null) cb.EndLayer(); cb.RestoreState(); diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index be347035..2bdc93ac 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1610,7 +1610,16 @@ namespace Volian.Print.Library addExtraSpace = 0; } if (addExtraSpace > 0 && MyItemInfo.FormatStepData != null) - this.PartsAbove.Add(new vlnText(cb, this, " ", " ", 72, yoff, MyItemInfo.FormatStepData.Font)); + { + // We need to strip out the underline style from the font before putting out + // the extra line. + VE_Font vf=MyItemInfo.FormatStepData.Font; + E_Style sty = (E_Style)vf.Style; + if ((sty & E_Style.Underline) != 0) + sty ^= E_Style.Underline; + vf = new VE_Font(vf.Family, (int) vf.Size, sty,(float) vf.CPI); + this.PartsAbove.Add(new vlnText(cb, this, " ", " ", 72, yoff, vf)); + } yoff += addExtraSpace;