From bcc0ec5a3bb74c4d6b3e4ec6708be56fd91fca86 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 12 Nov 2014 15:17:17 +0000
Subject: [PATCH] =?UTF-8?q?force=20alignment=20of=20=E2=80=98Unnumbered=20?=
 =?UTF-8?q?High=20Level=20Step=E2=80=99=20with=20section=20text=20Calvert:?=
 =?UTF-8?q?=20force=20alignment=20of=20=E2=80=98Unnumbered=20High=20Level?=
 =?UTF-8?q?=20Step=E2=80=99=20with=20section=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BGEOIall.xml             | Bin 139298 -> 139424 bytes
 PROMS/Formats/fmtall/BGESTPall.xml            | Bin 149266 -> 149392 bytes
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   7 +++++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml
index 51a4848d2cbcda1159a801119210f550a43624c8..727240ee5aadf03657307f72f12d7f3ea370f4eb 100644
GIT binary patch
delta 71
zcmZ2<fMdZyj)pCa&#WiUlVO`4@RX5l`jZ$&710oeB8F0iR0bsm1qL^Ud>}8GA$9uA
b7)JfcW$aSZJQ;1KFHmO`+3se;c;_(yUlSJK

delta 22
ecmZ2*kYmvSj)pCa&#b4bxiR`|-(bV|;V}SlU<vU6

diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index 0bcc4a7bf5afca9caa06cfde49a12fc6eb16e3ea..7c63c1bacfa6f4724d3b98654966aa4ab032a305 100644
GIT binary patch
delta 53
zcmbQ#$2p;&vtbLPmF@HzJ|>>&9ZHOP+zJeC4EYR249N_s(`%I&J*Q7FWo&6bXUn+#
JoGp_JCjhC~54->X

delta 30
mcmbQx&pD}&vtbLPmF?s@7M|%7Tp4-VFW53}zhKLBfD-_zoeI1F

diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 89c3bcc8..2894f4ac 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -4104,6 +4104,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _AlignNullTabWSectHead, "@AlignNullTabWSectHead");
 			}
 		}
+		private LazyLoad<bool> _ForceAlignNullTabWSectHead;
+		public bool ForceAlignNullTabWSectHead
+		{
+			get
+			{
+				return LazyLoad(ref _ForceAlignNullTabWSectHead, "@ForceAlignNullTabWSectHead");
+			}
+		}
 		private LazyLoad<bool> _AlignHLSTabWithSectOvride;
 		public bool AlignHLSTabWithSectOvride
 		{
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index c0d8fb41..36ed1112 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -4039,8 +4039,11 @@ namespace Volian.Print.Library
 				else
 				{
 					XOffset += xoff;
-					// For Calvert, adjust from the left margin and current section's tab.
-					if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
+					// For Calvert, adjust from the left margin and current section's tab.  This is used
+					// in BGEEOP (see EOP-0/Purpose ).  However, it caused BGESTP's to print LossOfAC steps (unnumbered HLS) too
+					// far to the left.  The ForceAlignNullTabWSectHead was introduced so that for that step type (LossOfAC) in STP/OI format, 
+					// the SectData.SectionHeader.Pos was used rather than SectData.SectionNumber.Pos
+					if (myTab == null && !itemInfo.FormatStepData.ForceAlignNullTabWSectHead && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
 						XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
 					else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead)
 						XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;