BGEALN: Do not duplicate Tab/header for Notes/Cautions/Warnings. Add ‘IsCautionOrNotePart’

BGEALN: Various improvements in Calvert Alarms for blank lines within Notes/Cautions/Warnings

PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs

@@ -1169,6 +1169,13 @@ namespace VEPROMS.CSLA.Library
 			StepData sd = sdlist[stepType];
 			return (sd.Type == type);
 		}
+		public bool IsCautionOrNotePart
+		{
+			get
+			{
+				return (IsCautionPart || IsNotePart);
+			}
+		}
 		public bool IsCaution
 		{
 			get
@@ -3270,6 +3277,9 @@ namespace VEPROMS.CSLA.Library
 				prevTbFormat = MyPrevious.IsInRNO ? prevStepData.TabData.RNOIdentPrint : prevStepData.TabData.IdentPrint;
 				prevTbFormat = ReplaceStepToken(prevTbFormat);
 			}
+
+			// for calvert alarms, need to check if next item is a different type, if a different type. 
+			// If it is the same type, clear the header so that the header text isn't printed two times.
 			bool specialCalvertAlarm = false;
 			if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
 			{
@@ -3292,7 +3302,7 @@ namespace VEPROMS.CSLA.Library
 				// use of the MixCautionsAndNotes format flag - no bullet is used, if more that one replace the tab
 				// with a bullet.  Also, if only one in group and tab text ends with 'S', remove it:
 				bool mixCandN = MixCautionNotesDiffType();
-				if ((MyPrevious == null && NextItem == null) || mixCandN || FormatStepData.SeparateBox)
+				if ((MyPrevious == null && (NextItem == null||specialCalvertAlarm)) || mixCandN || FormatStepData.SeparateBox)
 				{
 					if (_MyHeader.CleanText.ToUpper().EndsWith("S"))
 					{