diff --git a/PROMS/Formats/fmtall/vcbaall.xml b/PROMS/Formats/fmtall/vcbaall.xml index 2aabc6fc..3ecdc1ae 100644 Binary files a/PROMS/Formats/fmtall/vcbaall.xml and b/PROMS/Formats/fmtall/vcbaall.xml differ diff --git a/PROMS/Formats/fmtall/wst1all.xml b/PROMS/Formats/fmtall/wst1all.xml index 2ba29c98..5ea089bf 100644 Binary files a/PROMS/Formats/fmtall/wst1all.xml and b/PROMS/Formats/fmtall/wst1all.xml differ diff --git a/PROMS/Formats/genmacall/vcba.svg b/PROMS/Formats/genmacall/vcba.svg index e6768760..1152898a 100644 Binary files a/PROMS/Formats/genmacall/vcba.svg and b/PROMS/Formats/genmacall/vcba.svg differ diff --git a/PROMS/Formats/genmacall/wst1.svg b/PROMS/Formats/genmacall/wst1.svg index 4fbfa443..b9821738 100644 Binary files a/PROMS/Formats/genmacall/wst1.svg and b/PROMS/Formats/genmacall/wst1.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index ca9a4b6d..1e5bc412 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -1646,6 +1646,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _CheckOffXtraLines, "@CheckOffXtraLines"); } } + private LazyLoad _CheckOffNumberOfLines; + public float? CheckOffNumberOfLines + { + get + { + return LazyLoad(ref _CheckOffNumberOfLines, "@CheckOffNumberOfLines"); + } + } private LazyLoad _MenuItem; public string MenuItem { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 4bd73793..d05baaa7 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3677,27 +3677,38 @@ namespace Volian.Print.Library xloc_co = XOffset + (relX > 0 ? Width : 0) + relX; } } - - // if xtraCheckOffLines is a negative number, start the checkoff on the same line - // as text and adjust the y-offset after the checkoff by the amount of the absolute - // value of xtraCheckOffLines. - // if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1 - // down from the text and adjust the y-offset after the checkoff by the amount - // of xtraCheckOffLines. - float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0); - if (xtraCheckOffLines < 0) + // CheckOffXtraLines was introduced for the additional lines needed for the longer signoffs + // for VCBA (&WST1), for F2016-061. + float checkOffNumberOfLines = (co.CheckOffNumberOfLines ?? 0); + if (checkOffNumberOfLines > 0) { - xtraCheckOffLines = -xtraCheckOffLines; - xtraCheckOffLines *= SixLinesPerInch; + yForCheckoff += (2 * SixLinesPerInch); PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro)); - yoff += xtraCheckOffLines; + yoff += ((checkOffNumberOfLines *= SixLinesPerInch) + (2 * SixLinesPerInch)); } else { - xtraCheckOffLines *= SixLinesPerInch; - xtraCheckOffLines -= ((xtraCheckOffLines>0)? SixLinesPerInch:0); - PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro)); - yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0; + // if xtraCheckOffLines is a negative number, start the checkoff on the same line + // as text and adjust the y-offset after the checkoff by the amount of the absolute + // value of xtraCheckOffLines. + // if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1 + // down from the text and adjust the y-offset after the checkoff by the amount + // of xtraCheckOffLines. + float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0); + if (xtraCheckOffLines < 0) + { + xtraCheckOffLines = -xtraCheckOffLines; + xtraCheckOffLines *= SixLinesPerInch; + PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro)); + yoff += xtraCheckOffLines; + } + else + { + xtraCheckOffLines *= SixLinesPerInch; + xtraCheckOffLines -= ((xtraCheckOffLines > 0) ? SixLinesPerInch : 0); + PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro)); + yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0; + } } } }