From 235b6f74727651cd68c76394f6618baa6597e451 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 6 Nov 2014 14:30:40 +0000
Subject: [PATCH] =?UTF-8?q?Added=20Print/HorizontalSubstep=20flag=20(defau?=
 =?UTF-8?q?lt=20to=20false).=20=20Was=20in=2016bit=20to=20flag=20footnotes?=
 =?UTF-8?q?=20for=20BGEVL=20(in=20addition=20to=20NotesToFootnotes=20Set?=
 =?UTF-8?q?=20HorizontalSubstep=20flag=20to=20true=20(for=20Note=20type=20?=
 =?UTF-8?q?as=20footnote)=20Added=20property=20=E2=80=98IsFootnote?=
 =?UTF-8?q?=E2=80=99;=20for=20Calvert=20formats:=20don=E2=80=99t=20bullet?=
 =?UTF-8?q?=20a=20single=20note/caution=20Added=20HorizontalSubstep=20flag?=
 =?UTF-8?q?=20Use=20=E2=80=98IsFootnote=E2=80=99=20property=20to=20determi?=
 =?UTF-8?q?ne=20if=20a=20note=20is=20a=20footnote.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BASEall.xml              | Bin 72490 -> 72544 bytes
 PROMS/Formats/fmtall/BGEVLall.xml             | Bin 48526 -> 48614 bytes
 .../VEPROMS.CSLA.Library/Extension/ItemExt.cs |  16 +++++++++++++++-
 .../Format/PlantFormat.cs                     |   8 ++++++++
 PROMS/Volian.Print.Library/vlnParagraph.cs    |   7 +++----
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml
index a2e3188dad80f76da09fae44e1958a521e1a8dd2..51ad6883a7b30dda8ceeabed087719eb6a6e9553 100644
GIT binary patch
delta 46
zcmZ3rjpe~MmJMA(!X6Cy3`Go?3{^lnkD-Jiks)XDRc+<T3(oK~PZQccO^9&{2LNw3
B4{!hg

delta 18
acmaE`jb+s~mJMA(%?E_G9}r?(zySbL-UreE

diff --git a/PROMS/Formats/fmtall/BGEVLall.xml b/PROMS/Formats/fmtall/BGEVLall.xml
index cdeb1e26323eb416025a08a63d9b2bd78c437027..34fda5baa03f0d1c68f90e67ba5a35b43f4ba82d 100644
GIT binary patch
delta 70
zcmeDC&GhUy(}qi2lgn}hj6E3g8HyM(8LEJE9zzL3B0~;CFheOr5<@YNm&#B8q-`0L
U7(#%mN`ZVO28GRgxh`%30Q*W4bN~PV

delta 14
WcmaF%o2l<N(}qi2o3*(2Yyto~Uk6bD

diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
index 6f0e081f..a9650273 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
@@ -1226,6 +1226,18 @@ namespace VEPROMS.CSLA.Library
 				return IsType("Note");
 			}
 		}
+		public bool IsFootnote
+		{
+			get
+			{
+				if (!ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes) return false;
+				if (!IsStep) return false;
+				// BGEVL had notes as footnotes, and also had HorizontalSubsteps flag
+				if (ActiveFormat.PlantFormat.FormatData.PrintData.HorizontalSubsteps && IsType("Note")) return true;
+				if (IsType("Note2")) return true;		// BGEEOP had note2's as footnotes
+				return false;
+			}
+		}
 		public bool IsTable
 		{
 			get
@@ -3396,7 +3408,9 @@ namespace VEPROMS.CSLA.Library
 					}
 					if (!this.FormatStepData.SeparateBox)
 					{
-						if (tbformat == nextTbFormat || tbformat == prevTbFormat)
+						// For calvert formats, if all tabs are null or empty, then don't add a bullet in.
+						bool allnull = ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (tbformat == null || tbformat == "") && (nextTbFormat == null || tbformat == "") && (prevTbFormat == null || prevTbFormat == "");
+						if (!allnull && (tbformat == nextTbFormat || tbformat == prevTbFormat))
 						{
 							tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB;
 							TabToIdentBAdjustFont();
diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index eb75b192..89c3bcc8 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -729,6 +729,14 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _SpecialCaseCalvertAlarm, "@SpecialCaseCalvertAlarm");
 			}
 		}
+		private LazyLoad<bool> _HorizontalSubsteps;
+		public bool HorizontalSubsteps
+		{
+			get
+			{
+				return LazyLoad(ref _HorizontalSubsteps, "@HorizontalSubsteps");
+			}
+		}
 		private LazyLoad<bool> _SpecialStepsFoldout;
 		public bool SpecialStepsFoldout
 		{
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index fab4db73..b04f41b2 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -80,7 +80,7 @@ namespace Volian.Print.Library
 			{
 				if(pp != null) pp.OnStatusChanged((iChildItemInfo.DisplayNumber ?? "") == "" ? iChildItemInfo.DisplayText : iChildItemInfo.DisplayNumber, PromsPrinterStatusType.LoadVlnParagraph);
 
-				if (iChildItemInfo.IsNote && iChildItemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes)
+				if (iChildItemInfo.IsFootnote)
 				{
 					vlnParagraph para = new vlnParagraph(Parent, cb, iChildItemInfo, xoff, yoff, rnoLevel, maxRNO, formatInfo, null, null, yoffRight, true, iChildItemInfo.IsSection ? pp :null);
 					continue;   // don't add it, vlnParagraph adds this item to the footnote vlntext list in ToPdf.
@@ -2104,10 +2104,9 @@ namespace Volian.Print.Library
 			Suffix = suffix;
 			MyItemInfo = itemInfo;
 			MyContentByte = cb;
-			if (itemInfo.IsNote && itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.NotesToFootnotes)
+			if (itemInfo.IsFootnote)
 			{
-				// notestofootnoteshls may need to be a list, a hls can have more than one note
-				// should it be list of vlntext.
+				// notestofootnoteshls is a list, a hls can have more than one note
 				if (MyPageHelper.NotesToFootNotesHLS.ContainsKey(itemInfo.MyHLS.ItemID))
 					MyPageHelper.NotesToFootNotesHLS[itemInfo.MyHLS.ItemID].Add(itemInfo.ItemID);
 				else