From 6f16095159612a74e779334510a4983001a6d1be Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Tue, 27 Sep 2016 13:04:35 +0000
Subject: [PATCH] =?UTF-8?q?F2016-033:=20Replace=20=E2=80=9CUser=20Hold=20P?=
 =?UTF-8?q?oint=E2=80=9D=20with=20=E2=80=9CVerification=20Point=E2=80=9D?=
 =?UTF-8?q?=20step=20type=20&=20support=20its=20printing=20F2016-042:=20Fi?=
 =?UTF-8?q?x=20tabbing=20of=20section=20text=20location=20(was=20overwriti?=
 =?UTF-8?q?ng=20number)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/vcb1all.xml           | Bin 92056 -> 92100 bytes
 PROMS/Formats/fmtall/vcb2all.xml           | Bin 80522 -> 80522 bytes
 PROMS/Formats/fmtall/vcbaall.xml           | Bin 87192 -> 87236 bytes
 PROMS/Formats/fmtall/vcbeppall.xml         | Bin 87606 -> 87650 bytes
 PROMS/Volian.Print.Library/vlnParagraph.cs |  16 ++++++++++++----
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/PROMS/Formats/fmtall/vcb1all.xml b/PROMS/Formats/fmtall/vcb1all.xml
index ef2da9223b7c4dac316b05279fe5c7811b7b26bc..9bf5b3379e1c2279b3d621f3dd2b39188b779112 100644
GIT binary patch
delta 131
zcmbPnp7qFi)(v?DlXui=OrB8S$EYy5e2y%$IfK#UjaOAC^HrNn=BYHB6fHMdD~)fm
zAEywI%P~17Pi%5SWrTPbLn=cNLncES5GOMvGL!)6e1^Qq?+Ya-U--#0`G5q+WVWiX
i$psC5lfz;aCcA0zO*S~dG1>0Cz+|;@gUwaNa$f*AkuM$q

delta 120
zcmX?do^{4~)(v?DlM~97CQmEyn|$T2%w&VLT9Xz0lqNS6icH?8&o()yw2m{Bp_n0+
zp@>0Y^8UPP$xw!123Lk41_cHW27d-01{WYJfFT4Z`>@DZ6szpyjrp>Zg(lC~yrfv+
F3johdC0hUh

diff --git a/PROMS/Formats/fmtall/vcb2all.xml b/PROMS/Formats/fmtall/vcb2all.xml
index d0f77d49645cb9d1c2cda325dd68583f40c6f90c..e5eb8c4e465cd4fe8cc0c49710361161e53c8724 100644
GIT binary patch
delta 22
ecmeDB%F^|fWy38oW)lYU=DT9s?}{<5RR#cXUI_*O

delta 22
ecmeDB%F^|fWy38oW+MiZ=DT9s?}{<5RR#cXC<y@o

diff --git a/PROMS/Formats/fmtall/vcbaall.xml b/PROMS/Formats/fmtall/vcbaall.xml
index 66ea9f16321083efd539017f9b12b547b9c99f6e..a63da3657bd7dc103787cecd397a5fef8ca97bcc 100644
GIT binary patch
delta 169
zcmbQSlJ&?+)(z7NCO@dvn7pIFk5OUr{5i7B<_t!Y1Fx%2s^pt2P%bi=k4tFshH8$<
zGGTg?eZu4z4JR{l$wNeH#U?jY^GyE0&NA8HCEMhEl}_Se45<u744DjRK%C5w$WQ{L
z^BM9czt58do77j$HJNWZOds3ixGJ^DGaCFRFNsi?92UhlIpF}uWC2mW$$da`4SZBK
JFDU-;008q4Ja+&9

delta 127
zcmX@Il6A&P)(z7NCQry!n!K;TZ?Z^()Z~CXlgR;oQj@DnXK;ox6f>kU6fr1Fex6q?
z9?B5R;K~rhpuph4;LqU0-~wa?FoaD0=qEa<O97{};&SQ9BHjX%CnU&B{&13Ka=}`c
K%^QkE9s&S9eJ7a!

diff --git a/PROMS/Formats/fmtall/vcbeppall.xml b/PROMS/Formats/fmtall/vcbeppall.xml
index d349c9c816c96175a4a258b987d6c9aefbc82a93..59fac40ff506770ee6ee729372fcc9043e0fa212 100644
GIT binary patch
delta 104
zcmdnChV{`J)(r;=CUezkOny}0$EYybf1WI}IfK#UjdxThCsdnEj;l1A9G9ju`5mXw
zWV?nk@i2x|h9ZVchBP2fW=Lcx0n+&ld6ONBBqtXf;h7vz6*qZDi{Io0jRBK4_^NF_
IQ=Ih(02y{C<NyEw

delta 120
zcmaE~hIQK-)(r;=CVvP}nEb3DV6uo`#$<zNsmc3F>o`LhiWyQFiWn3o3+7jghcW~+
zxH1GWC@^?1_%rx0xByuJ3?Y*pBSa@pXjH%{e{qHMWHoPr$qvRWlM`B7Hh(M5c?19{
CJS3<9

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 574ab6e3..758bf80f 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -5216,11 +5216,19 @@ namespace Volian.Print.Library
 				//}
 				else	// if no left justify, right align the tab
 				{
-					XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
-					if (myTab != null)
+					// The following fixes F2016-033: Print the Verification Point at left margin.
+					if (itemInfo.ActiveFormat.Name.ToUpper().StartsWith("VCB") && (itemInfo.FormatStepData.ColOverride ?? 0) > 0)
 					{
-						myTab.XOffset += tabWidth - myTab.TabAlign;
-						if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
+						XOffset = (float)itemInfo.FormatStepData.ColOverride;
+					}
+					else
+					{
+						XOffset += tabWidth - (myTab == null ? 0 : myTab.TabAlign);
+						if (myTab != null)
+						{
+							myTab.XOffset += tabWidth - myTab.TabAlign;
+							if (myTab.MyMacro != null && myTab.MyMacro.XOffset != 0) myTab.MyMacro.XOffset += tabWidth - myTab.TabAlign;
+						}
 					}
 				}
 			}