C2024-003-print-sub-section

This reverts commit 82fa4f1e74882ba3024656ea735087d8dc0f7c79.

PROMS/Volian.Print.Library/Pagination.cs

@@ -569,22 +569,9 @@ namespace Volian.Print.Library
 					KeepStepsOnPage = false;
 				}
 			}
-			if (KeepStepsOnPage && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1))
-			{
-			// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all).
-			// See comment above for setting of 'alarmPageKeepHighWithSubs'.
-				if (alarmPageKeepHighWithSubs)
-				{
-				// F2024-006: Vogtle Alarms pagination - compare the size of the step and its first sub-step with what we think we  have left on the
-				// page. if not enough room with a continue message then set KeepStepsOnPage to start this step on its own page.
-				// This solved an issue where the last line of step text was printing on top of the bottom continue message
-					float myFirstPieceSize = GetFirstPieceSize(true);
-					if (myFirstPieceSize > yWithinMargins)
-						KeepStepsOnPage = false;
-				}
-				else
-					KeepStepsOnPage = false;
-			}
+			// B2023-116: Vogtle alarm pagination - sub-steps are separating from their HLS even if there is room for some (not all).  See comment above for setting of 
+			//	'alarmPageKeepHighWithSubs'.
+			if (KeepStepsOnPage && !alarmPageKeepHighWithSubs && ySizeIncludingFirst > (yWithinMargins - ySizeBtmCtnMess1 - ySizeBtmEndMess1)) KeepStepsOnPage = false;
 			if (!KeepWithHeader && !KeepStepsOnPage && mySize - SixLinesPerInch + yEndMsg - tableSpaceAvailable <= yPageSizeNextPage)	// if the entire step can fit on one page, do a page break
 			{
 				// Don't want extra line before step

PROMS/Volian.Print.Library/vlnParagraph.cs

@@ -2177,7 +2177,7 @@ namespace Volian.Print.Library
 					}
 					// get to the correct section for the message, i.e. if on a section, the message should be the parent
 					// section (not the activesection which is myself); if on a step, the message should be the active section
-					ItemInfo sectForCont = MyItemInfo.IsSection && MyItemInfo.MyParent.IsSection ? MyItemInfo.MyParent : MyItemInfo.ActiveSection; // 
+					ItemInfo sectForCont = MyItemInfo.IsSection && MyItemInfo.MyParent.IsSection ? MyItemInfo.MyParent : MyItemInfo.ActiveSection;
 					sectContPara = new vlnParagraph(MyParent.MyParent, cb, sectForCont, MyParent.XOffset, 0, 0, 0, MyParent.MyItemInfo.ActiveFormat, null, (contMsg == null || contMsg == "") ? "  (Continued)" : contMsg, 0, false, MyPromsPrinter);
 					if (sectContPara.PartsLeft.Count > 0)
 					{
@@ -2836,13 +2836,13 @@ namespace Volian.Print.Library
 				{
 					// Vogtle Alarms: Their alarms are set up differently than standard procedures - the HLS in Vogtle
 					//	alarms is a section in other procedures.  The top continue message is shown when a break occurs:
-					//		A continued message will appear on the top of the page ONLY if the pagination occurs anywhere
+					//	•	A continued message will appear on the top of the page ONLY if the pagination occurs anywhere
 					//		within the first level substep.  If, for example, the page break occurs between substep 3 and substep
 					//		4 as in example 2, no continued message will appear on the top of the page.
-					//		If a continued message is needed, the continued message will include the first level substep number
-					//		if it is a sequential substep, such as “5. (continued)”.  If it is NOT a sequential substep, then only
-					//		the word “(continued)” will appear.
-					//		If a page break occurs between high level steps, such as before “Causes:”, then no continued message is needed.
+					//	•	If a continued message is needed, the continued message will include the first level substep number
+					//		if it is a sequential substep, such as “5.  (continued)”.  If it is NOT a sequential substep, then only
+					//		the word “(continued)” will appear.
+					//	•	If a page break occurs between high level steps, such as before “Causes:”, then no continued message is needed.
 					bool doMessage = true;
 					if (MyItemInfo.IsHigh) doMessage = false;               // at high, don't do message
 					if (MyItemInfo.MyParent.IsHigh) doMessage = false;      // at first level, don't do message
@@ -4494,7 +4494,7 @@ namespace Volian.Print.Library
 					//          Get the minimun value between the AER and RNO YtopMost.
 					//          example. Calvert AOP-7E/XIII/Step A5.h Unit 2 Approved set
 					//B2021-027 use YOffset if there isn't any children above (AER).
-					// example: Catawba Unit 1 AP’s; AP/1/A/5500/050; Enclosure 8 step 1
+					//          example: Catawba Unit 1 AP’s; AP/1/A/5500/050; Enclosure 8 step 1
 					if (ChildrenAbove.Count == 0)
 						YTopMost = ChildrenRight[0].ChildrenAbove[0].YOffset; //B2021-027
 					else
@@ -5647,7 +5647,7 @@ namespace Volian.Print.Library
 			}
 			// if this is a caution or note, put the change bar to the right of the text:
 			//if ((paragraph.MyItemInfo.IsCaution || paragraph.MyItemInfo.IsNote) && fixedChgCol < -10) return -fixedChgCol;
-			if ((fixedChgCol == 0)) // && paragraph.MyItemInfo.IsCaution || paragraph.MyItemInfo.IsNote)
+			if ((fixedChgCol == 0))// && paragraph.MyItemInfo.IsCaution || paragraph.MyItemInfo.IsNote)
 								   //if ((fixedChgCol==0) || paragraph.MyItemInfo.IsCaution || paragraph.MyItemInfo.IsNote)
 			{
 				float rightEdge = (paragraph.XOffset + paragraph.Width + 5);
@@ -7273,4 +7273,3 @@ namespace Volian.Print.Library
 		}
 	}
 }
-